From 6d57bb6a4a9d2a4de68ccdf5ff2478d8b5129a7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@h5l.org>
Date: Fri, 14 Feb 2014 19:26:20 -0800
Subject: [PATCH] quiet warnings

---
 lib/hcrypto/mdtest.c      | 10 +++++-----
 lib/hcrypto/test_cipher.c | 15 ++++++++++-----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/lib/hcrypto/mdtest.c b/lib/hcrypto/mdtest.c
index 3e06bf9c1..b3559c756 100644
--- a/lib/hcrypto/mdtest.c
+++ b/lib/hcrypto/mdtest.c
@@ -140,7 +140,7 @@ struct test md2_tests[] = {
      "\xda\x33\xde\xf2\xa4\x2d\xf1\x39\x75\x35\x28\x46\xc3\x03\x38\xcd" },
     {"12345678901234567890123456789012345678901234567890123456789012345678901234567890",
      "\xd5\x97\x6f\x79\xd8\x3d\x3a\x0d\xc9\x80\x6c\x3c\x66\xf3\xef\xd8" },
-    {NULL }
+    {NULL, { 0 } }
 };
 
 struct test md4_tests[] = {
@@ -184,7 +184,7 @@ struct test sha1_tests[] = {
       {0x34, 0xaa, 0x97, 0x3c, 0xd4, 0xc4, 0xda, 0xa4,
        0xf6, 0x1e, 0xeb, 0x2b, 0xdb, 0xad, 0x27, 0x31,
        0x65, 0x34, 0x01, 0x6f}},
-    { NULL }
+    { NULL, { 0 } }
 };
 
 struct test sha256_tests[] = {
@@ -203,7 +203,7 @@ struct test sha256_tests[] = {
        0x81,0xa1,0xc7,0xe2, 0x84,0xd7,0x3e,0x67,
        0xf1,0x80,0x9a,0x48, 0xa4,0x97,0x20,0x0e,
        0x04,0x6d,0x39,0xcc, 0xc7,0x11,0x2c,0xd0 }},
-    { NULL }
+    { NULL, { 0 } }
 };
 
 struct test sha384_tests[] = {
@@ -229,7 +229,7 @@ struct test sha384_tests[] = {
 	0x79,0x72,0xce,0xc5,0x70,0x4c,0x2a,0x5b,
 	0x07,0xb8,0xb3,0xdc,0x38,0xec,0xc4,0xeb,
 	0xae,0x97,0xdd,0xd8,0x7f,0x3d,0x89,0x85}},
-    {NULL}
+    {NULL, { 0 }}
 };
 
 struct test sha512_tests[] = {
@@ -261,7 +261,7 @@ struct test sha512_tests[] = {
 	0x4c,0xb0,0x43,0x2c,0xe5,0x77,0xc3,0x1b,
 	0xeb,0x00,0x9c,0x5c,0x2c,0x49,0xaa,0x2e,
 	0x4e,0xad,0xb2,0x17,0xad,0x8c,0xc0,0x9b }},
-    { NULL }
+    { NULL, { 0 } }
 };
 
 static int
diff --git a/lib/hcrypto/test_cipher.c b/lib/hcrypto/test_cipher.c
index 8e54435a0..8075efb3e 100644
--- a/lib/hcrypto/test_cipher.c
+++ b/lib/hcrypto/test_cipher.c
@@ -68,7 +68,8 @@ struct tests aes_tests[] = {
       "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
       16,
       "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
-      "\xdc\x95\xc0\x78\xa2\x40\x89\x89\xad\x48\xa2\x14\x92\x84\x20\x87"
+      "\xdc\x95\xc0\x78\xa2\x40\x89\x89\xad\x48\xa2\x14\x92\x84\x20\x87",
+      NULL
     }
 };
 
@@ -79,7 +80,8 @@ struct tests aes_cfb_tests[] = {
       "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
       16,
       "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
-      "\x66\xe9\x4b\xd4\xef\x8a\x2c\x3b\x88\x4c\xfa\x59\xca\x34\x2b\x2e"
+      "\x66\xe9\x4b\xd4\xef\x8a\x2c\x3b\x88\x4c\xfa\x59\xca\x34\x2b\x2e",
+      NULL
     }
 };
 
@@ -90,7 +92,8 @@ struct tests rc2_40_tests[] = {
       "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
       16,
       "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
-      "\xc0\xb8\xff\xa5\xd6\xeb\xc9\x62\xcc\x52\x5f\xfe\x9a\x3c\x97\xe6"
+      "\xc0\xb8\xff\xa5\xd6\xeb\xc9\x62\xcc\x52\x5f\xfe\x9a\x3c\x97\xe6",
+      NULL
     }
 };
 
@@ -103,7 +106,8 @@ struct tests des_ede3_tests[] = {
       "\xbf\x9a\x12\xb7\x26\x69\xfd\x05",
       16,
       "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
-      "\x55\x95\x97\x76\xa9\x6c\x66\x40\x64\xc7\xf4\x1c\x21\xb7\x14\x1b"
+      "\x55\x95\x97\x76\xa9\x6c\x66\x40\x64\xc7\xf4\x1c\x21\xb7\x14\x1b",
+      NULL
     }
 };
 
@@ -223,7 +227,8 @@ struct tests rc4_tests[] = {
 	"\x89\x21\xc2\xf5\xa4\x63\x93\x8c"
 	"\xe0\x98\x22\x65\xee\xf7\x01\x79"
 	"\xbc\x55\x3f\x33\x9e\xb1\xa4\xc1"
-	"\xaf\x5f\x6a\x54\x7f"
+	"\xaf\x5f\x6a\x54\x7f",
+	NULL
     }
 };