diff options
| author |   jsg <jsg@openbsd.org> | 2015-05-15 11:00:14 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2015-05-15 11:00:14 +0000 |
| commit | d5eebd0bd527e182d99d439c6b21696b548e51bb (patch) | |
| tree | e176399f54ff40297b2993d164e589f26a14097e /lib/libssl/src/ssl | |
| parent | rename the probe and free members of atascsi_methods to ata_probe (diff) | |
| download | wireguard-openbsd-d5eebd0bd527e182d99d439c6b21696b548e51bb.tar.xz wireguard-openbsd-d5eebd0bd527e182d99d439c6b21696b548e51bb.zip | |
Fix return paths with missing EVP_CIPHER_CTX_cleanup() calls.
ok doug@
Diffstat (limited to 'lib/libssl/src/ssl')
| -rw-r--r-- | lib/libssl/src/ssl/d1_srvr.c | 3 | ||||
| -rw-r--r-- | lib/libssl/src/ssl/s3_srvr.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/libssl/src/ssl/d1_srvr.c b/lib/libssl/src/ssl/d1_srvr.c index 1d3779f5671..27f350fcb67 100644 --- a/lib/libssl/src/ssl/d1_srvr.c +++ b/lib/libssl/src/ssl/d1_srvr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_srvr.c,v 1.50 2015/03/27 12:29:54 jsing Exp $ */ +/* $OpenBSD: d1_srvr.c,v 1.51 2015/05/15 11:00:14 jsg Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -1288,6 +1288,7 @@ dtls1_send_newsession_ticket(SSL *s) if (tctx->tlsext_ticket_key_cb(s, key_name, iv, &ctx, &hctx, 1) < 0) { free(senc); + EVP_CIPHER_CTX_cleanup(&ctx); return -1; } } else { diff --git a/lib/libssl/src/ssl/s3_srvr.c b/lib/libssl/src/ssl/s3_srvr.c index 5248cc864c2..921d7797809 100644 --- a/lib/libssl/src/ssl/s3_srvr.c +++ b/lib/libssl/src/ssl/s3_srvr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_srvr.c,v 1.102 2015/04/15 16:25:43 jsing Exp $ */ +/* $OpenBSD: s3_srvr.c,v 1.103 2015/05/15 11:00:14 jsg Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -2689,6 +2689,7 @@ ssl3_send_newsession_ticket(SSL *s) if (tctx->tlsext_ticket_key_cb(s, key_name, iv, &ctx, &hctx, 1) < 0) { free(senc); + EVP_CIPHER_CTX_cleanup(&ctx); return (-1); } } else { |