diff options
| author | Ingela Andin <[email protected]> | 2018-05-17 10:20:40 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-05-17 10:20:40 +0200 |
| commit | ed16c60b34fd7bfd66bc5b32273877aaea453213 (patch) | |
| tree | 513c7ad76516af653facc2afb4a9ca31bfab9ca9 /lib/ssl/src/ssl_handshake.erl | |
| parent | db191170ace56ac32708d2554a308eff9926d85f (diff) | |
| parent | 70e282c5c2e9a3282475ee330e811a392ff4c378 (diff) | |
| download | otp-ed16c60b34fd7bfd66bc5b32273877aaea453213.tar.gz otp-ed16c60b34fd7bfd66bc5b32273877aaea453213.tar.bz2 otp-ed16c60b34fd7bfd66bc5b32273877aaea453213.zip | |
Merge pull request #1820 from IngelaAndin/ingela/ssl/cipher-suite-select-fix
ssl: Correct key_usage check
Diffstat (limited to 'lib/ssl/src/ssl_handshake.erl')
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index 090e7b69b7..ebbb633b22 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -2233,13 +2233,12 @@ sign_algo(Alg) -> is_acceptable_hash_sign(Algos, _, _, KeyExAlgo, SupportedHashSigns) when KeyExAlgo == dh_dss; KeyExAlgo == dh_rsa; - KeyExAlgo == ecdh_ecdsa; KeyExAlgo == ecdh_rsa; KeyExAlgo == ecdh_ecdsa -> %% *dh_* could be called only *dh in TLS-1.2 is_acceptable_hash_sign(Algos, SupportedHashSigns); -is_acceptable_hash_sign(Algos, rsa, ecdsa, ecdh_rsa, SupportedHashSigns) -> +is_acceptable_hash_sign(Algos, rsa, ecdsa, ecdhe_rsa, SupportedHashSigns) -> is_acceptable_hash_sign(Algos, SupportedHashSigns); is_acceptable_hash_sign({_, rsa} = Algos, rsa, _, dhe_rsa, SupportedHashSigns) -> is_acceptable_hash_sign(Algos, SupportedHashSigns); @@ -2270,7 +2269,7 @@ is_acceptable_hash_sign(_, _, _, KeyExAlgo, _) when KeyExAlgo == ecdhe_anon -> true; -is_acceptable_hash_sign(_,_, _,_,_) -> +is_acceptable_hash_sign(_,_,_,_,_) -> false. is_acceptable_hash_sign(Algos, SupportedHashSigns) -> lists:member(Algos, SupportedHashSigns). |