[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

[Matt Caswell]

The branch OpenSSL_1_0_1-stable has been updated
       via  dd642deea83d0f5b4accee9855e36c36699653cc (commit)
      from  927f7a870337157bbb9e7a7d32578eeedb90ddbb (commit)


- Log -----------------------------------------------------------------
commit dd642deea83d0f5b4accee9855e36c36699653cc
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Aug 5 13:33:52 2015 +0100

    Fix session resumption
    
    Commit f0348c842e7 introduced a problem with session resumption. The
    version for the session is fixed when the session is created. By moving
    the creation of the session earlier in the process the version is fixed
    *before* version negotiation has completed when processing the ServerHello
    on the client side. This fix updates the session version after version neg
    has completed.
    
    Reviewed-by: Emilia Käsper <emilia at openssl.org>
    (cherry picked from commit dc0c888811cebfa2d21c844be0d81335fb2361da)

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

Summary of changes:
 ssl/s23_clnt.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ssl/s23_clnt.c b/ssl/s23_clnt.c
index fc344b9..2b2855d 100644
--- a/ssl/s23_clnt.c
+++ b/ssl/s23_clnt.c
@@ -727,6 +727,8 @@ static int ssl23_get_server_hello(SSL *s)
             goto err;
         }
 
+        s->session->ssl_version = s->version;
+
         /* ensure that TLS_MAX_VERSION is up-to-date */
         OPENSSL_assert(s->version <= TLS_MAX_VERSION);