aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl_record.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2012-12-19 16:16:46 +0100
committerIngela Anderton Andin <[email protected]>2012-12-20 10:35:46 +0100
commit72f5a4a6174338c011e5c3b73b0ad11ca296b5af (patch)
treef691d4b9afd939caed2384e1eae4812479cd7dac /lib/ssl/src/ssl_record.erl
parent3bd2ba0060f9bcb0d3bddd74a4a5763e520a533f (diff)
downloadotp-72f5a4a6174338c011e5c3b73b0ad11ca296b5af.tar.gz
otp-72f5a4a6174338c011e5c3b73b0ad11ca296b5af.tar.bz2
otp-72f5a4a6174338c011e5c3b73b0ad11ca296b5af.zip
ssl: Make TLS-1.2 default version
Diffstat (limited to 'lib/ssl/src/ssl_record.erl')
-rw-r--r--lib/ssl/src/ssl_record.erl5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl_record.erl b/lib/ssl/src/ssl_record.erl
index 8e93ce4634..173b9611c6 100644
--- a/lib/ssl/src/ssl_record.erl
+++ b/lib/ssl/src/ssl_record.erl
@@ -463,10 +463,9 @@ supported_protocol_versions() ->
supported_protocol_versions([]) ->
Vsns = case sufficient_tlsv1_2_crypto_support() of
true ->
- %%?ALL_SUPPORTED_VERSIONS; %% Add TlS-1.2 as default in R16
- ?DEFAULT_SUPPORTED_VERSIONS;
+ ?ALL_SUPPORTED_VERSIONS;
false ->
- ?DEFAULT_SUPPORTED_VERSIONS
+ ?MIN_SUPPORTED_VERSIONS
end,
application:set_env(ssl, protocol_version, Vsns),
Vsns;