diff options
| author | Hans Bolinder <[email protected]> | 2018-03-13 10:26:02 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2018-03-13 10:26:02 +0100 |
| commit | 54e20b0df9e643f48bcc4bcb8d58bdc97335b42b (patch) | |
| tree | e4bbb6795745163e7a0ca0277793dc1e4258710d /lib/ssl/src/ssl_cipher.erl | |
| parent | 3fa85a8e858e1c8300967e0eda347697c0940188 (diff) | |
| parent | b4d1aa182b211083c2982a700aa3e35eddecb6fc (diff) | |
| download | otp-54e20b0df9e643f48bcc4bcb8d58bdc97335b42b.tar.gz otp-54e20b0df9e643f48bcc4bcb8d58bdc97335b42b.tar.bz2 otp-54e20b0df9e643f48bcc4bcb8d58bdc97335b42b.zip | |
Merge branch 'hasse/dialyzer/extra-range/OTP-14970'
* hasse/dialyzer/extra-range/OTP-14970:
ssl: Correct some specs
os_mon: Correct a spec
Fix broken spec in beam_asm
Dialyzer should not throw away spec information because of overspec
Diffstat (limited to 'lib/ssl/src/ssl_cipher.erl')
| -rw-r--r-- | lib/ssl/src/ssl_cipher.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl index a83ce42455..6e436aa7c0 100644 --- a/lib/ssl/src/ssl_cipher.erl +++ b/lib/ssl/src/ssl_cipher.erl @@ -239,7 +239,7 @@ decipher(?AES_CBC, HashSz, CipherState, Fragment, Version, PaddingCheck) -> %%-------------------------------------------------------------------- -spec decipher_aead(cipher_enum(), #cipher_state{}, integer(), binary(), binary(), ssl_record:ssl_version()) -> - {binary(), binary(), #cipher_state{}} | #alert{}. + {binary(), #cipher_state{}} | #alert{}. %% %% Description: Decrypts the data and checks the associated data (AAD) MAC using %% cipher described by cipher_enum() and updating the cipher state. |