New upstream version 5.7.0

1 files changed, 82 insertions, 72 deletions

diff --git a/src/libimcv/suites/test_imcv_swima.c b/src/libimcv/suites/test_imcv_swima.c
index a579f7378..b3207fb93 100644
--- a/src/libimcv/suites/test_imcv_swima.c
+++ b/src/libimcv/suites/test_imcv_swima.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Andreas Steffen
+ * Copyright (C) 2017-2018 Andreas Steffen
  * HSR Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -182,7 +182,7 @@ START_TEST(test_imcv_swima_sw_req)
 
 	targets = c_attr->get_targets(c_attr);
 	ck_assert(targets->get_eid(targets, NULL) == req_data[_i].earliest_eid);
-	
+
 	enumerator = targets->create_enumerator(targets);
 	ck_assert(enumerator);
 	n = 0;
@@ -268,67 +268,69 @@ static sw_inv_data_t sw_inv_data[] = {
 	  chunk_from_chars(
 		0x00, 0x00, 0x00, 0x01, 0xAA, 0xBB, 0xCC, 0xD2, 0x12, 0x34,
 		0x56, 0x78, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x1F, 0x73, 0x74, 0x72,
-		0x6F, 0x6E, 0x67, 0x73, 0x77, 0x61, 0x6E, 0x2E, 0x6F, 0x72,
-		0x67, 0x5F, 0x73, 0x74, 0x72, 0x6F, 0x6E, 0x67, 0x53, 0x77,
-		0x61, 0x6E, 0x5F, 0x35, 0x2E, 0x33, 0x2E, 0x33, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x31, 0x3C, 0x53, 0x6F, 0x66, 0x74, 0x77,
-		0x61, 0x72, 0x65, 0x49, 0x64, 0x65, 0x6E, 0x74, 0x69, 0x74,
-		0x79, 0x20, 0x74, 0x61, 0x67, 0x49, 0x64, 0x3D, 0x22, 0x61,
-		0x62, 0x63, 0x22, 0x3E, 0x3C, 0x2F, 0x53, 0x6F, 0x66, 0x74,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x73, 0x74,
+		0x72, 0x6F, 0x6E, 0x67, 0x73, 0x77, 0x61, 0x6E, 0x2E, 0x6F,
+		0x72, 0x67, 0x5F, 0x73, 0x74, 0x72, 0x6F, 0x6E, 0x67, 0x53,
+		0x77, 0x61, 0x6E, 0x5F, 0x35, 0x2E, 0x33, 0x2E, 0x33, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x31, 0x3C, 0x53, 0x6F, 0x66, 0x74,
 		0x77, 0x61, 0x72, 0x65, 0x49, 0x64, 0x65, 0x6E, 0x74, 0x69,
-		0x74, 0x79, 0x3E)
+		0x74, 0x79, 0x20, 0x74, 0x61, 0x67, 0x49, 0x64, 0x3D, 0x22,
+		0x61, 0x62, 0x63, 0x22, 0x3E, 0x3C, 0x2F, 0x53, 0x6F, 0x66,
+		0x74, 0x77, 0x61, 0x72, 0x65, 0x49, 0x64, 0x65, 0x6E, 0x74,
+		0x69, 0x74, 0x79, 0x3E)
 	},
 	{ IETF_SWIMA_ATTR_SW_INV_FLAG_NONE, 0xaabbccd3, 0x12345678, 0x00000030,
 	  chunk_from_chars(
 		0x00, 0x00, 0x00, 0x01, 0xAA, 0xBB, 0xCC, 0xD3, 0x12, 0x34,
 		0x56, 0x78, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x1F, 0x73, 0x74, 0x72,
-		0x6F, 0x6E, 0x67, 0x73, 0x77, 0x61, 0x6E, 0x2E, 0x6F, 0x72,
-		0x67, 0x5F, 0x73, 0x74, 0x72, 0x6F, 0x6E, 0x67, 0x53, 0x77,
-        0x61, 0x6E, 0x5F, 0x35, 0x2E, 0x33, 0x2E, 0x33, 0x00, 0x00)
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x73, 0x74,
+		0x72, 0x6F, 0x6E, 0x67, 0x73, 0x77, 0x61, 0x6E, 0x2E, 0x6F,
+		0x72, 0x67, 0x5F, 0x73, 0x74, 0x72, 0x6F, 0x6E, 0x67, 0x53,
+		0x77, 0x61, 0x6E, 0x5F, 0x35, 0x2E, 0x33, 0x2E, 0x33, 0x00,
+		0x00)
 	},
 	{ IETF_SWIMA_ATTR_SW_INV_FLAG_S_F, 0xaabbccd4, 0x12345678, 0x00000034,
 	  chunk_from_chars(
 		0x80, 0x00, 0x00, 0x02, 0xAA, 0xBB, 0xCC, 0xD4, 0x12, 0x34,
 		0x56, 0x78, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x1F, 0x73, 0x74, 0x72,
-		0x6F, 0x6E, 0x67, 0x73, 0x77, 0x61, 0x6E, 0x2E, 0x6F, 0x72,
-		0x67, 0x5F, 0x73, 0x74, 0x72, 0x6F, 0x6E, 0x67, 0x53, 0x77,
-		0x61, 0x6E, 0x5F, 0x35, 0x2E, 0x33, 0x2E, 0x33, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x31, 0x3C, 0x53, 0x6F, 0x66, 0x74, 0x77,
-		0x61, 0x72, 0x65, 0x49, 0x64, 0x65, 0x6E, 0x74, 0x69, 0x74,
-		0x79, 0x20, 0x74, 0x61, 0x67, 0x49, 0x64, 0x3D, 0x22, 0x61,
-		0x62, 0x63, 0x22, 0x3E, 0x3C, 0x2F, 0x53, 0x6F, 0x66, 0x74,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x73, 0x74,
+		0x72, 0x6F, 0x6E, 0x67, 0x73, 0x77, 0x61, 0x6E, 0x2E, 0x6F,
+		0x72, 0x67, 0x5F, 0x73, 0x74, 0x72, 0x6F, 0x6E, 0x67, 0x53,
+		0x77, 0x61, 0x6E, 0x5F, 0x35, 0x2E, 0x33, 0x2E, 0x33, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x31, 0x3C, 0x53, 0x6F, 0x66, 0x74,
 		0x77, 0x61, 0x72, 0x65, 0x49, 0x64, 0x65, 0x6E, 0x74, 0x69,
-		0x74, 0x79, 0x3E, 0x00, 0x00, 0x00, 0x01, 0x00, 0x90, 0x2A,
-		0x19, 0x11, 0x00, 0x33, 0x73, 0x74, 0x72, 0x6F,	0x6E, 0x67,
-		0x73, 0x77, 0x61, 0x6E, 0x2E, 0x6F, 0x72, 0x67,	0x5F, 0x36,
-		0x32, 0x32, 0x35, 0x31, 0x61, 0x61, 0x36, 0x2D,	0x31, 0x61,
-		0x30, 0x31, 0x2D, 0x34, 0x37, 0x39, 0x62, 0x2D,	0x61, 0x65,
-		0x61, 0x36, 0x2D, 0x66, 0x33, 0x64, 0x63, 0x66, 0x30, 0x61,
-		0x62, 0x31, 0x66, 0x31, 0x61, 0x00, 0x00, 0x00,	0x00, 0x00,
-		0x31, 0x3C, 0x53, 0x6F, 0x66, 0x74, 0x77, 0x61,	0x72, 0x65,
-		0x49, 0x64, 0x65, 0x6E, 0x74, 0x69, 0x74, 0x79,	0x20, 0x74,
-		0x61, 0x67, 0x49, 0x64, 0x3D, 0x22, 0x64, 0x65,	0x66, 0x22,
-		0x3E, 0x3C, 0x2F, 0x53, 0x6F, 0x66, 0x74, 0x77,	0x61, 0x72,
-		0x65, 0x49, 0x64, 0x65, 0x6E, 0x74, 0x69, 0x74,	0x79, 0x3E)
+		0x74, 0x79, 0x20, 0x74, 0x61, 0x67, 0x49, 0x64, 0x3D, 0x22,
+		0x61, 0x62, 0x63, 0x22, 0x3E, 0x3C, 0x2F, 0x53, 0x6F, 0x66,
+		0x74, 0x77, 0x61, 0x72, 0x65, 0x49, 0x64, 0x65, 0x6E, 0x74,
+		0x69, 0x74, 0x79, 0x3E, 0x00, 0x00, 0x00, 0x01, 0x00, 0x90,
+		0x2A, 0x19, 0x11, 0x00, 0x00, 0x33, 0x73, 0x74, 0x72, 0x6F,
+		0x6E, 0x67, 0x73, 0x77, 0x61, 0x6E, 0x2E, 0x6F, 0x72, 0x67,
+		0x5F, 0x36, 0x32, 0x32, 0x35, 0x31, 0x61, 0x61, 0x36, 0x2D,
+		0x31, 0x61, 0x30, 0x31, 0x2D, 0x34, 0x37, 0x39, 0x62, 0x2D,
+		0x61, 0x65, 0x61, 0x36, 0x2D, 0x66, 0x33, 0x64, 0x63, 0x66,
+		0x30, 0x61, 0x62, 0x31, 0x66, 0x31, 0x61, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x31, 0x3C, 0x53, 0x6F, 0x66, 0x74, 0x77, 0x61,
+		0x72, 0x65, 0x49, 0x64, 0x65, 0x6E, 0x74, 0x69, 0x74, 0x79,
+		0x20, 0x74, 0x61, 0x67, 0x49, 0x64, 0x3D, 0x22, 0x64, 0x65,
+		0x66, 0x22, 0x3E, 0x3C, 0x2F, 0x53, 0x6F, 0x66, 0x74, 0x77,
+		0x61, 0x72, 0x65, 0x49, 0x64, 0x65, 0x6E, 0x74, 0x69, 0x74,
+		0x79, 0x3E)
 	},
 	{ IETF_SWIMA_ATTR_SW_INV_FLAG_S_F, 0xaabbccd5, 0x12345678, 0x00000034,
 	  chunk_from_chars(
 		0x80, 0x00, 0x00, 0x02, 0xAA, 0xBB, 0xCC, 0xD5, 0x12, 0x34,
 		0x56, 0x78, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x1F, 0x73, 0x74, 0x72,
-		0x6F, 0x6E, 0x67, 0x73, 0x77, 0x61, 0x6E, 0x2E, 0x6F, 0x72,
-		0x67, 0x5F, 0x73, 0x74, 0x72, 0x6F, 0x6E, 0x67, 0x53, 0x77,
-		0x61, 0x6E, 0x5F, 0x35, 0x2E, 0x33, 0x2E, 0x33, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x01, 0x00, 0x90, 0x2A, 0x19, 0x11, 0x00,
-		0x33, 0x73, 0x74, 0x72, 0x6F, 0x6E, 0x67, 0x73, 0x77, 0x61,
-		0x6E, 0x2E, 0x6F, 0x72, 0x67, 0x5F, 0x36, 0x32,	0x32, 0x35,
-		0x31, 0x61, 0x61, 0x36, 0x2D, 0x31, 0x61, 0x30,	0x31, 0x2D,
-		0x34, 0x37, 0x39, 0x62, 0x2D, 0x61, 0x65, 0x61,	0x36, 0x2D,
-		0x66, 0x33, 0x64, 0x63, 0x66, 0x30, 0x61, 0x62,	0x31, 0x66,
-		0x31, 0x61, 0x00, 0x00)
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x73, 0x74,
+		0x72, 0x6F, 0x6E, 0x67, 0x73, 0x77, 0x61, 0x6E, 0x2E, 0x6F,
+		0x72, 0x67, 0x5F, 0x73, 0x74, 0x72, 0x6F, 0x6E, 0x67, 0x53,
+		0x77, 0x61, 0x6E, 0x5F, 0x35, 0x2E, 0x33, 0x2E, 0x33, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x90, 0x2A, 0x19, 0x11,
+		0x00, 0x00, 0x33, 0x73, 0x74, 0x72, 0x6F, 0x6E, 0x67, 0x73,
+		0x77, 0x61, 0x6E, 0x2E, 0x6F, 0x72, 0x67, 0x5F, 0x36, 0x32,
+		0x32, 0x35, 0x31, 0x61, 0x61, 0x36, 0x2D, 0x31, 0x61, 0x30,
+		0x31, 0x2D, 0x34, 0x37, 0x39, 0x62, 0x2D, 0x61, 0x65, 0x61,
+		0x36, 0x2D, 0x66, 0x33, 0x64, 0x63, 0x66, 0x30, 0x61, 0x62,
+		0x31, 0x66, 0x31, 0x61, 0x00, 0x00)
 	}
 };
 
