summaryrefslogtreecommitdiff
path: root/src/lib/libssl/src
diff options
context:
space:
mode:
authorbeck <>2014-04-23 05:13:57 +0000
committerbeck <>2014-04-23 05:13:57 +0000
commit804a07b674122050982b3af76f310f9871681f54 (patch)
treeb5415b426cfb8210b12509eaea6a98e34497d447 /src/lib/libssl/src
parent63dce68244cb92dbbf98350874c7923ed37a57cc (diff)
downloadopenbsd-804a07b674122050982b3af76f310f9871681f54.tar.gz
openbsd-804a07b674122050982b3af76f310f9871681f54.tar.bz2
openbsd-804a07b674122050982b3af76f310f9871681f54.zip
Make libssl and libcrypto compile with -Werror
ok miod@
Diffstat (limited to 'src/lib/libssl/src')
-rw-r--r--src/lib/libssl/src/crypto/engine/hw_cryptodev.c2
-rw-r--r--src/lib/libssl/src/ssl/d1_srvr.c2
-rw-r--r--src/lib/libssl/src/ssl/s3_srvr.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/src/crypto/engine/hw_cryptodev.c b/src/lib/libssl/src/crypto/engine/hw_cryptodev.c
index bc953872dd..190dcc4f75 100644
--- a/src/lib/libssl/src/crypto/engine/hw_cryptodev.c
+++ b/src/lib/libssl/src/crypto/engine/hw_cryptodev.c
@@ -654,7 +654,7 @@ xcrypt_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
654 unsigned char *ivs = DOALIGN(ivs_store); 654 unsigned char *ivs = DOALIGN(ivs_store);
655 void *iiv, *iv = NULL, *ivp = NULL; 655 void *iiv, *iv = NULL, *ivp = NULL;
656 const void *usein = in; 656 const void *usein = in;
657 void *useout = out, *spare; 657 void *useout = out, *spare = NULL;
658 int cws[4 + 3], *cw = DOALIGN(cws); 658 int cws[4 + 3], *cw = DOALIGN(cws);
659 659
660 if (!inl) 660 if (!inl)
diff --git a/src/lib/libssl/src/ssl/d1_srvr.c b/src/lib/libssl/src/ssl/d1_srvr.c
index 8fa75819bb..9995278a26 100644
--- a/src/lib/libssl/src/ssl/d1_srvr.c
+++ b/src/lib/libssl/src/ssl/d1_srvr.c
@@ -1016,7 +1016,7 @@ dtls1_send_server_key_exchange(SSL *s)
1016 1016
1017#endif 1017#endif
1018#ifndef OPENSSL_NO_PSK 1018#ifndef OPENSSL_NO_PSK
1019 size_t pskhintlen; 1019 size_t pskhintlen = 0;
1020#endif 1020#endif
1021 EVP_PKEY *pkey; 1021 EVP_PKEY *pkey;
1022 unsigned char *p, *d; 1022 unsigned char *p, *d;
diff --git a/src/lib/libssl/src/ssl/s3_srvr.c b/src/lib/libssl/src/ssl/s3_srvr.c
index ea3137c074..f3edcc2efb 100644
--- a/src/lib/libssl/src/ssl/s3_srvr.c
+++ b/src/lib/libssl/src/ssl/s3_srvr.c
@@ -1552,7 +1552,7 @@ ssl3_send_server_key_exchange(SSL *s)
1552 1552
1553#endif 1553#endif
1554#ifndef OPENSSL_NO_PSK 1554#ifndef OPENSSL_NO_PSK
1555 size_t pskhintlen; 1555 size_t pskhintlen = 0;
1556#endif 1556#endif
1557 EVP_PKEY *pkey; 1557 EVP_PKEY *pkey;
1558 const EVP_MD *md = NULL; 1558 const EVP_MD *md = NULL;