diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-11-12 17:28:11 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2010-11-18 10:17:53 +0100 |
| commit | 121047232026505d0e23de1cc15137d986a4b4b4 (patch) | |
| tree | 198e0a4230931eec73eee150d59e7a3fa52d2a4d /lib/ssl/src/ssl_record.erl | |
| parent | 49f6d49d77adb123800f5ff7b7726a8aecb3a87c (diff) | |
| download | otp-121047232026505d0e23de1cc15137d986a4b4b4.tar.gz otp-121047232026505d0e23de1cc15137d986a4b4b4.tar.bz2 otp-121047232026505d0e23de1cc15137d986a4b4b4.zip | |
Added alert in stream cipher case.
Also changed alert to BAD_RECORD_MAC as:
"differentiating between bad_record_mac and decryption_failed alerts
may permit certain attacks against CBC mode as used in TLS
[CBCATT]. It is preferable to uniformly use the bad_record_mac
alert to hide the specific type of the error."
Also cleaned up the code and changed a few other alert reasons in
according to alert descriptions in the TLS RFC 4346. And added function
terminate_alert/3 so that we can differentiate between a crash
in ssl (a bug in our code) and a crash in the application using ssl.
Diffstat (limited to 'lib/ssl/src/ssl_record.erl')
| -rw-r--r-- | lib/ssl/src/ssl_record.erl | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_record.erl b/lib/ssl/src/ssl_record.erl index 803baeb09c..e7a2d8ecf1 100644 --- a/lib/ssl/src/ssl_record.erl +++ b/lib/ssl/src/ssl_record.erl @@ -649,9 +649,7 @@ cipher(Type, Version, Fragment, CS0) -> BCA} }} = hash_and_bump_seqno(CS0, Type, Version, Length, Fragment), - ?DBG_HEX(Fragment), {Ciphered, CipherS1} = ssl_cipher:cipher(BCA, CipherS0, MacHash, Fragment), - ?DBG_HEX(Ciphered), CS2 = CS1#connection_state{cipher_state=CipherS1}, {Ciphered, CS2}. |