The branch master has been updated
via a3004c820370b6bee82c919721fb1cbe95f72f3f (commit)
from fd74aba83652a8410a74b59de0b098232af74e33 (commit)
- Log -----------------------------------------------------------------
commit a3004c820370b6bee82c919721fb1cbe95f72f3f
Author: Jon Spillett <jon.spill...@oracle.com>
Date: Thu Mar 2 12:54:06 2017 +1000
Check for zero records and return immediately
Reviewed-by: Matt Caswell <m...@openssl.org>
Reviewed-by: Rich Salz <rs...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2822)
-----------------------------------------------------------------------
Summary of changes:
ssl/record/ssl3_record.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/ssl/record/ssl3_record.c b/ssl/record/ssl3_record.c
index 84f54cb..3868bb5 100644
--- a/ssl/record/ssl3_record.c
+++ b/ssl/record/ssl3_record.c
@@ -740,6 +740,9 @@ int tls1_enc(SSL *s, SSL3_RECORD *recs, size_t n_recs, int
send)
int imac_size;
const EVP_CIPHER *enc;
+ if (n_recs == 0)
+ return 0;
+
if (send) {
if (EVP_MD_CTX_md(s->write_hash)) {
int n = EVP_MD_CTX_size(s->write_hash);
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
