summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbeck <>2018-11-13 01:25:13 +0000
committerbeck <>2018-11-13 01:25:13 +0000
commitf4aa4d519c61b8d91307a436427a03925fe149e4 (patch)
tree0ed647f8fcf25115de4f81ab5d54460fc78c020a
parent8c2ba52c97511b3510d2c5e42e90782ddfcfd9a9 (diff)
downloadopenbsd-f4aa4d519c61b8d91307a436427a03925fe149e4.tar.gz
openbsd-f4aa4d519c61b8d91307a436427a03925fe149e4.tar.bz2
openbsd-f4aa4d519c61b8d91307a436427a03925fe149e4.zip
NULL out mdctx to prevent possible double free introduced in version 1.4
Spotted by maestre@, ok tb@
-rw-r--r--src/lib/libssl/tls13_key_schedule.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libssl/tls13_key_schedule.c b/src/lib/libssl/tls13_key_schedule.c
index af273d6d27..8a0b3e8af4 100644
--- a/src/lib/libssl/tls13_key_schedule.c
+++ b/src/lib/libssl/tls13_key_schedule.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls13_key_schedule.c,v 1.6 2018/11/10 01:34:02 jsing Exp $ */ 1/* $OpenBSD: tls13_key_schedule.c,v 1.7 2018/11/13 01:25:13 beck Exp $ */
2/* Copyright (c) 2018, Bob Beck <beck@openbsd.org> 2/* Copyright (c) 2018, Bob Beck <beck@openbsd.org>
3 * 3 *
4 * Permission to use, copy, modify, and/or distribute this software for any 4 * Permission to use, copy, modify, and/or distribute this software for any
@@ -151,6 +151,7 @@ tls13_secrets_create(const EVP_MD *digest, int resumption)
151 if (!EVP_DigestFinal_ex(mdctx, secrets->empty_hash.data, &mdlen)) 151 if (!EVP_DigestFinal_ex(mdctx, secrets->empty_hash.data, &mdlen))
152 goto err; 152 goto err;
153 EVP_MD_CTX_free(mdctx); 153 EVP_MD_CTX_free(mdctx);
154 mdctx = NULL;
154 155
155 if (secrets->empty_hash.len != mdlen) 156 if (secrets->empty_hash.len != mdlen)
156 goto err; 157 goto err;