X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=test%2Ftest%2Ftest_cryptodev_kasumi_hash_test_vectors.h;h=a6dd4f5c50ec55841e446dcf6fe0c4516ed1e726;hb=9333cfba3bee4e1470344422cfb6531b8e09fceb;hp=61dbb09e8064a5eb7fbf6b6e050eb21131e225b4;hpb=4792d3ea858ef636b4ee8a34e1fcd767174f056a;p=dpdk.git

diff --git a/test/test/test_cryptodev_kasumi_hash_test_vectors.h b/test/test/test_cryptodev_kasumi_hash_test_vectors.h
index 61dbb09e80..a6dd4f5c50 100644
--- a/test/test/test_cryptodev_kasumi_hash_test_vectors.h
+++ b/test/test/test_cryptodev_kasumi_hash_test_vectors.h
@@ -39,24 +39,16 @@ struct kasumi_hash_test_data {
 		unsigned len;
 	} key;
 
-	/* Includes: COUNT (4 bytes) and FRESH (4 bytes) */
-	struct {
-		uint8_t data[8];
-		unsigned len;
-	} auth_iv;
-
-	/* Includes message and DIRECTION (1 bit), plus 1 0*,
-	 * with enough 0s, so total length is multiple of 64 bits */
+	/*
+	 * Includes COUNT (4 bytes), FRESH (4 bytes), message
+	 * and DIRECTION (1 bit), plus 1 0*, with enough 0s,
+	 * so total length is multiple of 8 or 64 bits
+	 */
 	struct {
 		uint8_t data[2056];
 		unsigned len; /* length must be in Bits */
 	} plaintext;
 
-	/* Actual length of data to be hashed */
-	struct {
-		unsigned len;
-	} validAuthLenInBits;
-
 	struct {
 		uint8_t data[64];
 		unsigned len;
@@ -71,22 +63,14 @@ struct kasumi_hash_test_data kasumi_hash_test_case_1 = {
 		},
 		.len = 16
 	},
-	.auth_iv = {
-		.data = {
-			0x38, 0xA6, 0xF0, 0x56, 0x05, 0xD2, 0xEC, 0x49,
-		},
-		.len = 8
-	},
 	.plaintext = {
 		.data = {
+			0x38, 0xA6, 0xF0, 0x56, 0x05, 0xD2, 0xEC, 0x49,
 			0x6B, 0x22, 0x77, 0x37, 0x29, 0x6F, 0x39, 0x3C,
 			0x80, 0x79, 0x35, 0x3E, 0xDC, 0x87, 0xE2, 0xE8,
 			0x05, 0xD2, 0xEC, 0x49, 0xA4, 0xF2, 0xD8, 0xE2
 		},
-		.len = 192
-	},
-	.validAuthLenInBits = {
-		.len = 189
+		.len = 256
 	},
 	.digest = {
 		.data = {0xF6, 0x3B, 0xD7, 0x2C},
@@ -102,23 +86,15 @@ struct kasumi_hash_test_data kasumi_hash_test_case_2 = {
 		},
 		.len = 16
 	},
-	.auth_iv = {
-		.data = {
-			0x3E, 0xDC, 0x87, 0xE2, 0xA4, 0xF2, 0xD8, 0xE2,
-		},
-		.len = 8
-	},
 	.plaintext = {
 		.data = {
+			0x3E, 0xDC, 0x87, 0xE2, 0xA4, 0xF2, 0xD8, 0xE2,
 			0xB5, 0x92, 0x43, 0x84, 0x32, 0x8A, 0x4A, 0xE0,
 			0x0B, 0x73, 0x71, 0x09, 0xF8, 0xB6, 0xC8, 0xDD,
 			0x2B, 0x4D, 0xB6, 0x3D, 0xD5, 0x33, 0x98, 0x1C,
 			0xEB, 0x19, 0xAA, 0xD5, 0x2A, 0x5B, 0x2B, 0xC3
 		},
-		.len = 256
-	},
-	.validAuthLenInBits = {
-		.len = 254
+		.len = 320
 	},
 	.digest = {
 		.data = {0xA9, 0xDA, 0xF1, 0xFF},
@@ -134,14 +110,9 @@ struct kasumi_hash_test_data kasumi_hash_test_case_3 = {
 		},
 		.len = 16
 	},
