diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-01-13 15:16:20 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-01-23 11:10:39 +0100 |
| commit | e53c55dd0ab69982bc511396ccf8655d27c6d38c (patch) | |
| tree | da70f327bed2894cb82f1f22a063c06fa64cfc6c /lib/ssl/src/dtls_record.erl | |
| parent | 677cb69c4c919e40d074df3bae40338a375a4731 (diff) | |
| download | otp-e53c55dd0ab69982bc511396ccf8655d27c6d38c.tar.gz otp-e53c55dd0ab69982bc511396ccf8655d27c6d38c.tar.bz2 otp-e53c55dd0ab69982bc511396ccf8655d27c6d38c.zip | |
ssl: Reenable padding check for TLS-1.0 and provide backwards compatible
disable option
Conflicts:
lib/ssl/src/ssl_cipher.erl
lib/ssl/src/ssl_record.erl
lib/ssl/src/tls_record.erl
lib/ssl/test/ssl_cipher_SUITE.erl
Diffstat (limited to 'lib/ssl/src/dtls_record.erl')
| -rw-r--r-- | lib/ssl/src/dtls_record.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/dtls_record.erl b/lib/ssl/src/dtls_record.erl index a7bbb6bc40..ae35dd7ea4 100644 --- a/lib/ssl/src/dtls_record.erl +++ b/lib/ssl/src/dtls_record.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2013-2014. All Rights Reserved. +%% Copyright Ericsson AB 2013-2015. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -146,7 +146,7 @@ decode_cipher_text(#ssl_tls{type = Type, version = Version, = ConnnectionStates0) -> CompressAlg = SecParams#security_parameters.compression_algorithm, {PlainFragment, Mac, ReadState1} = ssl_record:decipher(dtls_v1:corresponding_tls_version(Version), - CipherFragment, ReadState0), + CipherFragment, ReadState0, true), MacHash = calc_mac_hash(ReadState1, Type, Version, Epoch, Seq, PlainFragment), case ssl_record:is_correct_mac(Mac, MacHash) of true -> |