1 From ca989269a2876bae79393bd54c3e72d49975fc75 Mon Sep 17 00:00:00 2001
2 From: "Dr. Stephen Henson" <steve@openssl.org>
3 Date: Thu, 19 Dec 2013 14:37:39 +0000
4 Subject: [PATCH] Use version in SSL_METHOD not SSL structure.
6 Upstream-Status: Backport
7 commit ca989269a2876bae79393bd54c3e72d49975fc75 upstream
9 When deciding whether to use TLS 1.2 PRF and record hash algorithms
10 use the version number in the corresponding SSL_METHOD structure
11 instead of the SSL structure. The SSL structure version is sometimes
12 inaccurate. Note: OpenSSL 1.0.2 and later effectively do this already.
16 1 files changed, 1 insertions(+), 1 deletions(-)
18 diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
19 index bf832bb..c4ef273 100644
22 @@ -4286,7 +4286,7 @@ need to go to SSL_ST_ACCEPT.
23 long ssl_get_algorithm2(SSL *s)
25 long alg2 = s->s3->tmp.new_cipher->algorithm2;
26 - if (TLS1_get_version(s) >= TLS1_2_VERSION &&
27 + if (s->method->version == TLS1_2_VERSION &&
28 alg2 == (SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF))
29 return SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256;
