aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-01-12 09:51:44 +0100
committerIngela Anderton Andin <[email protected]>2018-01-12 09:51:44 +0100
commit00c255c94ffad33a57e9604cee67cde5f717b99a (patch)
tree20ee349987bf83cd7b08f2e3c8c34f9e4c6a69dc /lib
parentc73337fa1d95f4da5e3c702d0346130f7e0b5aac (diff)
parent3af22b0d72a08d56dc99ded123f76574afe68d0b (diff)
downloadotp-00c255c94ffad33a57e9604cee67cde5f717b99a.tar.gz
otp-00c255c94ffad33a57e9604cee67cde5f717b99a.tar.bz2
otp-00c255c94ffad33a57e9604cee67cde5f717b99a.zip
Merge branch 'ingela/ssl/rc4-suites/OTP-14871' into maint
* ingela/ssl/rc4-suites/OTP-14871: ssl: Correct function for listing RC4 suites
Diffstat (limited to 'lib')
-rw-r--r--lib/ssl/src/ssl_cipher.erl10
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl
index 7efc39e659..2c46de29e2 100644
--- a/lib/ssl/src/ssl_cipher.erl
+++ b/lib/ssl/src/ssl_cipher.erl
@@ -422,7 +422,7 @@ srp_suites() ->
?TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA,
?TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA].
%%--------------------------------------------------------------------
--spec rc4_suites(Version::ssl_record:ssl_version()) -> [cipher_suite()].
+-spec rc4_suites(Version::ssl_record:ssl_version() | integer()) -> [cipher_suite()].
%%
%% Description: Returns a list of the RSA|(ECDH/RSA)| (ECDH/ECDSA)
%% with RC4 cipher suites, only supported if explicitly set by user.
@@ -430,13 +430,15 @@ srp_suites() ->
%% belonged to the user configured only category.
%%--------------------------------------------------------------------
rc4_suites({3, 0}) ->
+ rc4_suites(0);
+rc4_suites({3, Minor}) ->
+ rc4_suites(Minor) ++ rc4_suites(0);
+rc4_suites(0) ->
[?TLS_RSA_WITH_RC4_128_SHA,
?TLS_RSA_WITH_RC4_128_MD5];
-rc4_suites({3, N}) when N =< 3 ->
+rc4_suites(N) when N =< 3 ->
[?TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
?TLS_ECDHE_RSA_WITH_RC4_128_SHA,
- ?TLS_RSA_WITH_RC4_128_SHA,
- ?TLS_RSA_WITH_RC4_128_MD5,
?TLS_ECDH_ECDSA_WITH_RC4_128_SHA,
?TLS_ECDH_RSA_WITH_RC4_128_SHA].
%%--------------------------------------------------------------------