aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/tls_connection.erl
diff options
context:
space:
mode:
authorDanil Zagoskin <[email protected]>2014-04-21 22:00:09 +0400
committerIngela Anderton Andin <[email protected]>2014-04-23 10:59:27 +0200
commitb4fc84117b6bd1105ca8ccb91f699564ac400dff (patch)
tree86106ff6431f3753613c4ee27114a1f31137445f /lib/ssl/src/tls_connection.erl
parenta7446cd75e2a48e810faef26d91e9d70247297d1 (diff)
downloadotp-b4fc84117b6bd1105ca8ccb91f699564ac400dff.tar.gz
otp-b4fc84117b6bd1105ca8ccb91f699564ac400dff.tar.bz2
otp-b4fc84117b6bd1105ca8ccb91f699564ac400dff.zip
ssl: always pass negotiated version when selecting hashsign
Negotiated version is now always passed to ssl_handshake:select_hashsign because ssl_handshake:select_cert_hashsign has different rsa defaults on tlsv1.2 and older versions.
Diffstat (limited to 'lib/ssl/src/tls_connection.erl')
-rw-r--r--lib/ssl/src/tls_connection.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl
index c3171da566..8142a18c37 100644
--- a/lib/ssl/src/tls_connection.erl
+++ b/lib/ssl/src/tls_connection.erl
@@ -208,11 +208,11 @@ hello(Hello = #client_hello{client_version = ClientVersion,
session_cache = Cache,
session_cache_cb = CacheCb,
ssl_options = SslOpts}) ->
- HashSign = ssl_handshake:select_hashsign(HashSigns, Cert),
case tls_handshake:hello(Hello, SslOpts, {Port, Session0, Cache, CacheCb,
ConnectionStates0, Cert}, Renegotiation) of
{Version, {Type, Session},
ConnectionStates, ServerHelloExt} ->
+ HashSign = ssl_handshake:select_hashsign(HashSigns, Cert, Version),
ssl_connection:hello({common_client_hello, Type, ServerHelloExt, HashSign},
State#state{connection_states = ConnectionStates,
negotiated_version = Version,