diff options
| author | Andreas Schultz <[email protected]> | 2012-04-06 02:56:08 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-08-22 14:00:43 +0200 |
| commit | fb3b15a18e507859eb77e20ec1e9bed788e88908 (patch) | |
| tree | 5a0b3b47564c11a352cb165c68d14a9e2f60b834 /lib/ssl/src/ssl_record.erl | |
| parent | 571133751287d93598dc90fe90b58ab4580f4836 (diff) | |
| download | otp-fb3b15a18e507859eb77e20ec1e9bed788e88908.tar.gz otp-fb3b15a18e507859eb77e20ec1e9bed788e88908.tar.bz2 otp-fb3b15a18e507859eb77e20ec1e9bed788e88908.zip | |
ssl: Consider TLS version when building cipher blocks
With TLS 1.2 the handling of the IV in cipher blocks
changed. This prepares ssl_cipher:cipher/5 for that
change by passing the TLS version into it and allowing
generic_block_cipher_from_bin/4 to overload the IV.
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 830026c825..f9ccaea0e3 100644 --- a/lib/ssl/src/ssl_record.erl +++ b/lib/ssl/src/ssl_record.erl @@ -633,7 +633,7 @@ cipher(Type, Version, Fragment, CS0) -> BCA} }} = hash_and_bump_seqno(CS0, Type, Version, Length, Fragment), - {Ciphered, CipherS1} = ssl_cipher:cipher(BCA, CipherS0, MacHash, Fragment), + {Ciphered, CipherS1} = ssl_cipher:cipher(BCA, CipherS0, MacHash, Fragment, Version), CS2 = CS1#connection_state{cipher_state=CipherS1}, {Ciphered, CS2}. |