The branch OpenSSL_1_1_0-stable has been updated
via 13ed1afa923f4ffb553e389de08f26e9ce84e8a2 (commit)
from a78d043b0db1e10ace2d777a837bd7e731a8ca6c (commit)
- Log -----------------------------------------------------------------
commit 13ed1afa923f4ffb553e389de08f26e9ce84e8a2
Author: Bernd Edlinger <[email protected]>
Date: Fri Mar 10 15:10:41 2017 +0100
Avoid questionable use of the value of a pointer that refers to space
deallocated by a call to the free function in tls_decrypt_ticket.
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Rich Salz <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/2897)
-----------------------------------------------------------------------
Summary of changes:
ssl/t1_lib.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index afee12d..e102c24 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -3170,10 +3170,11 @@ static int tls_decrypt_ticket(SSL *s, const unsigned
char *etick,
p = sdec;
sess = d2i_SSL_SESSION(NULL, &p, slen);
+ slen -= p - sdec;
OPENSSL_free(sdec);
if (sess) {
/* Some additional consistency checks */
- if (p != sdec + slen || sess->session_id_length != 0) {
+ if (slen != 0 || sess->session_id_length != 0) {
SSL_SESSION_free(sess);
return 2;
}
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
