diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-03-22 08:50:53 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-03-22 08:50:53 +0100 |
| commit | 86184644edc60f03be13b5dcb143a7ac425eccc9 (patch) | |
| tree | 2c42c268366bec498ae8c11d858b1fc30a9b9aee /lib/ssl/src/ssl_internal.hrl | |
| parent | 929b22622da2b64f19a2ec708780004e0ef1524a (diff) | |
| parent | 8cb17b5a5cb28222f3bd0330d891d304518020fa (diff) | |
| download | otp-86184644edc60f03be13b5dcb143a7ac425eccc9.tar.gz otp-86184644edc60f03be13b5dcb143a7ac425eccc9.tar.bz2 otp-86184644edc60f03be13b5dcb143a7ac425eccc9.zip | |
Merge branch 'ingela/ssl/default-supported-versions/OTP-14865'
* ingela/ssl/default-supported-versions/OTP-14865:
ssl: Remove default support for legacy versions
Diffstat (limited to 'lib/ssl/src/ssl_internal.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_internal.hrl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl index 3d117a655f..4ee0230d88 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl @@ -72,12 +72,13 @@ %% sslv3 is considered insecure due to lack of padding check (Poodle attack) %% Keep as interop with legacy software but do not support as default +%% tlsv1.0 and tlsv1.1 is now also considered legacy %% tlsv1.3 is under development (experimental). -define(ALL_AVAILABLE_VERSIONS, ['tlsv1.3', 'tlsv1.2', 'tlsv1.1', tlsv1, sslv3]). -define(ALL_AVAILABLE_DATAGRAM_VERSIONS, ['dtlsv1.2', dtlsv1]). %% Defines the default versions when not specified by an ssl option. --define(ALL_SUPPORTED_VERSIONS, ['tlsv1.2', 'tlsv1.1', tlsv1]). --define(MIN_SUPPORTED_VERSIONS, ['tlsv1.1', tlsv1]). +-define(ALL_SUPPORTED_VERSIONS, ['tlsv1.2']). +-define(MIN_SUPPORTED_VERSIONS, ['tlsv1.1']). %% Versions allowed in TLSCiphertext.version (TLS 1.2 and prior) and %% TLSCiphertext.legacy_record_version (TLS 1.3). @@ -86,7 +87,7 @@ %% Thus, the allowed range is limited to 0x0300 - 0x0303. -define(ALL_TLS_RECORD_VERSIONS, ['tlsv1.2', 'tlsv1.1', tlsv1, sslv3]). --define(ALL_DATAGRAM_SUPPORTED_VERSIONS, ['dtlsv1.2', dtlsv1]). +-define(ALL_DATAGRAM_SUPPORTED_VERSIONS, ['dtlsv1.2']). -define(MIN_DATAGRAM_SUPPORTED_VERSIONS, [dtlsv1]). %% TLS 1.3 - Section 4.1.3 |