diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-04-22 11:04:56 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-04-22 11:04:56 +0200 |
| commit | 3ecbc26f21e876313f569f35a23b590d985943a0 (patch) | |
| tree | 79486994d47fcff0b316baa7fe72bafe1e6b82a8 /lib/ssl/src/ssl_record.erl | |
| parent | e94575a205cd13db8cc15b000f1689bf33088779 (diff) | |
| parent | ed1c35ea483db86d208335f43565026b12c426d6 (diff) | |
| download | otp-3ecbc26f21e876313f569f35a23b590d985943a0.tar.gz otp-3ecbc26f21e876313f569f35a23b590d985943a0.tar.bz2 otp-3ecbc26f21e876313f569f35a23b590d985943a0.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src/ssl_record.erl')
| -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 b0e9943e6d..7337225bc4 100644 --- a/lib/ssl/src/ssl_record.erl +++ b/lib/ssl/src/ssl_record.erl @@ -377,7 +377,7 @@ cipher(Version, Fragment, ssl_cipher:cipher(BulkCipherAlgo, CipherS0, MacHash, Fragment, Version), {CipherFragment, WriteState0#connection_state{cipher_state = CipherS1}}. %%-------------------------------------------------------------------- --spec decipher(ssl_version(), binary(), #connection_state{}) -> {binary(), binary(), #connection_state{}}. +-spec decipher(ssl_version(), binary(), #connection_state{}) -> {binary(), binary(), #connection_state{}} | #alert{}. %% %% Description: Payload decryption %%-------------------------------------------------------------------- |