diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-05-22 10:50:10 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-05-22 10:50:10 +0200 |
| commit | 8d26eb5a9ccca27f926d1ed01d11a8ac0f55cf5a (patch) | |
| tree | 17b88d9cb5ddf541a81b35de75a20410aa0f056d /lib/ssl/src | |
| parent | 7b28ff1b1e08025d99d05f48067a20746f8dc03c (diff) | |
| parent | 200265c2b27743f712e6bff4f613f3221a424c6c (diff) | |
| download | otp-8d26eb5a9ccca27f926d1ed01d11a8ac0f55cf5a.tar.gz otp-8d26eb5a9ccca27f926d1ed01d11a8ac0f55cf5a.tar.bz2 otp-8d26eb5a9ccca27f926d1ed01d11a8ac0f55cf5a.zip | |
Merge branch 'ingela/ssl/ECDH_ECDSA/ERL-381/OTP-14421'
* ingela/ssl/ECDH_ECDSA/ERL-381/OTP-14421:
ssl: Improve tests
ssl: Add missing algorithm ecdh_ecdsa
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index 58db8449d6..3cf466e78f 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -2295,6 +2295,8 @@ is_acceptable_hash_sign({_, dsa} = Algos, dsa, _, srp_dss, SupportedHashSigns) - is_acceptable_hash_sign(Algos, SupportedHashSigns); is_acceptable_hash_sign({_, ecdsa} = Algos, ecdsa, _, dhe_ecdsa, SupportedHashSigns) -> is_acceptable_hash_sign(Algos, SupportedHashSigns); +is_acceptable_hash_sign({_, ecdsa} = Algos, ecdsa, ecdsa, ecdh_ecdsa, SupportedHashSigns) -> + is_acceptable_hash_sign(Algos, SupportedHashSigns); is_acceptable_hash_sign({_, ecdsa} = Algos, ecdsa, ecdsa, ecdhe_ecdsa, SupportedHashSigns) -> is_acceptable_hash_sign(Algos, SupportedHashSigns); is_acceptable_hash_sign(_, _, _, KeyExAlgo, _) when |