diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-03-20 10:38:43 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-03-20 10:38:43 +0100 |
| commit | 884503bc69157d2a3c6bd72389b4e2a800f97fb6 (patch) | |
| tree | 81f8bc5c853053d899e25afc651c1237a334de78 /lib/ssl/src/ssl_record.erl | |
| parent | 515c1d380dcf327ff92f9f727959620c96687be8 (diff) | |
| download | otp-884503bc69157d2a3c6bd72389b4e2a800f97fb6.tar.gz otp-884503bc69157d2a3c6bd72389b4e2a800f97fb6.tar.bz2 otp-884503bc69157d2a3c6bd72389b4e2a800f97fb6.zip | |
ssl: Correct handling of crypto exception handling.
Documentation was incorrect, and new specs provided dialyzer
errors.
Diffstat (limited to 'lib/ssl/src/ssl_record.erl')
| -rw-r--r-- | lib/ssl/src/ssl_record.erl | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/ssl/src/ssl_record.erl b/lib/ssl/src/ssl_record.erl index 91f1876980..669626aefb 100644 --- a/lib/ssl/src/ssl_record.erl +++ b/lib/ssl/src/ssl_record.erl @@ -395,12 +395,7 @@ decipher_aead(Type, #cipher_state{key = Key} = CipherState, AAD0, CipherFragment try Nonce = decrypt_nonce(Type, CipherState, 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; - _ -> - ?ALERT_REC(?FATAL, ?BAD_RECORD_MAC, decryption_failed) - end + ssl_cipher:aead_decrypt(Type, Key, Nonce, CipherText, CipherTag, AAD) catch _:_ -> ?ALERT_REC(?FATAL, ?BAD_RECORD_MAC, decryption_failed) |