summaryrefslogtreecommitdiffstats
path: root/lib/libssl/src/ssl/s3_enc.c
diff options
context:
space:
mode:
authorlogan <logan@openbsd.org>2014-06-10 18:00:59 +0000
committerlogan <logan@openbsd.org>2014-06-10 18:00:59 +0000
commit48a7cfe4f2130f1684b58c47235f0801f991bf8a (patch)
tree1ca496c6d94d81c3da51217b511d9403b51f8550 /lib/libssl/src/ssl/s3_enc.c
parentAdd ed25519 ssh host keys to /etc/mtree/special. (diff)
downloadwireguard-openbsd-48a7cfe4f2130f1684b58c47235f0801f991bf8a.tar.xz
wireguard-openbsd-48a7cfe4f2130f1684b58c47235f0801f991bf8a.zip
Check return value of EVP_MD_CTX_copy_ex() in ssl3_handshake_mac()
to avoid potential null pointer dereference. Based on david ramos work. OK from miod@ and jsing@
Diffstat (limited to 'lib/libssl/src/ssl/s3_enc.c')
-rw-r--r--lib/libssl/src/ssl/s3_enc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/libssl/src/ssl/s3_enc.c b/lib/libssl/src/ssl/s3_enc.c
index 8f88a4a88df..71a3155c604 100644
--- a/lib/libssl/src/ssl/s3_enc.c
+++ b/lib/libssl/src/ssl/s3_enc.c
@@ -668,7 +668,9 @@ ssl3_handshake_mac(SSL *s, int md_nid, const char *sender, int len,
}
EVP_MD_CTX_init(&ctx);
EVP_MD_CTX_set_flags(&ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
- EVP_MD_CTX_copy_ex(&ctx, d);
+
+ if (!EVP_MD_CTX_copy_ex(&ctx, d))
+ return 0;
n = EVP_MD_CTX_size(&ctx);
if (n < 0)
return 0;