-	.auth_iv = {
-		.data = {
-			0x36, 0xAF, 0x61, 0x44, 0x98, 0x38, 0xF0, 0x3A,
-		},
-		.len = 8
-	},
 	.plaintext = {
 		.data = {
+			0x36, 0xAF, 0x61, 0x44, 0x98, 0x38, 0xF0, 0x3A,
 			0x59, 0x32, 0xBC, 0x0A, 0xCE, 0x2B, 0x0A, 0xBA,
 			0x33, 0xD8, 0xAC, 0x18, 0x8A, 0xC5, 0x4F, 0x34,
 			0x6F, 0xAD, 0x10, 0xBF, 0x9D, 0xEE, 0x29, 0x20,
@@ -149,10 +120,7 @@ struct kasumi_hash_test_data kasumi_hash_test_case_3 = {
 			0xDF, 0x6C, 0xAA, 0x72, 0x05, 0x3A, 0xBF, 0xF3,
 			0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 		},
-		.len = 384
-	},
-	.validAuthLenInBits = {
-		.len = 319
+		.len = 448
 	},
 	.digest = {
 		.data = {0x15, 0x37, 0xD3, 0x16},
@@ -168,14 +136,9 @@ struct kasumi_hash_test_data kasumi_hash_test_case_4 = {
 		},
 	.len = 16
 	},
-	.auth_iv = {
-		.data = {
-			0x14, 0x79, 0x3E, 0x41, 0x03, 0x97, 0xE8, 0xFD
-		},
-		.len = 8
-	},
 	.plaintext = {
 		.data = {
+			0x14, 0x79, 0x3E, 0x41, 0x03, 0x97, 0xE8, 0xFD,
 			0xD0, 0xA7, 0xD4, 0x63, 0xDF, 0x9F, 0xB2, 0xB2,
 			0x78, 0x83, 0x3F, 0xA0, 0x2E, 0x23, 0x5A, 0xA1,
 			0x72, 0xBD, 0x97, 0x0C, 0x14, 0x73, 0xE1, 0x29,
@@ -184,11 +147,8 @@ struct kasumi_hash_test_data kasumi_hash_test_case_4 = {
 			0xA4, 0x99, 0x27, 0x6A, 0x50, 0x42, 0x70, 0x09,
 			0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 		},
-		.len = 448
+		.len = 512
 	},
-	.validAuthLenInBits = {
-		.len = 384
-		},
 	.digest = {
 		.data = {0xDD, 0x7D, 0xFA, 0xDD },
 		.len  = 4
@@ -203,14 +163,9 @@ struct kasumi_hash_test_data kasumi_hash_test_case_5 = {
 		},
 		.len = 16
 	},
-	.auth_iv = {
-		.data = {
-			0x29, 0x6F, 0x39, 0x3C, 0x6B, 0x22, 0x77, 0x37,
-		},
-		.len = 8
-	},
 	.plaintext = {
 		.data = {
+			0x29, 0x6F, 0x39, 0x3C, 0x6B, 0x22, 0x77, 0x37,
 			0x10, 0xBF, 0xFF, 0x83, 0x9E, 0x0C, 0x71, 0x65,
 			0x8D, 0xBB, 0x2D, 0x17, 0x07, 0xE1, 0x45, 0x72,
 			0x4F, 0x41, 0xC1, 0x6F, 0x48, 0xBF, 0x40, 0x3C,
@@ -228,10 +183,7 @@ struct kasumi_hash_test_data kasumi_hash_test_case_5 = {
 			0x3D, 0x7C, 0xFE, 0xE9, 0x45, 0x85, 0xB5, 0x88,
 			0x5C, 0xAC, 0x46, 0x06, 0x8B, 0xC0, 0x00, 0x00
 		},
-		.len = 1024
-	},
-	.validAuthLenInBits = {
-		.len = 1000
+		.len = 1088
 	},
 	.digest = {
 		.data = {0xC3, 0x83, 0x83, 0x9D},
@@ -247,14 +199,9 @@ struct kasumi_hash_test_data kasumi_hash_test_case_6 = {
 		},
 		.len = 16
 	},
-	.auth_iv = {
-		.data = {
-			0x36, 0xAF, 0x61, 0x44, 0x4F, 0x30, 0x2A, 0xD2
-		},
-		.len = 8
-	},
 	.plaintext = {
 		.data = {
+			0x36, 0xAF, 0x61, 0x44, 0x4F, 0x30, 0x2A, 0xD2,
 			0x35, 0xC6, 0x87, 0x16, 0x63, 0x3C, 0x66, 0xFB,
 			0x75, 0x0C, 0x26, 0x68, 0x65, 0xD5, 0x3C, 0x11,
 			0xEA, 0x05, 0xB1, 0xE9, 0xFA, 0x49, 0xC8, 0x39,
@@ -269,10 +216,7 @@ struct kasumi_hash_test_data kasumi_hash_test_case_6 = {
 			0x74, 0xCD, 0xA5, 0xA4, 0x85, 0xF7, 0x4D, 0x7A,
 			0xC0
 		},
-		.len = 776
-	},
-	.validAuthLenInBits = {
-		.len = 768
+		.len = 840
 	},
 	.digest = {
 		.data = {0x95, 0xAE, 0x41, 0xBA},
@@ -288,21 +232,13 @@ struct kasumi_hash_test_data kasumi_hash_test_case_7 = {
 		},
 		.len = 16
 	},
-	.auth_iv = {
-		.data = {
-			0x38, 0xA6, 0xF0, 0x56, 0x05, 0xD2, 0xEC, 0x49,
-		},
-		.len = 8
-	},
 	.plaintext = {
 		.data = {
+			0x38, 0xA6, 0xF0, 0x56, 0x05, 0xD2, 0xEC, 0x49,
 			0xAD, 0x9C, 0x44, 0x1F, 0x89, 0x0B, 0x38, 0xC4,
 			0x57, 0xA4, 0x9D, 0x42, 0x14, 0x07, 0xE8, 0xC0
 		},
-		.len = 128
-	},
-	.validAuthLenInBits = {
-		.len = 120
+		.len = 192
 	},
 	.digest = {
 		.data = {0x87, 0x5F, 0xE4, 0x89},