From: Matt Caswell <matt@openssl.org>
Date: Wed, 5 Aug 2015 12:33:52 +0000 (+0100)
Subject: Fix session resumption
X-Git-Tag: OpenSSL_1_0_2e~106
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dc0c888811cebfa2d21c844be0d81335fb2361da;p=oweals%2Fopenssl.git

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@openssl.org>
---

diff --git a/ssl/s23_clnt.c b/ssl/s23_clnt.c
index acbbe312ef..f782010c47 100644
--- a/ssl/s23_clnt.c
+++ b/ssl/s23_clnt.c
@@ -736,6 +736,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);