diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-08-24 10:24:10 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-08-24 10:24:10 +0200 |
| commit | 7dca6bf8cc7f291a6c1cb4928255da88afa131b1 (patch) | |
| tree | 69bd94455d96e3be7758503e80790e568223a5d7 /lib/ssl/src/ssl_connection.erl | |
| parent | fbf740d68600b59dc5fa7bd76d0aa0d019e81a75 (diff) | |
| parent | ed70ed1cbcfb01a8fee4ceac83c47afd78777387 (diff) | |
| download | otp-7dca6bf8cc7f291a6c1cb4928255da88afa131b1.tar.gz otp-7dca6bf8cc7f291a6c1cb4928255da88afa131b1.tar.bz2 otp-7dca6bf8cc7f291a6c1cb4928255da88afa131b1.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src/ssl_connection.erl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index f6ff89e844..5c6e755293 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -682,10 +682,11 @@ cipher(internal, #certificate_verify{signature = Signature, tls_handshake_history = Handshake } = State0, Connection) -> + TLSVersion = ssl:tls_version(Version), %% Use negotiated value if TLS-1.2 otherwhise return default - HashSign = negotiated_hashsign(CertHashSign, KexAlg, PublicKeyInfo, Version), + HashSign = negotiated_hashsign(CertHashSign, KexAlg, PublicKeyInfo, TLSVersion), case ssl_handshake:certificate_verify(Signature, PublicKeyInfo, - ssl:tls_version(Version), HashSign, MasterSecret, Handshake) of + TLSVersion, HashSign, MasterSecret, Handshake) of valid -> {Record, State} = Connection:next_record(State0), Connection:next_event(cipher, Record, |