From dd642deea83d0f5b4accee9855e36c36699653cc Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 5 Aug 2015 13:33:52 +0100 Subject: [PATCH] Fix session resumption MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit dc0c888811cebfa2d21c844be0d81335fb2361da) --- ssl/s23_clnt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ssl/s23_clnt.c b/ssl/s23_clnt.c index fc344b92ec..2b2855dee4 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); -- 2.25.1