diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-04-24 11:14:39 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-04-24 11:14:39 +0200 |
| commit | a6964711c50815a4e4824e891ffc4a06fd061970 (patch) | |
| tree | 86fbaeb8b6b3edb5c5f628694215abfa8bd1fcbe /lib/ssl/src/tls_connection.erl | |
| parent | 26853eca2462973b347f12cd3a2e713a169964d7 (diff) | |
| parent | 081ee510f1fb1d821a524bd6b8efd20e520add3c (diff) | |
| download | otp-a6964711c50815a4e4824e891ffc4a06fd061970.tar.gz otp-a6964711c50815a4e4824e891ffc4a06fd061970.tar.bz2 otp-a6964711c50815a4e4824e891ffc4a06fd061970.zip | |
Merge branch 'ia/pr/340' into maint
* ia/pr/340:
ssl: Refactor so that there is only one source for the default hashsign values
ssl: always pass negotiated version when selecting hashsign
ssl: TLSv1.2: proper default sign algo for RSA
Diffstat (limited to 'lib/ssl/src/tls_connection.erl')
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 2 |
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, |