diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-04-05 17:12:24 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-04-13 11:30:14 +0200 |
| commit | bf75c53fc05ee3e8c26981b52c69448e823b46fc (patch) | |
| tree | 52a891f6716b6593c3f749f81901c13983da4cba /lib/ssl/src/ssl_cipher.erl | |
| parent | babaa7132c4f14515b8f53e998aab2d93b16cf04 (diff) | |
| download | otp-bf75c53fc05ee3e8c26981b52c69448e823b46fc.tar.gz otp-bf75c53fc05ee3e8c26981b52c69448e823b46fc.tar.bz2 otp-bf75c53fc05ee3e8c26981b52c69448e823b46fc.zip | |
ssl, dtls: Refactor so that DTLS records are handled correctly together with AEAD handling
Diffstat (limited to 'lib/ssl/src/ssl_cipher.erl')
| -rw-r--r-- | lib/ssl/src/ssl_cipher.erl | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl index 3919070e9a..d04f09efdc 100644 --- a/lib/ssl/src/ssl_cipher.erl +++ b/lib/ssl/src/ssl_cipher.erl @@ -40,7 +40,7 @@ ec_keyed_suites/0, anonymous_suites/1, psk_suites/1, srp_suites/0, rc4_suites/1, des_suites/1, openssl_suite/1, openssl_suite_name/1, filter/2, filter_suites/1, hash_algorithm/1, sign_algorithm/1, is_acceptable_hash/2, is_fallback/1, - random_bytes/1, calc_aad/3, calc_mac_hash/4, + random_bytes/1, calc_mac_hash/4, is_stream_ciphersuite/1]). -export_type([cipher_suite/0, @@ -1531,10 +1531,6 @@ is_fallback(CipherSuites)-> random_bytes(N) -> crypto:strong_rand_bytes(N). -calc_aad(Type, {MajVer, MinVer}, - #{sequence_number := SeqNo}) -> - <<?UINT64(SeqNo), ?BYTE(Type), ?BYTE(MajVer), ?BYTE(MinVer)>>. - calc_mac_hash(Type, Version, PlainFragment, #{sequence_number := SeqNo, mac_secret := MacSecret, |