diff options
| author | Andreas Schultz <[email protected]> | 2011-10-03 12:46:12 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-10-24 11:36:03 +0200 |
| commit | 32c475cfe5bbc2c2eb55d83102112233d799a01a (patch) | |
| tree | 5f5c925d4aeadc52fca690d8e2044f3d0d32c4b0 /lib/ssl/test/Makefile | |
| parent | 1fd0ef56ce4432ea6e6ddbcd0af81c71b7921b38 (diff) | |
| download | otp-32c475cfe5bbc2c2eb55d83102112233d799a01a.tar.gz otp-32c475cfe5bbc2c2eb55d83102112233d799a01a.tar.bz2 otp-32c475cfe5bbc2c2eb55d83102112233d799a01a.zip | |
fix handling of block_decipher/5 failure
A wrong decryption key would cause a badmatch in
generic_block_cipher_from_bin/2. The try in block_decipher/5 was
probably intendend to deal with that, but was misplace for this.
Additionaly, generating a failure alert erly, without computing the
record MAC, creates vector for a timing attack on CBC padding (for
details check TLS 1.2 RFC 5246, Sect. 6.2.3.2.). This attach vector
and the counter meassure applies to all SSL/TLS versions.
As a counter messure, compute the MAC even when decryption or padding
checks fail. A invalid padding will force a MAC failure by intentionaly
invalidating the content.
Diffstat (limited to 'lib/ssl/test/Makefile')
| -rw-r--r-- | lib/ssl/test/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ssl/test/Makefile b/lib/ssl/test/Makefile index 23a9a23190..6b1da63d08 100644 --- a/lib/ssl/test/Makefile +++ b/lib/ssl/test/Makefile @@ -39,6 +39,7 @@ MODULES = \ ssl_basic_SUITE \ ssl_handshake_SUITE \ ssl_packet_SUITE \ + ssl_cipher_SUITE \ ssl_payload_SUITE \ ssl_to_openssl_SUITE \ ssl_session_cache_SUITE \ @@ -55,6 +56,7 @@ HRL_FILES_SRC = \ ssl_internal.hrl\ ssl_alert.hrl \ ssl_handshake.hrl \ + ssl_cipher.hrl \ ssl_record.hrl HRL_FILES_INC = |