[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  c83eda8c22f08346d5434662643de523a469c81e (commit)
      from  f8f5f8369d1d76fd8ec28d3d2422a47f8440f452 (commit)


- Log -----------------------------------------------------------------
commit c83eda8c22f08346d5434662643de523a469c81e
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Aug 13 10:04:23 2015 +0100

    Fix session tickets
    
    Commit 9ceb2426b0 (PACKETise ClientHello) broke session tickets by failing
    to detect the session ticket extension in an incoming ClientHello. This
    commit fixes the bug.
    
    Reviewed-by: Emilia Käsper <emilia at openssl.org>

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

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 e37411c..f004288 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -3043,6 +3043,11 @@ int tls1_process_ticket(SSL *s, PACKET *pkt,  unsigned char *session_id,
                 break;
             }
             goto end;
+        } else {
+            if (!PACKET_forward(pkt, size)) {
+                retv = -1;
+                goto end;
+            }
         }
     }
     retv = 0;