aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-01-12 09:52:17 +0100
committerIngela Anderton Andin <[email protected]>2018-01-12 09:52:17 +0100
commit24ff724ae5714d0b5e84f38ecb3b468f1d3cf8f0 (patch)
tree778385e77947eb00feb670b2f73117c1884b6213
parent45c0938066e151112f7ac3d961d9300693004b48 (diff)
parent00c255c94ffad33a57e9604cee67cde5f717b99a (diff)
downloadotp-24ff724ae5714d0b5e84f38ecb3b468f1d3cf8f0.tar.gz
otp-24ff724ae5714d0b5e84f38ecb3b468f1d3cf8f0.tar.bz2
otp-24ff724ae5714d0b5e84f38ecb3b468f1d3cf8f0.zip
Merge branch 'maint'
-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 6022e69907..cd59266f9b 100644
--- a/lib/ssl/src/ssl_cipher.erl
+++ b/lib/ssl/src/ssl_cipher.erl
@@ -430,7 +430,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.
@@ -438,13 +438,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].
%%--------------------------------------------------------------------