diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-07-08 14:28:04 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-07-08 14:28:04 +0200 |
| commit | 3873689a39b47a95ab932fbcac0750f7451790c2 (patch) | |
| tree | c01417b5ddd25753a2b2c625f7116f23bc4784d4 /lib/ssl/src/ssl_connection.erl | |
| parent | fcddab275754de3a07623c7b9bdbe8966ef1a24c (diff) | |
| parent | d7dcfb26c0b044015ac9acd688b4f7e2b57e00ea (diff) | |
| download | otp-3873689a39b47a95ab932fbcac0750f7451790c2.tar.gz otp-3873689a39b47a95ab932fbcac0750f7451790c2.tar.bz2 otp-3873689a39b47a95ab932fbcac0750f7451790c2.zip | |
Merge branch 'ingela/ssl/ECC-select-hash-sign/OTP-13711' into maint
* ingela/ssl/ECC-select-hash-sign/OTP-13711:
ssl: Correct handling of signature algorithm selection
ssl: Simplify and refactor tests
Diffstat (limited to 'lib/ssl/src/ssl_connection.erl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index 53282998d0..adee59393e 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -528,13 +528,12 @@ certify(internal, #server_key_exchange{exchange_keys = Keys}, end end; -certify(internal, #certificate_request{hashsign_algorithms = HashSigns}, +certify(internal, #certificate_request{} = CertRequest, #state{session = #session{own_certificate = Cert}, - key_algorithm = KeyExAlg, + role = client, ssl_options = #ssl_options{signature_algs = SupportedHashSigns}, negotiated_version = Version} = State0, Connection) -> - - case ssl_handshake:select_hashsign(HashSigns, Cert, KeyExAlg, SupportedHashSigns, Version) of + case ssl_handshake:select_hashsign(CertRequest, Cert, SupportedHashSigns, Version) of #alert {} = Alert -> Connection:handle_own_alert(Alert, Version, certify, State0); NegotiatedHashSign -> |