Build these tests with WARNINGS=Yes and -Werror, and do the necessary

fixes to keep building.

2 files changed, 7 insertions, 2 deletions

diff --git a/src/regress/lib/libcrypto/aeswrap/Makefile b/src/regress/lib/libcrypto/aeswrap/Makefile
index c869e5f4d2..45234533c5 100644
--- a/src/regress/lib/libcrypto/aeswrap/Makefile
+++ b/src/regress/lib/libcrypto/aeswrap/Makefile
@@ -1,7 +1,9 @@
-#       $OpenBSD: Makefile,v 1.2 2014/05/30 15:17:43 jsing Exp $
+#       $OpenBSD: Makefile,v 1.3 2014/06/01 11:11:45 miod Exp $
 
 PROG=   aes_wrap
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/aeswrap/aes_wrap.c b/src/regress/lib/libcrypto/aeswrap/aes_wrap.c
index b5157d715c..c0c56327f1 100644
--- a/src/regress/lib/libcrypto/aeswrap/aes_wrap.c
+++ b/src/regress/lib/libcrypto/aeswrap/aes_wrap.c
@@ -53,9 +53,13 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <openssl/aes.h>
 
+int AES_wrap_unwrap_test(const unsigned char *, int, const unsigned char *,
+        const unsigned char *, const unsigned char *, int);
+
 int
 AES_wrap_unwrap_test(const unsigned char *kek, int keybits,
     const unsigned char *iv, const unsigned char *eout,
@@ -150,7 +154,6 @@ main(int argc, char **argv)
                 0xfb, 0x98, 0x8b, 0x9b, 0x7a, 0x02, 0xdd, 0x21
         };
 
-        AES_KEY wctx, xctx;
         int ret, nfailures = 0;
         ret = AES_wrap_unwrap_test(kek, 128, NULL, e1, key, 16);
         if (ret == 0)