diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-01-08 15:36:02 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-01-08 15:36:02 +0100 |
| commit | e9a01bb9d93a462e868cf2549205fcc617ccb0aa (patch) | |
| tree | 065fc362f0d4e1e65b95443f80c2fcdb2281460d /lib/ssl/src | |
| parent | 67777601894ba779757daab0f062084ce03a1432 (diff) | |
| parent | 72f5a4a6174338c011e5c3b73b0ad11ca296b5af (diff) | |
| download | otp-e9a01bb9d93a462e868cf2549205fcc617ccb0aa.tar.gz otp-e9a01bb9d93a462e868cf2549205fcc617ccb0aa.tar.bz2 otp-e9a01bb9d93a462e868cf2549205fcc617ccb0aa.zip | |
Merge branch 'ia/ssl/TLS-1.2-default/OTP-10425'
* ia/ssl/TLS-1.2-default/OTP-10425:
ssl: Make TLS-1.2 default version
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/ssl_internal.hrl | 2 | ||||
| -rw-r--r-- | lib/ssl/src/ssl_record.erl | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl index a5db2dcee7..ed0dc34adf 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl @@ -69,8 +69,8 @@ -define(TRUE, 0). -define(FALSE, 1). --define(DEFAULT_SUPPORTED_VERSIONS, [tlsv1, sslv3]). %% Add 'tlsv1.1' in R16 -define(ALL_SUPPORTED_VERSIONS, ['tlsv1.2', 'tlsv1.1', tlsv1, sslv3]). +-define(MIN_SUPPORTED_VERSIONS, ['tlsv1.1', tlsv1, sslv3]). -record(ssl_options, { versions, % 'tlsv1.2' | 'tlsv1.1' | tlsv1 | sslv3 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; |