diff options
| author | Péter Dimitrov <[email protected]> | 2019-04-29 09:08:16 +0200 |
|---|---|---|
| committer | Péter Dimitrov <[email protected]> | 2019-04-29 09:08:16 +0200 |
| commit | 3fc3d282ee11ef974f426cfca867022084317370 (patch) | |
| tree | 9508171b2c280f607081ce04a50603f34e7c0dfa /lib/ssl/src/tls_v1.erl | |
| parent | cc804d6650f81617a4a6fd08617be43cf8aa6c2e (diff) | |
| parent | 4b9b216b0947e7b0b809cad6a1e486bd0a9f37ae (diff) | |
| download | otp-3fc3d282ee11ef974f426cfca867022084317370.tar.gz otp-3fc3d282ee11ef974f426cfca867022084317370.tar.bz2 otp-3fc3d282ee11ef974f426cfca867022084317370.zip | |
Merge branch 'peterdmv/ssl/tls13-poly-chacha/OTP-15383'
* peterdmv/ssl/tls13-poly-chacha/OTP-15383:
ssl: Update standards compliance
ssl: Enable additional ciphers for TLS 1.3
Change-Id: I2dc6eb73bc1b8809e7226e6b8e83f58b02a3e1e6
Diffstat (limited to 'lib/ssl/src/tls_v1.erl')
| -rw-r--r-- | lib/ssl/src/tls_v1.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssl/src/tls_v1.erl b/lib/ssl/src/tls_v1.erl index f103f3218b..27cd5765e5 100644 --- a/lib/ssl/src/tls_v1.erl +++ b/lib/ssl/src/tls_v1.erl @@ -501,18 +501,18 @@ suites(3) -> suites(4) -> [?TLS_AES_256_GCM_SHA384, ?TLS_AES_128_GCM_SHA256, - ?TLS_CHACHA20_POLY1305_SHA256 + ?TLS_CHACHA20_POLY1305_SHA256, + ?TLS_AES_128_CCM_SHA256 %% Not supported - %% ?TLS_AES_128_CCM_SHA256, %% ?TLS_AES_128_CCM_8_SHA256 ] ++ suites(3); suites('TLS_v1.3') -> [?TLS_AES_256_GCM_SHA384, ?TLS_AES_128_GCM_SHA256, - ?TLS_CHACHA20_POLY1305_SHA256 + ?TLS_CHACHA20_POLY1305_SHA256, + ?TLS_AES_128_CCM_SHA256 %% Not supported - %% ?TLS_AES_128_CCM_SHA256, %% ?TLS_AES_128_CCM_8_SHA256 ]. |