diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-11-16 15:25:40 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-11-16 15:25:40 +0100 |
| commit | f8f12a1b613a917bd32dc6da940e986ae148713a (patch) | |
| tree | c39c1b8f7e01bb9beda34c261ad38cbbf17ef29a /lib/ssl/src/ssl_connection.erl | |
| parent | 0f4e3485cbc48fc3e7bba3370b4e42baf2ebd7cb (diff) | |
| parent | 0fb3a5dc1ae3709518d2775671cb6b0a24739e6f (diff) | |
| download | otp-f8f12a1b613a917bd32dc6da940e986ae148713a.tar.gz otp-f8f12a1b613a917bd32dc6da940e986ae148713a.tar.bz2 otp-f8f12a1b613a917bd32dc6da940e986ae148713a.zip | |
Merge branch 'ingela/master/correct-merge-conflict-resolution'
* ingela/master/correct-merge-conflict-resolution:
ssl: Resolve merge conflict resolution error
Diffstat (limited to 'lib/ssl/src/ssl_connection.erl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index c25c18e97b..79485833e0 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -1570,7 +1570,6 @@ certify_client_key_exchange(#client_dhe_psk_identity{} = ClientKey, PremasterSecret = ssl_handshake:premaster_secret(ClientKey, ServerDhPrivateKey, Params, PSKLookup), calculate_master_secret(PremasterSecret, State0, Connection, certify, cipher); - certify_client_key_exchange(#client_ecdhe_psk_identity{} = ClientKey, #state{diffie_hellman_keys = ServerEcDhPrivateKey, ssl_options = @@ -1579,7 +1578,6 @@ certify_client_key_exchange(#client_ecdhe_psk_identity{} = ClientKey, PremasterSecret = ssl_handshake:premaster_secret(ClientKey, ServerEcDhPrivateKey, PSKLookup), calculate_master_secret(PremasterSecret, State, Connection, certify, cipher); - certify_client_key_exchange(#client_rsa_psk_identity{} = ClientKey, #state{private_key = Key, ssl_options = |