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.erl | |
| 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.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index bfa349c8d8..c7c96370b3 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -103,9 +103,10 @@ -type ip_address() :: inet:ip_address(). -type session_id() :: binary(). -type protocol_version() :: tls_version() | dtls_version(). --type tls_version() :: tlsv1 | 'tlsv1.1' | 'tlsv1.2' | 'tlsv1.3' | legacy_version(). --type dtls_version() :: 'dtlsv1' | 'dtlsv1.2'. --type legacy_version() :: sslv3. +-type tls_version() :: 'tlsv1.2' | 'tlsv1.3' | tls_legacy_version(). +-type dtls_version() :: 'dtlsv1.2' | dtls_legacy_version(). +-type tls_legacy_version() :: tlsv1 | 'tlsv1.1' | sslv3. +-type dtls_legacy_version() :: 'dtlsv1'. -type verify_type() :: verify_none | verify_peer. -type cipher() :: aes_128_cbc | aes_256_cbc | |