diff options
| author | Péter Dimitrov <[email protected]> | 2018-09-11 15:49:11 +0200 |
|---|---|---|
| committer | Péter Dimitrov <[email protected]> | 2018-09-11 15:49:11 +0200 |
| commit | a33920ef4e0669006b1c07ac7eda599ebd9583fb (patch) | |
| tree | cf54012d8649d59223c9cca41edb47d1c2e4a1c7 /lib/ssl/src/tls_v1.erl | |
| parent | 7b1109fbf4fcddc53ea8d43761cae90382f45264 (diff) | |
| parent | 69b54f6d2ef7462dedad3fa3be7e558ab4b00523 (diff) | |
| download | otp-a33920ef4e0669006b1c07ac7eda599ebd9583fb.tar.gz otp-a33920ef4e0669006b1c07ac7eda599ebd9583fb.tar.bz2 otp-a33920ef4e0669006b1c07ac7eda599ebd9583fb.zip | |
Merge branch 'peterdmv/ssl/tls13_ciphers'
* peterdmv/ssl/tls13_ciphers:
ssl: Fix cipher suite handling
ssl: Add TLS 1.3 cipher suites
Change-Id: I6b306d29642ba38639157ed1afea8b8df38af30e
Diffstat (limited to 'lib/ssl/src/tls_v1.erl')
| -rw-r--r-- | lib/ssl/src/tls_v1.erl | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/ssl/src/tls_v1.erl b/lib/ssl/src/tls_v1.erl index e6be574916..7d28962d2d 100644 --- a/lib/ssl/src/tls_v1.erl +++ b/lib/ssl/src/tls_v1.erl @@ -32,7 +32,7 @@ -export([master_secret/4, finished/5, certificate_verify/3, mac_hash/7, hmac_hash/3, setup_keys/8, suites/1, prf/5, ecc_curves/1, ecc_curves/2, oid_to_enum/1, enum_to_oid/1, - default_signature_algs/1, signature_algs/2, v1_3_filters/0, + default_signature_algs/1, signature_algs/2, default_signature_schemes/1, signature_schemes/2]). -type named_curve() :: sect571r1 | sect571k1 | secp521r1 | brainpoolP512r1 | @@ -249,11 +249,13 @@ suites(3) -> ] ++ suites(2); suites(4) -> - ssl:filter_cipher_suites(suites(3), v1_3_filters()). - -v1_3_filters() -> - [{mac, fun(aead) -> true; (_) -> false end}, - {key_exchange, fun(dhe_dss) -> false;(rsa) -> false; (rsa_psk) -> false;(_) -> true end}]. + [?TLS_AES_256_GCM_SHA384, + ?TLS_AES_128_GCM_SHA256, + ?TLS_CHACHA20_POLY1305_SHA256 + %% Not supported + %% ?TLS_AES_128_CCM_SHA256, + %% ?TLS_AES_128_CCM_8_SHA256 + ] ++ suites(3). signature_algs({3, 4}, HashSigns) -> signature_algs({3, 3}, HashSigns); |