aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl_cipher.erl
diff options
context:
space:
mode:
authorPéter Dimitrov <[email protected]>2019-01-08 13:36:53 +0100
committerPéter Dimitrov <[email protected]>2019-01-11 09:59:12 +0100
commitdc9ec91e8ba3e8bdae74c7090a9969211e355f07 (patch)
treef365b5a70db1fb3cf558c965326657c9445c0b01 /lib/ssl/src/ssl_cipher.erl
parent5550d8265860adec290aaf4a9498ec88b1a31386 (diff)
downloadotp-dc9ec91e8ba3e8bdae74c7090a9969211e355f07.tar.gz
otp-dc9ec91e8ba3e8bdae74c7090a9969211e355f07.tar.bz2
otp-dc9ec91e8ba3e8bdae74c7090a9969211e355f07.zip
ssl: Improve AEAD encode/decode
- Update calculation of nonce and additional data - Update cipher_aead, decipher_aead - Add test for TLS 1.3 encode/decode Change-Id: Id0a5cc68d8746079fb42c0192c0c64405f6d7a72
Diffstat (limited to 'lib/ssl/src/ssl_cipher.erl')
-rw-r--r--lib/ssl/src/ssl_cipher.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl
index bf64ed8b69..4b975d753b 100644
--- a/lib/ssl/src/ssl_cipher.erl
+++ b/lib/ssl/src/ssl_cipher.erl
@@ -44,7 +44,8 @@
hash_algorithm/1, sign_algorithm/1, is_acceptable_hash/2, is_fallback/1,
random_bytes/1, calc_mac_hash/4,
is_stream_ciphersuite/1, signature_scheme/1,
- scheme_to_components/1, hash_size/1, effective_key_bits/1]).
+ scheme_to_components/1, hash_size/1, effective_key_bits/1,
+ key_material/1]).
%% RFC 8446 TLS 1.3
-export([generate_client_shares/1, generate_server_share/1, add_zero_padding/2]).