diff options
author | Ingela Andin <[email protected]> | 2018-07-06 14:47:41 +0200 |
---|---|---|
committer | GitHub <[email protected]> | 2018-07-06 14:47:41 +0200 |
commit | 0a6963fcc4a077a7b51669178271dc4ae4d7d3cb (patch) | |
tree | c4bf5844fc9067440e47985ec0f0791fc5d7bb77 /lib/ssl/src/ssl_cipher.erl | |
parent | 023db8778e1ab091abe5743d880fbb9eba121b5e (diff) | |
parent | a492841c3305ed680e364101a5fc8cd32602a737 (diff) | |
download | otp-0a6963fcc4a077a7b51669178271dc4ae4d7d3cb.tar.gz otp-0a6963fcc4a077a7b51669178271dc4ae4d7d3cb.tar.bz2 otp-0a6963fcc4a077a7b51669178271dc4ae4d7d3cb.zip |
Merge pull request #1867 from IngelaAndin/ingela/ssl/no-ca-sign-restriction-TLS-1.2/ERL-381/OTP-15173
Ingela/ssl/no ca sign restriction tls 1.2/erl 381/otp 15173
Diffstat (limited to 'lib/ssl/src/ssl_cipher.erl')
-rw-r--r-- | lib/ssl/src/ssl_cipher.erl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl index 754fc46404..50dadd0903 100644 --- a/lib/ssl/src/ssl_cipher.erl +++ b/lib/ssl/src/ssl_cipher.erl @@ -2709,6 +2709,8 @@ 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 -> + Ciphers; filter_suites_signature(rsa, Ciphers, Version) -> (Ciphers -- ecdsa_signed_suites(Ciphers, Version)) -- dsa_signed_suites(Ciphers, Version); filter_suites_signature(dsa, Ciphers, Version) -> |