diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-11-05 10:25:16 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-11-05 10:25:16 +0100 |
| commit | 35ec009f24bf255984bf0283629d088e29d2d955 (patch) | |
| tree | 5bc941013aa84665428e0bac829474866450eb0c /lib/ssl/src | |
| parent | 0fe9270863dacb3158a5a9b10336101b81e07604 (diff) | |
| parent | 8f4eb75f5a8d3f76d4e5e1c7d56024c727358ac7 (diff) | |
| download | otp-35ec009f24bf255984bf0283629d088e29d2d955.tar.gz otp-35ec009f24bf255984bf0283629d088e29d2d955.tar.bz2 otp-35ec009f24bf255984bf0283629d088e29d2d955.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/ssl_cipher.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl index cfcdcb8ac5..e12faba824 100644 --- a/lib/ssl/src/ssl_cipher.erl +++ b/lib/ssl/src/ssl_cipher.erl @@ -994,7 +994,7 @@ filter_suites_pubkey(ec, Ciphers, _, OtpCert) -> ec_ecdhe_suites(Ciphers)), filter_keyuse_suites(keyAgreement, Uses, CiphersSuites, ec_ecdh_suites(Ciphers)). -filter_suites_signature(rsa, Ciphers, {3, N}) when N >= 3 -> +filter_suites_signature(_, Ciphers, {3, N}) when N >= 3 -> Ciphers; filter_suites_signature(rsa, Ciphers, Version) -> (Ciphers -- ecdsa_signed_suites(Ciphers, Version)) -- dsa_signed_suites(Ciphers, Version); |