The branch OpenSSL_1_1_0-stable has been updated
via 2d951d8cdef56aeeb6c08387531de943683e80ce (commit)
from 41371618f72b93bdf3e0a4be369e4df6b65334cd (commit)
- Log -----------------------------------------------------------------
commit 2d951d8cdef56aeeb6c08387531de943683e80ce
Author: Jon Spillett <[email protected]>
Date: Thu Mar 2 12:54:06 2017 +1000
Check for zero records and return immediately
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Rich Salz <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/2822)
(cherry picked from commit a3004c820370b6bee82c919721fb1cbe95f72f3f)
-----------------------------------------------------------------------
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 03c5294..5da44e5 100644
--- a/ssl/record/ssl3_record.c
+++ b/ssl/record/ssl3_record.c
@@ -661,6 +661,9 @@ int tls1_enc(SSL *s, SSL3_RECORD *recs, unsigned int
n_recs, int send)
const EVP_CIPHER *enc;
unsigned int ctr;
+ 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
