diff options
| author | Péter Dimitrov <[email protected]> | 2019-07-29 10:20:51 +0200 |
|---|---|---|
| committer | Péter Dimitrov <[email protected]> | 2019-07-29 10:20:51 +0200 |
| commit | 2c6cb235988654e5dc2924829b1fa8bbf539ed0c (patch) | |
| tree | 6ffc5bf8c1470881205c33507b05896681bc888c /lib/ssl/src/ssl.erl | |
| parent | 0b9ff2f07dc1bc84325b5c3633efff719b2d20eb (diff) | |
| parent | ef430bda70af685ecc1436590f1df5d3f912a7f5 (diff) | |
| download | otp-2c6cb235988654e5dc2924829b1fa8bbf539ed0c.tar.gz otp-2c6cb235988654e5dc2924829b1fa8bbf539ed0c.tar.bz2 otp-2c6cb235988654e5dc2924829b1fa8bbf539ed0c.zip | |
Merge branch 'maint'
* maint:
ssl: Enable TLS 1.3 test groups in FT
Diffstat (limited to 'lib/ssl/src/ssl.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index ce639e8fde..7ff9aed8ea 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -982,7 +982,8 @@ cipher_suites(all) -> %% Description: Returns all default and all supported cipher suites for a %% TLS/DTLS version %%-------------------------------------------------------------------- -cipher_suites(Base, Version) when Version == 'tlsv1.2'; +cipher_suites(Base, Version) when Version == 'tlsv1.3'; + Version == 'tlsv1.2'; Version == 'tlsv1.1'; Version == tlsv1; Version == sslv3 -> |