diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2015-03-11 19:34:07 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2015-03-11 19:34:07 +0000 |
| commit | 8e313a463c9f0a09dda85a5a52072ccd0628dcb6 (patch) | |
| tree | 0a6c0ff2533a0a2ef4aa40348e31ddabd568ef0d | |
| parent | bd09cf4e1d7f2f1a08f84642e72e566c87c53271 (diff) | |
delay EVP_MD_CTX_init so we don't forget to clean it up.
spotted by miod. ok miod.
| -rw-r--r-- | lib/libssl/src/ssl/s3_clnt.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/libssl/src/ssl/s3_clnt.c b/lib/libssl/src/ssl/s3_clnt.c index d68aecf541e..5d9ac2e2e81 100644 --- a/lib/libssl/src/ssl/s3_clnt.c +++ b/lib/libssl/src/ssl/s3_clnt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_clnt.c,v 1.108 2015/03/08 16:48:47 miod Exp $ */ +/* $OpenBSD: s3_clnt.c,v 1.109 2015/03/11 19:34:06 tedu Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1168,8 +1168,6 @@ ssl3_get_key_exchange(SSL *s) alg_k = s->s3->tmp.new_cipher->algorithm_mkey; alg_a = s->s3->tmp.new_cipher->algorithm_auth; - EVP_MD_CTX_init(&md_ctx); - /* * Use same message size as in ssl3_get_certificate_request() * as ServerKeyExchange message may be skipped. @@ -1178,6 +1176,8 @@ ssl3_get_key_exchange(SSL *s) SSL3_ST_CR_KEY_EXCH_B, -1, s->max_cert_list, &ok); if (!ok) return ((int)n); + + EVP_MD_CTX_init(&md_ctx); if (s->s3->tmp.message_type != SSL3_MT_SERVER_KEY_EXCHANGE) { /* @@ -1192,6 +1192,7 @@ ssl3_get_key_exchange(SSL *s) } s->s3->tmp.reuse_message = 1; + EVP_MD_CTX_cleanup(&md_ctx); return (1); } |