diff options
| author | Raimo Niskanen <[email protected]> | 2019-02-13 16:14:50 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2019-02-13 16:15:18 +0100 |
| commit | fd9c6755071eb3a2932f94c1fd0ac962920f124d (patch) | |
| tree | d757bfcdaa0807fd3edf545f3e0967d244567e9b /lib/ssl/src/ssl_record.erl | |
| parent | 96cd83b6efed8ae8a1a0008e24885bae66c1834b (diff) | |
| download | otp-fd9c6755071eb3a2932f94c1fd0ac962920f124d.tar.gz otp-fd9c6755071eb3a2932f94c1fd0ac962920f124d.tar.bz2 otp-fd9c6755071eb3a2932f94c1fd0ac962920f124d.zip | |
Remove redundant return of CipherState
Diffstat (limited to 'lib/ssl/src/ssl_record.erl')
| -rw-r--r-- | lib/ssl/src/ssl_record.erl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/ssl/src/ssl_record.erl b/lib/ssl/src/ssl_record.erl index cf5368a19f..e1b16193bd 100644 --- a/lib/ssl/src/ssl_record.erl +++ b/lib/ssl/src/ssl_record.erl @@ -367,9 +367,8 @@ decipher(Version, CipherFragment, Alert end. %%-------------------------------------------------------------------- --spec decipher_aead(ssl_cipher:cipher_enum(), #cipher_state{}, - binary(), binary(), ssl_record:ssl_version()) -> - {binary(), #cipher_state{}} | #alert{}. +-spec decipher_aead(ssl_cipher:cipher_enum(), #cipher_state{}, binary(), binary(), ssl_record:ssl_version()) -> + binary() | #alert{}. %% %% Description: Decrypts the data and checks the associated data (AAD) MAC using %% cipher described by cipher_enum() and updating the cipher state. @@ -381,7 +380,7 @@ decipher_aead(Type, #cipher_state{key = Key} = CipherState, AAD0, CipherFragment {AAD, CipherText, CipherTag} = aead_ciphertext_split(Type, CipherState, CipherFragment, AAD0), case ssl_cipher:aead_decrypt(Type, Key, Nonce, CipherText, CipherTag, AAD) of Content when is_binary(Content) -> - {Content, CipherState}; + Content; _ -> ?ALERT_REC(?FATAL, ?BAD_RECORD_MAC, decryption_failed) end |