r18357: Convert more crypto tests from using function results as initialisers.

(Fails on older Unix C compilers)

Andrew Bartlett
(This used to be commit a4cc13a93fc2f18bfb266603617e14d1cc7ceecf)

1 files changed, 33 insertions, 33 deletions

diff --git a/source4/lib/crypto/hmacmd5test.c b/source4/lib/crypto/hmacmd5test.c
index a1d3ff0ee1..2c0db14762 100644
--- a/source4/lib/crypto/hmacmd5test.c
+++ b/source4/lib/crypto/hmacmd5test.c
@@ -40,40 +40,40 @@ BOOL torture_local_crypto_hmacmd5(struct torture_context *torture)
 		DATA_BLOB key;
 		DATA_BLOB data;
 		DATA_BLOB md5;
-	} testarray[] = {
-	{
-		.key	= data_blob_repeat_byte(0x0b, 16),
-		.data	= data_blob_string_const("Hi There"),
-		.md5	= strhex_to_data_blob("9294727a3638bb1c13f48ef8158bfc9d")
-	},{
-		.key	= data_blob_string_const("Jefe"),
-		.data	= data_blob_string_const("what do ya want for nothing?"),
-		.md5	= strhex_to_data_blob("750c783e6ab0b503eaa86e310a5db738")
-	},{
-		.key	= data_blob_repeat_byte(0xaa, 16),
-		.data	= data_blob_repeat_byte(0xdd, 50),
-		.md5	= strhex_to_data_blob("56be34521d144c88dbb8c733f0e8b3f6")
-	},{
-		.key	= strhex_to_data_blob("0102030405060708090a0b0c0d0e0f10111213141516171819"),
-		.data	= data_blob_repeat_byte(0xcd, 50),
-		.md5	= strhex_to_data_blob("697eaf0aca3a3aea3a75164746ffaa79")
-	},{
-		.key	= data_blob_repeat_byte(0x0c, 16),
-		.data	= data_blob_string_const("Test With Truncation"),
-		.md5	= strhex_to_data_blob("56461ef2342edc00f9bab995690efd4c")
-	},{
-		.key	= data_blob_repeat_byte(0xaa, 80),
-		.data	= data_blob_string_const("Test Using Larger Than Block-Size Key - Hash Key First"),
-		.md5	= strhex_to_data_blob("6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd")
-	},{
-		.key	= data_blob_repeat_byte(0xaa, 80),
-		.data	= data_blob_string_const("Test Using Larger Than Block-Size Key "
-						 "and Larger Than One Block-Size Data"),
-		.md5	= strhex_to_data_blob("6f630fad67cda0ee1fb1f562db3aa53e")
-	}
-	};
+	} testarray[8];
+
+	testarray[0].key	= data_blob_repeat_byte(0x0b, 16);
+	testarray[0].data	= data_blob_string_const("Hi There");
+	testarray[0].md5	= strhex_to_data_blob("9294727a3638bb1c13f48ef8158bfc9d");
+
+	testarray[1].key	= data_blob_string_const("Jefe");
+	testarray[1].data	= data_blob_string_const("what do ya want for nothing?");
+	testarray[1].md5	= strhex_to_data_blob("750c783e6ab0b503eaa86e310a5db738");
+
+	testarray[2].key	= data_blob_repeat_byte(0xaa, 16);
+	testarray[2].data	= data_blob_repeat_byte(0xdd, 50);
+	testarray[2].md5	= strhex_to_data_blob("56be34521d144c88dbb8c733f0e8b3f6");
+
+	testarray[3].key	= strhex_to_data_blob("0102030405060708090a0b0c0d0e0f10111213141516171819");
+	testarray[3].data	= data_blob_repeat_byte(0xcd, 50);
+	testarray[3].md5	= strhex_to_data_blob("697eaf0aca3a3aea3a75164746ffaa79");
+
+	testarray[4].key	= data_blob_repeat_byte(0x0c, 16);
+	testarray[4].data	= data_blob_string_const("Test With Truncation");
+	testarray[4].md5	= strhex_to_data_blob("56461ef2342edc00f9bab995690efd4c");
+
+	testarray[5].key	= data_blob_repeat_byte(0xaa, 80);
+	testarray[5].data	= data_blob_string_const("Test Using Larger Than Block-Size Key - Hash Key First");
+	testarray[5].md5	= strhex_to_data_blob("6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd");
+
+	testarray[6].key	= data_blob_repeat_byte(0xaa, 80);
+	testarray[6].data	= data_blob_string_const("Test Using Larger Than Block-Size Key "
+							 "and Larger Than One Block-Size Data");
+	testarray[6].md5	= strhex_to_data_blob("6f630fad67cda0ee1fb1f562db3aa53e");
+
+	testarray[7].key        = data_blob(NULL, 0);
 
-	for (i=0; i < ARRAY_SIZE(testarray); i++) {
+	for (i=0; testarray[i].key.data; i++) {
 		HMACMD5Context ctx;
 		uint8_t md5[16];
 		int e;