The branch OpenSSL_1_0_2-stable has been updated
via 1415d31626f691d87ce513991d1b633fb464be72 (commit)
from 13fc6b6650c43e58f23aa32cfcc9bf0ace8fb51e (commit)
- Log -----------------------------------------------------------------
commit 1415d31626f691d87ce513991d1b633fb464be72
Author: Bernd Edlinger <[email protected]>
Date: Wed Feb 22 11:59:44 2017 +0100
Add some more consistency checks in tls_decrypt_ticket.
Reviewed-by: Richard Levitte <[email protected]>
Reviewed-by: Rich Salz <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/2704)
(cherry picked from commit 79020b27beff060d02830870fdfd821fe8cbd439)
-----------------------------------------------------------------------
Summary of changes:
ssl/t1_lib.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index d07a9f0..acef270 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -3579,6 +3579,11 @@ static int tls_decrypt_ticket(SSL *s, const unsigned
char *etick,
sess = d2i_SSL_SESSION(NULL, &p, slen);
OPENSSL_free(sdec);
if (sess) {
+ /* Some additional consistency checks */
+ if (p != sdec + slen || sess->session_id_length != 0) {
+ SSL_SESSION_free(sess);
+ return 2;
+ }
/*
* The session ID, if non-empty, is used by some clients to detect
* that the ticket has been accepted. So we copy it to the session
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
