Make libssl and libcrypto compile with -Werror

ok miod@

diff --git a/lib/libcrypto/crypto/Makefile b/lib/libcrypto/crypto/Makefile
index f46702b..7259e46 100644 (file)
--- a/lib/libcrypto/crypto/Makefile
+++ b/lib/libcrypto/crypto/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.26 2014/04/18 19:41:21 miod Exp $
+# $OpenBSD: Makefile,v 1.27 2014/04/23 05:13:57 beck Exp $
 
 LIB=   crypto
 
 SSL_SRC=       ${.CURDIR}/../../libssl/src
 LCRYPTO_SRC=   ${SSL_SRC}/crypto
 
-CFLAGS+= -Wall
+CFLAGS+= -Wall -Werror
 
 .include <bsd.own.mk>          # for 'NOPIC' definition
 .if !defined(NOPIC)

diff --git a/lib/libcrypto/engine/hw_cryptodev.c b/lib/libcrypto/engine/hw_cryptodev.c
index bc95387..190dcc4 100644 (file)
--- a/lib/libcrypto/engine/hw_cryptodev.c
+++ b/lib/libcrypto/engine/hw_cryptodev.c
@@ -654,7 +654,7 @@ xcrypt_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
        unsigned char *ivs = DOALIGN(ivs_store);
        void *iiv, *iv = NULL, *ivp = NULL;
        const void *usein = in;
-       void *useout = out, *spare;
+       void *useout = out, *spare = NULL;
        int cws[4 + 3], *cw = DOALIGN(cws);
 
        if (!inl)

diff --git a/lib/libssl/d1_srvr.c b/lib/libssl/d1_srvr.c
index 8fa7581..9995278 100644 (file)
--- a/lib/libssl/d1_srvr.c
+++ b/lib/libssl/d1_srvr.c
@@ -1016,7 +1016,7 @@ dtls1_send_server_key_exchange(SSL *s)
 
 #endif
 #ifndef OPENSSL_NO_PSK
-       size_t pskhintlen;
+       size_t pskhintlen = 0;
 #endif
        EVP_PKEY *pkey;
        unsigned char *p, *d;

diff --git a/lib/libssl/s3_srvr.c b/lib/libssl/s3_srvr.c
index ea3137c..f3edcc2 100644 (file)
--- a/lib/libssl/s3_srvr.c
+++ b/lib/libssl/s3_srvr.c
@@ -1552,7 +1552,7 @@ ssl3_send_server_key_exchange(SSL *s)
 
 #endif
 #ifndef OPENSSL_NO_PSK
-       size_t pskhintlen;
+       size_t pskhintlen = 0;
 #endif
        EVP_PKEY *pkey;
        const EVP_MD *md = NULL;

diff --git a/lib/libssl/src/crypto/engine/hw_cryptodev.c b/lib/libssl/src/crypto/engine/hw_cryptodev.c
index bc95387..190dcc4 100644 (file)
--- a/lib/libssl/src/crypto/engine/hw_cryptodev.c
+++ b/lib/libssl/src/crypto/engine/hw_cryptodev.c
@@ -654,7 +654,7 @@ xcrypt_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
        unsigned char *ivs = DOALIGN(ivs_store);
        void *iiv, *iv = NULL, *ivp = NULL;
        const void *usein = in;
-       void *useout = out, *spare;
+       void *useout = out, *spare = NULL;
        int cws[4 + 3], *cw = DOALIGN(cws);
 
        if (!inl)

diff --git a/lib/libssl/src/ssl/d1_srvr.c b/lib/libssl/src/ssl/d1_srvr.c
index 8fa7581..9995278 100644 (file)
--- a/lib/libssl/src/ssl/d1_srvr.c
+++ b/lib/libssl/src/ssl/d1_srvr.c
@@ -1016,7 +1016,7 @@ dtls1_send_server_key_exchange(SSL *s)
 
 #endif
 #ifndef OPENSSL_NO_PSK
-       size_t pskhintlen;
+       size_t pskhintlen = 0;
 #endif
        EVP_PKEY *pkey;
        unsigned char *p, *d;

diff --git a/lib/libssl/src/ssl/s3_srvr.c b/lib/libssl/src/ssl/s3_srvr.c
index ea3137c..f3edcc2 100644 (file)
--- a/lib/libssl/src/ssl/s3_srvr.c
+++ b/lib/libssl/src/ssl/s3_srvr.c
@@ -1552,7 +1552,7 @@ ssl3_send_server_key_exchange(SSL *s)
 
 #endif
 #ifndef OPENSSL_NO_PSK
-       size_t pskhintlen;
+       size_t pskhintlen = 0;
 #endif
        EVP_PKEY *pkey;
        const EVP_MD *md = NULL;

diff --git a/lib/libssl/ssl/Makefile b/lib/libssl/ssl/Makefile
index 2deb1b6..64dd10b 100644 (file)
--- a/lib/libssl/ssl/Makefile
+++ b/lib/libssl/ssl/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.39 2014/04/17 20:44:04 tedu Exp $
+# $OpenBSD: Makefile,v 1.40 2014/04/23 05:13:57 beck Exp $
 
 LIB=   ssl
 
 SSL_SRC=       ${.CURDIR}/../../libssl/src
 LSSL_SRC=      ${SSL_SRC}/ssl
 
-CFLAGS+= -Wall
+CFLAGS+= -Wall -Werror
 CFLAGS+= -DTERMIOS -DANSI_SOURCE
 CFLAGS+= -DOPENSSL_NO_RC5 -DOPENSSL_NO_KRB5
 CFLAGS+= -I${SSL_SRC}