[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  79020b27beff060d02830870fdfd821fe8cbd439 (commit)
      from  e4a3d0f96800e578ddb76dcc387125df65641500 (commit)


- Log -----------------------------------------------------------------
commit 79020b27beff060d02830870fdfd821fe8cbd439
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Wed Feb 22 11:59:44 2017 +0100

    Add some more consistency checks in tls_decrypt_ticket.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2704)

-----------------------------------------------------------------------

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 140b1f1..f13c0ad 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -1315,6 +1315,11 @@ TICKET_RETURN 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