diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-08-24 10:23:29 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-08-24 10:23:29 +0200 |
| commit | ed70ed1cbcfb01a8fee4ceac83c47afd78777387 (patch) | |
| tree | ae904a247a79e13b2a89b46bbf6e4583c43a97e3 /lib/ssl/src/ssl_connection.erl | |
| parent | 710f9437498a8a9df62a6c7cecd6eb632561754b (diff) | |
| parent | 56f6f1829e1f3fd3752914b302276bc9bf490bbb (diff) | |
| download | otp-ed70ed1cbcfb01a8fee4ceac83c47afd78777387.tar.gz otp-ed70ed1cbcfb01a8fee4ceac83c47afd78777387.tar.bz2 otp-ed70ed1cbcfb01a8fee4ceac83c47afd78777387.zip | |
Merge branch 'ingela/ssl/tls-vs-dtls-version' into maint
* ingela/ssl/tls-vs-dtls-version:
ssl: DTLS packet support
ssl: Enable dtls tests
ssl: Adjust ALPN and next protocol to work with DTLS
ssl: Enable more DTLS tests
ssl: negotiated_hashsign/4 expects TLS version to function correctly
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 1afc4ad2af..5cd66387ae 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -673,10 +673,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, |