@@ -351,7 +353,7 @@ START_TEST(test_imcv_swima_inv)
 										 sw_id_only);
 
 	sw_inv = swima_inventory_create();
-	sw_inv->set_eid(sw_inv, sw_inv_data[_i].last_eid, sw_inv_data[_i].eid_epoch); 
+	sw_inv->set_eid(sw_inv, sw_inv_data[_i].last_eid, sw_inv_data[_i].eid_epoch);
 	for (n = 0; n < _i/2; n++)
 	{
 		sw_id = chunk_from_str(sw_id_str[n]);
@@ -445,15 +447,17 @@ END_TEST
  *  23 data_model_type
  *  24   segment  5  -   1 octet
  *  24 source_id
- *  25 sw_id
- *  26   segment  6  -   2 octets
- *  58 sw_locator
- *  59   segment  7  -  33 octets
- *  60 record
- *  62   segment  8  -   3 octets
- * 113 sw record 2
- * 114   segment  9  -  52 octets
- * 230   segment 10  - 116 octets
+ *  25   segment  6  -   1 octet
+ *  25 reserved
+ *  26 sw_id
+ *  27   segment  7  -   2 octets
+ *  59 sw_locator
+ *  60   segment  8  -  33 octets
+ *  61 record
+ *  63   segment  9  -   3 octets
+ * 114 sw record 2
+ * 115   segment 10  -  52 octets
+ * 231   segment 11  - 117 octets
  */
 
 START_TEST(test_imcv_swima_sw_inv_trunc)
@@ -509,26 +513,32 @@ START_TEST(test_imcv_swima_sw_inv_trunc)
 	attr->add_segment(attr, data);
 	ck_assert(attr->process(attr, &offset) == NEED_MORE);
 
-	/* Segment 6 truncates sw_id */
+	/* Segment 6 truncates reserved */
 	data = chunk_skip(sw_inv_data[4].value, 24);
+	data.len = 1;
+	attr->add_segment(attr, data);
+	ck_assert(attr->process(attr, &offset) == NEED_MORE);
+
+	/* Segment 7 truncates sw_id */
+	data = chunk_skip(sw_inv_data[4].value, 25);
 	data.len = 2;
 	attr->add_segment(attr, data);
 	ck_assert(attr->process(attr, &offset) == NEED_MORE);
 
-	/* Segment 7 truncates sw_locator */
-	data = chunk_skip(sw_inv_data[4].value, 26);
+	/* Segment 8 truncates sw_locator */
+	data = chunk_skip(sw_inv_data[4].value, 27);
 	data.len = 33;
 	attr->add_segment(attr, data);
 	ck_assert(attr->process(attr, &offset) == NEED_MORE);
 
-	/* Segment 8 truncates record */
-	data = chunk_skip(sw_inv_data[4].value, 59);
+	/* Segment 9 truncates record */
+	data = chunk_skip(sw_inv_data[4].value, 60);
 	data.len = 3;
 	attr->add_segment(attr, data);
 	ck_assert(attr->process(attr, &offset) == NEED_MORE);
 
-	/* Segment 9 truncates second sw_record */
-	data = chunk_skip(sw_inv_data[4].value, 62);
+	/* Segment 10 truncates second sw_record */
+	data = chunk_skip(sw_inv_data[4].value, 63);
 	data.len = 52;
 	attr->add_segment(attr, data);
 	ck_assert(attr->process(attr, &offset) == SUCCESS);
@@ -539,9 +549,9 @@ START_TEST(test_imcv_swima_sw_inv_trunc)
 	ck_assert(sw_inv->get_count(sw_inv) == 1);
 	c_attr->clear_inventory(c_attr);
 
-	/* Segment 10 truncates second sw_record */
-	data = chunk_skip(sw_inv_data[4].value, 114);
-	data.len = 116;
+	/* Segment 11 truncates second sw_record */
+	data = chunk_skip(sw_inv_data[4].value, 115);
+	data.len = 117;
 	attr->add_segment(attr, data);
 	ck_assert(attr->process(attr, &offset) == SUCCESS);
 
@@ -626,7 +636,7 @@ static sw_ev_data_t sw_ev_data[] = {
 		0x00, 0x00, 0x00, 0x30,  '2',  '0',  '1',  '7',  '-',  '0',
 		 '5',  '-',  '3',  '0',  'T',  '1',  '8',  ':',  '0',  '9',
 		 ':',  '2',  '5',  'Z', 0x00, 0x00, 0x00, 0x00,	0x00, 0x00,
-		0x00, 0x01, 0x00, 0x01, 0x00, 0x1F, 0x73, 0x74,	0x72, 0x6F,
+		0x00, 0x00, 0x00, 0x01, 0x00, 0x1F, 0x73, 0x74,	0x72, 0x6F,
 		0x6E, 0x67, 0x73, 0x77, 0x61, 0x6E, 0x2E, 0x6F,	0x72, 0x67,
 		0x5F, 0x73, 0x74, 0x72, 0x6F, 0x6E, 0x67, 0x53,	0x77, 0x61,
 		0x6E, 0x5F, 0x35, 0x2E, 0x33, 0x2E, 0x33, 0x00,	0x00, 0x00,
@@ -644,7 +654,7 @@ static sw_ev_data_t sw_ev_data[] = {
 		0x00, 0x00, 0x00, 0x30,  '2',  '0',  '1',  '7',  '-',  '0',
 		 '5',  '-',  '3',  '0',  'T',  '1',  '8',  ':',  '0',  '9',
 		 ':',  '2',  '5',  'Z', 0x00, 0x00, 0x00, 0x00,	0x00, 0x00,
-		0x00, 0x01, 0x00, 0x01, 0x00, 0x1F, 0x73, 0x74,	0x72, 0x6F,
+		0x00, 0x00, 0x00, 0x01, 0x00, 0x1F, 0x73, 0x74,	0x72, 0x6F,
 		0x6E, 0x67, 0x73, 0x77, 0x61, 0x6E, 0x2E, 0x6F,	0x72, 0x67,
 		0x5F, 0x73, 0x74, 0x72, 0x6F, 0x6E, 0x67, 0x53,	0x77, 0x61,
 		0x6E, 0x5F, 0x35, 0x2E, 0x33, 0x2E, 0x33, 0x00,	0x00)
@@ -656,7 +666,7 @@ static sw_ev_data_t sw_ev_data[] = {
 		0x00, 0x00, 0x00, 0x30,  '2',  '0',  '1',  '7',  '-',  '0',
 		 '5',  '-',  '3',  '0',  'T',  '1',  '8',  ':',  '0',  '9',
 		 ':',  '2',  '5',  'Z', 0x00, 0x00, 0x00, 0x00,	0x00, 0x00,
-		0x00, 0x01, 0x00, 0x01, 0x00, 0x1F, 0x73, 0x74,	0x72, 0x6F,
+		0x00, 0x00, 0x00, 0x01, 0x00, 0x1F, 0x73, 0x74,	0x72, 0x6F,
 		0x6E, 0x67, 0x73, 0x77, 0x61, 0x6E, 0x2E, 0x6F,	0x72, 0x67,
 		0x5F, 0x73, 0x74, 0x72, 0x6F, 0x6E, 0x67, 0x53,	0x77, 0x61,
 		0x6E, 0x5F, 0x35, 0x2E, 0x33, 0x2E, 0x33, 0x00,	0x00, 0x00,
@@ -688,7 +698,7 @@ static sw_ev_data_t sw_ev_data[] = {
 		0x00, 0x00, 0x00, 0x30,  '2',  '0',  '1',  '7',  '-',  '0',
 		 '5',  '-',  '3',  '0',  'T',  '1',  '8',  ':',  '0',  '9',
 		 ':',  '2',  '5',  'Z', 0x00, 0x00, 0x00, 0x00,	0x00, 0x00,
-		0x00, 0x01, 0x00, 0x01, 0x00, 0x1F, 0x73, 0x74,	0x72, 0x6F,
+		0x00, 0x00, 0x00, 0x01, 0x00, 0x1F, 0x73, 0x74,	0x72, 0x6F,
 		0x6E, 0x67, 0x73, 0x77, 0x61, 0x6E, 0x2E, 0x6F,	0x72, 0x67,
 		0x5F, 0x73, 0x74, 0x72, 0x6F, 0x6E, 0x67, 0x53,	0x77, 0x61,
 		0x6E, 0x5F, 0x35, 0x2E, 0x33, 0x2E, 0x33, 0x00,	0x00, 0x00,
@@ -827,8 +837,8 @@ END_TEST
  *
  *   0 constant header
  *  16   segment  1  -  16 octets
- *  20 eid 
- *  22   segment  2  -   6 octets 
+ *  20 eid
+ *  22   segment  2  -   6 octets
  *  24 timestamp
  *  26   segment  3  -   4 octets
  *  44 record_id