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

fixes to keep building.

40 files changed, 143 insertions, 65 deletions

diff --git a/src/regress/lib/libcrypto/aead/Makefile b/src/regress/lib/libcrypto/aead/Makefile
index 3f4f302efe..e25112884a 100644
--- a/src/regress/lib/libcrypto/aead/Makefile
+++ b/src/regress/lib/libcrypto/aead/Makefile
@@ -1,8 +1,10 @@
-#       $OpenBSD: Makefile,v 1.1 2014/05/15 13:56:14 jsing Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:45 miod Exp $
 
 PROG=   aeadtest
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 REGRESS_TARGETS=regress-aeadtest
 
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)
diff --git a/src/regress/lib/libcrypto/base64/Makefile b/src/regress/lib/libcrypto/base64/Makefile
index d16badf297..6ae6583b38 100644
--- a/src/regress/lib/libcrypto/base64/Makefile
+++ b/src/regress/lib/libcrypto/base64/Makefile
@@ -1,7 +1,9 @@
-#       $OpenBSD: Makefile,v 1.1 2014/05/03 15:07:46 jsing Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:45 miod Exp $
 
 PROG=   base64test
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/bf/Makefile b/src/regress/lib/libcrypto/bf/Makefile
index 056384939a..b43e61dd4b 100644
--- a/src/regress/lib/libcrypto/bf/Makefile
+++ b/src/regress/lib/libcrypto/bf/Makefile
@@ -1,7 +1,9 @@
-#       $OpenBSD: Makefile,v 1.1.1.1 2014/04/15 18:01:17 miod Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:45 miod Exp $
 
 PROG=   bftest
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/bn/Makefile b/src/regress/lib/libcrypto/bn/Makefile
index 30bc0ef297..ecc2e79075 100644
--- a/src/regress/lib/libcrypto/bn/Makefile
+++ b/src/regress/lib/libcrypto/bn/Makefile
@@ -1,7 +1,9 @@
-#       $OpenBSD: Makefile,v 1.1.1.1 2014/04/15 18:01:15 miod Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:45 miod Exp $
 
 PROG=   bntest
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/cast/Makefile b/src/regress/lib/libcrypto/cast/Makefile
index 9e14207b4a..0ee8e85e29 100644
--- a/src/regress/lib/libcrypto/cast/Makefile
+++ b/src/regress/lib/libcrypto/cast/Makefile
@@ -1,7 +1,9 @@
-#       $OpenBSD: Makefile,v 1.1.1.1 2014/04/15 18:01:17 miod Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:45 miod Exp $
 
 PROG=   casttest
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/chacha/Makefile b/src/regress/lib/libcrypto/chacha/Makefile
index b09dda17a1..182879c693 100644
--- a/src/regress/lib/libcrypto/chacha/Makefile
+++ b/src/regress/lib/libcrypto/chacha/Makefile
@@ -1,7 +1,9 @@
-#       $OpenBSD: Makefile,v 1.1 2014/05/01 13:15:22 jsing Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:45 miod Exp $
 
 PROG=   chachatest
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/chacha/chachatest.c b/src/regress/lib/libcrypto/chacha/chachatest.c
index ff67fbf59a..aa10939d7e 100644
--- a/src/regress/lib/libcrypto/chacha/chachatest.c
+++ b/src/regress/lib/libcrypto/chacha/chachatest.c
@@ -227,7 +227,7 @@ main(int argc, char **argv)
 {
         struct chacha_tv *tv;
         unsigned char *in, *out;
-        int i, j;
+        size_t i, j;
 
         for (i = 0; i < N_VECTORS; i++) {
                 tv = &chacha_test_vectors[i];
diff --git a/src/regress/lib/libcrypto/cts128/Makefile b/src/regress/lib/libcrypto/cts128/Makefile
index 4423e9c20b..31dd52bfce 100644
--- a/src/regress/lib/libcrypto/cts128/Makefile
+++ b/src/regress/lib/libcrypto/cts128/Makefile
@@ -1,7 +1,9 @@
-#       $OpenBSD: Makefile,v 1.1 2014/05/31 14:39:06 jsing Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:46 miod Exp $
 
 PROG=   cts128test
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/cts128/cts128test.c b/src/regress/lib/libcrypto/cts128/cts128test.c
index 84a3e0d46b..d910f3d4b8 100644
--- a/src/regress/lib/libcrypto/cts128/cts128test.c
+++ b/src/regress/lib/libcrypto/cts128/cts128test.c
@@ -12,6 +12,9 @@
 #include <openssl/aes.h>
 #include <openssl/modes.h>
 
+void test_vector(const unsigned char *vector,size_t len);
+void test_nistvector(const unsigned char *vector,size_t len);
+
 /* test vectors from RFC 3962 */
 static const unsigned char test_key[16] = "chicken teriyaki";
 static const unsigned char test_input[64] =
@@ -44,12 +47,15 @@ static const unsigned char vector_64[64] =
 
 static AES_KEY encks, decks;
 
-void test_vector(const unsigned char *vector,size_t len)
-{       unsigned char iv[sizeof(test_iv)];
+void
+test_vector(const unsigned char *vector,size_t len)
+{
+        unsigned char iv[sizeof(test_iv)];
         unsigned char cleartext[64],ciphertext[64];
         size_t tail;
 
-        printf("vector_%d\n",len); fflush(stdout);
+        printf("vector_%zu\n",len);
+        fflush(stdout);
 
         if ((tail=len%16) == 0) tail = 16;
         tail += 16;
@@ -58,41 +64,43 @@ void test_vector(const unsigned char *vector,size_t len)
         memcpy(iv,test_iv,sizeof(test_iv));
         CRYPTO_cts128_encrypt_block(test_input,ciphertext,len,&encks,iv,(block128_f)AES_encrypt);
         if (memcmp(ciphertext,vector,len))
-                fprintf(stderr,"output_%d mismatch\n",len), exit(1);
+                fprintf(stderr,"output_%zu mismatch\n",len), exit(1);
         if (memcmp(iv,vector+len-tail,sizeof(iv)))
-                fprintf(stderr,"iv_%d mismatch\n",len), exit(1);
+                fprintf(stderr,"iv_%zu mismatch\n",len), exit(1);
 
         /* test block-based decryption */
         memcpy(iv,test_iv,sizeof(test_iv));
         CRYPTO_cts128_decrypt_block(ciphertext,cleartext,len,&decks,iv,(block128_f)AES_decrypt);
         if (memcmp(cleartext,test_input,len))
-                fprintf(stderr,"input_%d mismatch\n",len), exit(2);
+                fprintf(stderr,"input_%zu mismatch\n",len), exit(2);
         if (memcmp(iv,vector+len-tail,sizeof(iv)))
-                fprintf(stderr,"iv_%d mismatch\n",len), exit(2);
+                fprintf(stderr,"iv_%zu mismatch\n",len), exit(2);
 
         /* test streamed encryption */
         memcpy(iv,test_iv,sizeof(test_iv));
         CRYPTO_cts128_encrypt(test_input,ciphertext,len,&encks,iv,(cbc128_f)AES_cbc_encrypt);
         if (memcmp(ciphertext,vector,len))
-                fprintf(stderr,"output_%d mismatch\n",len), exit(3);
+                fprintf(stderr,"output_%zu mismatch\n",len), exit(3);
         if (memcmp(iv,vector+len-tail,sizeof(iv)))
-                fprintf(stderr,"iv_%d mismatch\n",len), exit(3);
+                fprintf(stderr,"iv_%zu mismatch\n",len), exit(3);
 
         /* test streamed decryption */
         memcpy(iv,test_iv,sizeof(test_iv));
         CRYPTO_cts128_decrypt(ciphertext,cleartext,len,&decks,iv,(cbc128_f)AES_cbc_encrypt);
         if (memcmp(cleartext,test_input,len))
-                fprintf(stderr,"input_%d mismatch\n",len), exit(4);
+                fprintf(stderr,"input_%zu mismatch\n",len), exit(4);
         if (memcmp(iv,vector+len-tail,sizeof(iv)))
-                fprintf(stderr,"iv_%d mismatch\n",len), exit(4);
+                fprintf(stderr,"iv_%zu mismatch\n",len), exit(4);
 }
 
-void test_nistvector(const unsigned char *vector,size_t len)
-{       unsigned char iv[sizeof(test_iv)];
+void
+test_nistvector(const unsigned char *vector,size_t len)
+{
+        unsigned char iv[sizeof(test_iv)];
         unsigned char cleartext[64],ciphertext[64],nistvector[64];
         size_t tail;
 
-        printf("nistvector_%d\n",len); fflush(stdout);
+        printf("nistvector_%zu\n",len); fflush(stdout);
 
         if ((tail=len%16) == 0) tail = 16;
 
@@ -108,36 +116,37 @@ void test_nistvector(const unsigned char *vector,size_t len)
         memcpy(iv,test_iv,sizeof(test_iv));
         CRYPTO_nistcts128_encrypt_block(test_input,ciphertext,len,&encks,iv,(block128_f)AES_encrypt);
         if (memcmp(ciphertext,nistvector,len))
-                fprintf(stderr,"output_%d mismatch\n",len), exit(1);
+                fprintf(stderr,"output_%zu mismatch\n",len), exit(1);
         if (memcmp(iv,nistvector+len-tail,sizeof(iv)))
-                fprintf(stderr,"iv_%d mismatch\n",len), exit(1);
+                fprintf(stderr,"iv_%zu mismatch\n",len), exit(1);
 
         /* test block-based decryption */
         memcpy(iv,test_iv,sizeof(test_iv));
         CRYPTO_nistcts128_decrypt_block(ciphertext,cleartext,len,&decks,iv,(block128_f)AES_decrypt);
         if (memcmp(cleartext,test_input,len))
-                fprintf(stderr,"input_%d mismatch\n",len), exit(2);
+                fprintf(stderr,"input_%zu mismatch\n",len), exit(2);
         if (memcmp(iv,nistvector+len-tail,sizeof(iv)))
-                fprintf(stderr,"iv_%d mismatch\n",len), exit(2);
+                fprintf(stderr,"iv_%zu mismatch\n",len), exit(2);
 
         /* test streamed encryption */
         memcpy(iv,test_iv,sizeof(test_iv));
         CRYPTO_nistcts128_encrypt(test_input,ciphertext,len,&encks,iv,(cbc128_f)AES_cbc_encrypt);
         if (memcmp(ciphertext,nistvector,len))
-                fprintf(stderr,"output_%d mismatch\n",len), exit(3);
+                fprintf(stderr,"output_%zu mismatch\n",len), exit(3);
         if (memcmp(iv,nistvector+len-tail,sizeof(iv)))
-                fprintf(stderr,"iv_%d mismatch\n",len), exit(3);
+                fprintf(stderr,"iv_%zu mismatch\n",len), exit(3);
 
         /* test streamed decryption */
         memcpy(iv,test_iv,sizeof(test_iv));
         CRYPTO_nistcts128_decrypt(ciphertext,cleartext,len,&decks,iv,(cbc128_f)AES_cbc_encrypt);
         if (memcmp(cleartext,test_input,len))
-                fprintf(stderr,"input_%d mismatch\n",len), exit(4);
+                fprintf(stderr,"input_%zu mismatch\n",len), exit(4);
         if (memcmp(iv,nistvector+len-tail,sizeof(iv)))
-                fprintf(stderr,"iv_%d mismatch\n",len), exit(4);
+                fprintf(stderr,"iv_%zu mismatch\n",len), exit(4);
 }
 
-int main()
+int
+main(int argc, char *argv[])
 {
         AES_set_encrypt_key(test_key,128,&encks);
         AES_set_decrypt_key(test_key,128,&decks);
diff --git a/src/regress/lib/libcrypto/des/Makefile b/src/regress/lib/libcrypto/des/Makefile
index cd251bc24c..b79698341d 100644
--- a/src/regress/lib/libcrypto/des/Makefile
+++ b/src/regress/lib/libcrypto/des/Makefile
@@ -1,7 +1,9 @@
-#       $OpenBSD: Makefile,v 1.1.1.1 2014/04/15 18:01:18 miod Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:46 miod Exp $
 
 PROG=   destest
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/dh/Makefile b/src/regress/lib/libcrypto/dh/Makefile
index d4af5ed57e..66e42eeb31 100644
--- a/src/regress/lib/libcrypto/dh/Makefile
+++ b/src/regress/lib/libcrypto/dh/Makefile
@@ -1,7 +1,9 @@
-#       $OpenBSD: Makefile,v 1.1.1.1 2014/04/15 18:01:18 miod Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:46 miod Exp $
 
 PROG=   dhtest
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/dsa/Makefile b/src/regress/lib/libcrypto/dsa/Makefile
index cce7c3b0f6..b18840dec6 100644
--- a/src/regress/lib/libcrypto/dsa/Makefile
+++ b/src/regress/lib/libcrypto/dsa/Makefile
@@ -1,8 +1,10 @@
-#       $OpenBSD: Makefile,v 1.1.1.1 2014/04/15 18:01:18 miod Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:46 miod Exp $
 
 PROG=   dsatest
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 REGRESS_TARGETS=regress-dsatest
 
diff --git a/src/regress/lib/libcrypto/dsa/dsatest.c b/src/regress/lib/libcrypto/dsa/dsatest.c
index 3131f429e2..dcab96424c 100644
--- a/src/regress/lib/libcrypto/dsa/dsatest.c
+++ b/src/regress/lib/libcrypto/dsa/dsatest.c
@@ -130,10 +130,6 @@ int main(int argc, char **argv)
         if (bio_err == NULL)
                 bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
 
-        CRYPTO_malloc_debug_init();
-        CRYPTO_dbg_set_options(V_CRYPTO_MDEBUG_ALL);
-        CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
-
         ERR_load_crypto_strings();
 
         BIO_printf(bio_err,"test generation of DSA parameters\n");
diff --git a/src/regress/lib/libcrypto/ec/Makefile b/src/regress/lib/libcrypto/ec/Makefile
index f6dbef5b9b..f0ee5a0465 100644
--- a/src/regress/lib/libcrypto/ec/Makefile
+++ b/src/regress/lib/libcrypto/ec/Makefile
@@ -1,7 +1,9 @@
-#       $OpenBSD: Makefile,v 1.1.1.1 2014/04/15 18:01:16 miod Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:46 miod Exp $
 
 PROG=   ectest
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/ecdh/Makefile b/src/regress/lib/libcrypto/ecdh/Makefile
index 5eb18a3205..433648e93a 100644
--- a/src/regress/lib/libcrypto/ecdh/Makefile
+++ b/src/regress/lib/libcrypto/ecdh/Makefile
@@ -1,7 +1,9 @@
-#       $OpenBSD: Makefile,v 1.1.1.1 2014/04/15 18:01:16 miod Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:46 miod Exp $
 
 PROG=   ecdhtest
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/ecdsa/Makefile b/src/regress/lib/libcrypto/ecdsa/Makefile
index c171b51e56..59a43f7bbf 100644
--- a/src/regress/lib/libcrypto/ecdsa/Makefile
+++ b/src/regress/lib/libcrypto/ecdsa/Makefile
@@ -1,7 +1,9 @@
-#       $OpenBSD: Makefile,v 1.1.1.1 2014/04/15 18:01:16 miod Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:46 miod Exp $
 
 PROG=   ecdsatest
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/engine/Makefile b/src/regress/lib/libcrypto/engine/Makefile
index c77c8b8e79..b63454181b 100644
--- a/src/regress/lib/libcrypto/engine/Makefile
+++ b/src/regress/lib/libcrypto/engine/Makefile
@@ -1,7 +1,9 @@
-#       $OpenBSD: Makefile,v 1.1 2014/04/17 07:52:08 jsg Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:46 miod Exp $
 
 PROG=   enginetest
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/evp/Makefile b/src/regress/lib/libcrypto/evp/Makefile
index 11acf06a01..ce012a1849 100644
--- a/src/regress/lib/libcrypto/evp/Makefile
+++ b/src/regress/lib/libcrypto/evp/Makefile
@@ -1,8 +1,10 @@
-#       $OpenBSD: Makefile,v 1.1.1.1 2014/04/15 18:01:18 miod Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:46 miod Exp $
 
 PROG=   evptest
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 REGRESS_TARGETS=regress-evptest
 
diff --git a/src/regress/lib/libcrypto/exp/Makefile b/src/regress/lib/libcrypto/exp/Makefile
index e55fabe549..3c2cac8976 100644
--- a/src/regress/lib/libcrypto/exp/Makefile
+++ b/src/regress/lib/libcrypto/exp/Makefile
@@ -1,7 +1,9 @@
-#       $OpenBSD: Makefile,v 1.1.1.1 2014/04/15 18:01:16 miod Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:46 miod Exp $
 
 PROG=   exptest
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/gcm128/Makefile b/src/regress/lib/libcrypto/gcm128/Makefile
index c1ce651f51..1119fc3c1e 100644
--- a/src/regress/lib/libcrypto/gcm128/Makefile
+++ b/src/regress/lib/libcrypto/gcm128/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.2 2014/05/31 14:39:06 jsing Exp $
+#       $OpenBSD: Makefile,v 1.3 2014/06/01 11:11:46 miod Exp $
 
 PROG=   gcm128test
 SRC=    ${.CURDIR}/../../../../lib/libssl/src/crypto/modes
@@ -6,5 +6,7 @@ CFLAGS+=-I${SRC}
 
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+#WARNINGS=      Yes
+#CFLAGS+=       -Werror
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/gcm128/gcm128test.c b/src/regress/lib/libcrypto/gcm128/gcm128test.c
index 5ed8e0a714..57267b8dbf 100644
--- a/src/regress/lib/libcrypto/gcm128/gcm128test.c
+++ b/src/regress/lib/libcrypto/gcm128/gcm128test.c
@@ -327,7 +327,8 @@ static const u8 IV20[64]={0xff,0xff,0xff,0xff},	/* this results in 0xff in count
                 ret++, printf ("decrypt test#%d failed.\n",n);  \
         } while(0)
 
-int main()
+int
+main(int argc, char **argv)
 {
         GCM128_CONTEXT ctx;
         AES_KEY key;
diff --git a/src/regress/lib/libcrypto/hmac/Makefile b/src/regress/lib/libcrypto/hmac/Makefile
index 0bcb8f49aa..727bacc03d 100644
--- a/src/regress/lib/libcrypto/hmac/Makefile
+++ b/src/regress/lib/libcrypto/hmac/Makefile
@@ -1,7 +1,9 @@
-#       $OpenBSD: Makefile,v 1.1.1.1 2014/04/15 18:01:17 miod Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:46 miod Exp $
 
 PROG=   hmactest
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/idea/Makefile b/src/regress/lib/libcrypto/idea/Makefile
index 8188c68a4c..d689876864 100644
--- a/src/regress/lib/libcrypto/idea/Makefile
+++ b/src/regress/lib/libcrypto/idea/Makefile
@@ -1,7 +1,9 @@
-#       $OpenBSD: Makefile,v 1.1.1.1 2014/04/15 18:01:17 miod Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:46 miod Exp $
 
 PROG=   ideatest
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/ige/Makefile b/src/regress/lib/libcrypto/ige/Makefile
index 587259f412..3e3fa98e31 100644
--- a/src/regress/lib/libcrypto/ige/Makefile
+++ b/src/regress/lib/libcrypto/ige/Makefile
@@ -1,7 +1,9 @@
-#       $OpenBSD: Makefile,v 1.1.1.1 2014/04/15 18:01:18 miod Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:46 miod Exp $
 
 PROG=   igetest
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/md4/Makefile b/src/regress/lib/libcrypto/md4/Makefile
index ca015fa404..b142120e12 100644
--- a/src/regress/lib/libcrypto/md4/Makefile
+++ b/src/regress/lib/libcrypto/md4/Makefile
@@ -1,7 +1,9 @@
-#       $OpenBSD: Makefile,v 1.1.1.1 2014/04/15 18:01:17 miod Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:46 miod Exp $
 
 PROG=   md4test
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/md5/Makefile b/src/regress/lib/libcrypto/md5/Makefile
index 80dcb50dec..0c1de513b5 100644
--- a/src/regress/lib/libcrypto/md5/Makefile
+++ b/src/regress/lib/libcrypto/md5/Makefile
@@ -1,7 +1,9 @@
-#       $OpenBSD: Makefile,v 1.1.1.1 2014/04/15 18:01:17 miod Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:46 miod Exp $
 
 PROG=   md5test
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/mdc2/Makefile b/src/regress/lib/libcrypto/mdc2/Makefile
index 09674f96bf..9aa57ab23a 100644
--- a/src/regress/lib/libcrypto/mdc2/Makefile
+++ b/src/regress/lib/libcrypto/mdc2/Makefile
@@ -1,7 +1,9 @@
-#       $OpenBSD: Makefile,v 1.1.1.1 2014/04/15 18:01:17 miod Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:46 miod Exp $
 
 PROG=   mdc2test
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/poly1305/Makefile b/src/regress/lib/libcrypto/poly1305/Makefile
index 956b46973a..47e8065e9a 100644
--- a/src/regress/lib/libcrypto/poly1305/Makefile
+++ b/src/regress/lib/libcrypto/poly1305/Makefile
@@ -1,7 +1,9 @@
-#       $OpenBSD: Makefile,v 1.1 2014/05/14 14:46:35 jsing Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:46 miod Exp $
 
 PROG=   poly1305test
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/pqueue/Makefile b/src/regress/lib/libcrypto/pqueue/Makefile
index 09c6213e05..654ec95682 100644
--- a/src/regress/lib/libcrypto/pqueue/Makefile
+++ b/src/regress/lib/libcrypto/pqueue/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.4 2014/05/15 19:23:14 miod Exp $
+#       $OpenBSD: Makefile,v 1.5 2014/06/01 11:11:46 miod Exp $
 
 PROG=   pq_test
 SRC=    ${.CURDIR}/../../../../lib/libssl/src/ssl
@@ -6,6 +6,8 @@ CFLAGS+=	-I${SRC}
 
 LDADD=  -lssl -lcrypto
 DPADD=  ${LIBSSL} ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 REGRESS_TARGETS= regress-pq_test
 
diff --git a/src/regress/lib/libcrypto/rand/Makefile b/src/regress/lib/libcrypto/rand/Makefile
index 4284f49df8..4ceadcee0a 100644
--- a/src/regress/lib/libcrypto/rand/Makefile
+++ b/src/regress/lib/libcrypto/rand/Makefile
@@ -1,7 +1,9 @@
-#       $OpenBSD: Makefile,v 1.1.1.1 2014/04/15 18:01:18 miod Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:46 miod Exp $
 
 PROG=   randtest
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/rc2/Makefile b/src/regress/lib/libcrypto/rc2/Makefile
index 5681e0c923..91d642ac32 100644
--- a/src/regress/lib/libcrypto/rc2/Makefile
+++ b/src/regress/lib/libcrypto/rc2/Makefile
@@ -1,7 +1,9 @@
-#       $OpenBSD: Makefile,v 1.1.1.1 2014/04/15 18:01:17 miod Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:46 miod Exp $
 
 PROG=   rc2test
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/rc4/Makefile b/src/regress/lib/libcrypto/rc4/Makefile
index 0e6cf27b71..37651f7f2d 100644
--- a/src/regress/lib/libcrypto/rc4/Makefile
+++ b/src/regress/lib/libcrypto/rc4/Makefile
@@ -1,7 +1,9 @@
-#       $OpenBSD: Makefile,v 1.1.1.1 2014/04/15 18:01:17 miod Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:46 miod Exp $
 
 PROG=   rc4test
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/rmd/Makefile b/src/regress/lib/libcrypto/rmd/Makefile
index 2100f99b38..8f92e69ac1 100644
--- a/src/regress/lib/libcrypto/rmd/Makefile
+++ b/src/regress/lib/libcrypto/rmd/Makefile
@@ -1,7 +1,9 @@
-#       $OpenBSD: Makefile,v 1.1.1.1 2014/04/15 18:01:17 miod Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:46 miod Exp $
 
 PROG=   rmdtest
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/sha/Makefile b/src/regress/lib/libcrypto/sha/Makefile
index a6bdec61ea..6863772ff8 100644
--- a/src/regress/lib/libcrypto/sha/Makefile
+++ b/src/regress/lib/libcrypto/sha/Makefile
@@ -1,7 +1,9 @@
-#       $OpenBSD: Makefile,v 1.1.1.1 2014/04/15 18:01:17 miod Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:46 miod Exp $
 
 PROG=   shatest
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/sha1/Makefile b/src/regress/lib/libcrypto/sha1/Makefile
index 8dfe4fcc8a..57530ea384 100644
--- a/src/regress/lib/libcrypto/sha1/Makefile
+++ b/src/regress/lib/libcrypto/sha1/Makefile
@@ -1,7 +1,9 @@
-#       $OpenBSD: Makefile,v 1.1.1.1 2014/04/15 18:01:17 miod Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:46 miod Exp $
 
 PROG=   sha1test
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/sha256/Makefile b/src/regress/lib/libcrypto/sha256/Makefile
index 7c4bdc1035..b97b9926de 100644
--- a/src/regress/lib/libcrypto/sha256/Makefile
+++ b/src/regress/lib/libcrypto/sha256/Makefile
@@ -1,7 +1,9 @@
-#       $OpenBSD: Makefile,v 1.1 2014/05/30 15:38:28 jsing Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:46 miod Exp $
 
 PROG=   sha256test
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/sha512/Makefile b/src/regress/lib/libcrypto/sha512/Makefile
index 176da35c2d..31658f9f07 100644
--- a/src/regress/lib/libcrypto/sha512/Makefile
+++ b/src/regress/lib/libcrypto/sha512/Makefile
@@ -1,7 +1,9 @@
-#       $OpenBSD: Makefile,v 1.1 2014/05/30 15:38:28 jsing Exp $
+#       $OpenBSD: Makefile,v 1.2 2014/06/01 11:11:46 miod Exp $
 
 PROG=   sha512test
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
+WARNINGS=       Yes
+CFLAGS+=        -Werror
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/utf8/Makefile b/src/regress/lib/libcrypto/utf8/Makefile
index 8c9f5f8a95..b5767ac204 100644
--- a/src/regress/lib/libcrypto/utf8/Makefile
+++ b/src/regress/lib/libcrypto/utf8/Makefile
@@ -1,9 +1,10 @@
-#       $OpenBSD: Makefile,v 1.2 2014/05/22 03:36:23 guenther Exp $
+#       $OpenBSD: Makefile,v 1.3 2014/06/01 11:11:46 miod Exp $
 
 PROG=   utf8test
 CPPFLAGS+=-I${.CURDIR}/../../../../lib/libssl/src/crypto/asn1
 LDADD=  -lcrypto
 DPADD=  ${LIBCRYPTO}
 WARNINGS=Yes
+CFLAGS+=        -Werror
 
 .include <bsd.regress.mk>