diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-10-23 09:27:28 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-10-23 09:27:28 +0200 |
| commit | caf1586989e6162699e5c2791c26029f65a535a4 (patch) | |
| tree | 10623a8b1118077d712ee0e71580e310a83cf71c /lib/ssl/src | |
| parent | d5ad94075c7b8e396f780aba55c70363ce4738c4 (diff) | |
| parent | 639bb57cf7d6550a48608dc827a6fd3aed1af005 (diff) | |
| download | otp-caf1586989e6162699e5c2791c26029f65a535a4.tar.gz otp-caf1586989e6162699e5c2791c26029f65a535a4.tar.bz2 otp-caf1586989e6162699e5c2791c26029f65a535a4.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/ssl_record.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_record.erl b/lib/ssl/src/ssl_record.erl index eefcf3598d..ddc83821b4 100644 --- a/lib/ssl/src/ssl_record.erl +++ b/lib/ssl/src/ssl_record.erl @@ -451,7 +451,7 @@ decrypt_nonce(?AES_GCM, #cipher_state{iv = <<Salt:4/bytes, _/binary>>}, <<Explic aead_ciphertext_split(?CHACHA20_POLY1305, #cipher_state{tag_len = Len}, CipherTextFragment, AAD) -> CipherLen = size(CipherTextFragment) - Len, <<CipherText:CipherLen/bytes, CipherTag:Len/bytes>> = CipherTextFragment, - {end_additional_data(AAD, Len), CipherText, CipherTag}; + {end_additional_data(AAD, CipherLen), CipherText, CipherTag}; aead_ciphertext_split(?AES_GCM, #cipher_state{tag_len = Len}, CipherTextFragment, AAD) -> CipherLen = size(CipherTextFragment) - (Len + 8), %% 8 is length of explicit Nonce << _:8/bytes, CipherText:CipherLen/bytes, CipherTag:Len/bytes>> = CipherTextFragment, |