[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  d3bc98058599a5feffbe68d4e5f2ca43a698d95b (commit)
      from  22cef4e1f1f8f4346cc8b10b3374936c6b33624f (commit)


- Log -----------------------------------------------------------------
commit d3bc98058599a5feffbe68d4e5f2ca43a698d95b
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
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 <matt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2897)
    (cherry picked from commit 13ed1afa923f4ffb553e389de08f26e9ce84e8a2)

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

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 22a368d..83e493e 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -1311,10 +1311,11 @@ TICKET_RETURN 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 TICKET_NO_DECRYPT;
         }