[openssl-commits] [openssl] master update
Andy Polyakov
appro at openssl.org
Fri Oct 12 19:02:51 UTC 2018
The branch master has been updated
via 7d0effeacbb50b12bfc24df7614d7cf5c8686f51 (commit)
from fc97c882f443060dffd8eb56a6b8784e52096c86 (commit)
- Log -----------------------------------------------------------------
commit 7d0effeacbb50b12bfc24df7614d7cf5c8686f51
Author: Andy Polyakov <appro at openssl.org>
Date: Sun Sep 2 13:07:58 2018 +0200
ssl/s3_enc.c: fix logical errors in ssl3_final_finish_mac.
Reviewed-by: Tim Hudson <tjh at openssl.org>
Reviewed-by: Paul Dale <paul.dale at oracle.com>
(Merged from https://github.com/openssl/openssl/pull/7085)
-----------------------------------------------------------------------
Summary of changes:
ssl/s3_enc.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c
index 5f40381..fca84ef 100644
--- a/ssl/s3_enc.c
+++ b/ssl/s3_enc.c
@@ -442,15 +442,16 @@ size_t ssl3_final_finish_mac(SSL *s, const char *sender, size_t len,
if (!EVP_MD_CTX_copy_ex(ctx, s->s3->handshake_dgst)) {
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_FINAL_FINISH_MAC,
ERR_R_INTERNAL_ERROR);
- return 0;
+ ret = 0;
+ goto err;
}
ret = EVP_MD_CTX_size(ctx);
if (ret < 0) {
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_FINAL_FINISH_MAC,
ERR_R_INTERNAL_ERROR);
- EVP_MD_CTX_reset(ctx);
- return 0;
+ ret = 0;
+ goto err;
}
if ((sender != NULL && EVP_DigestUpdate(ctx, sender, len) <= 0)
@@ -463,6 +464,7 @@ size_t ssl3_final_finish_mac(SSL *s, const char *sender, size_t len,
ret = 0;
}
+ err:
EVP_MD_CTX_free(ctx);
return ret;
More information about the openssl-commits
mailing list