aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl_cipher.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-07-05 10:37:42 +0200
committerIngela Anderton Andin <[email protected]>2018-07-10 16:22:50 +0200
commitbaee0f8436aaa5a3d6c15e917cac0515cbd8b451 (patch)
treeeda45486c2b1f8ec8ed854e3c6ca82ce00ef3b4a /lib/ssl/src/ssl_cipher.erl
parent531d8a7a4ae8d255f023ea9196cd2ac4be915b6d (diff)
downloadotp-baee0f8436aaa5a3d6c15e917cac0515cbd8b451.tar.gz
otp-baee0f8436aaa5a3d6c15e917cac0515cbd8b451.tar.bz2
otp-baee0f8436aaa5a3d6c15e917cac0515cbd8b451.zip
ssl: No cipher suite sign restriction in TLS-1.2
Conflicts: lib/ssl/test/ssl_ECC_SUITE.erl
Diffstat (limited to 'lib/ssl/src/ssl_cipher.erl')
-rw-r--r--lib/ssl/src/ssl_cipher.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl
index 76273390d0..40d974f6a5 100644
--- a/lib/ssl/src/ssl_cipher.erl
+++ b/lib/ssl/src/ssl_cipher.erl
@@ -2487,6 +2487,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) ->