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:34:18 +0100 |
| commit | 519b07bca04bdd8585b48f2de6b7124ca6455358 (patch) | |
| tree | 71dcbdfd4b32ff7784bb91d35f0cc3eecccb0c64 /lib/ssl/src/tls_connection.erl | |
| parent | 69de799fdce1c4cc5a582df6f2a86ccd3e62c3a9 (diff) | |
| download | otp-519b07bca04bdd8585b48f2de6b7124ca6455358.tar.gz otp-519b07bca04bdd8585b48f2de6b7124ca6455358.tar.bz2 otp-519b07bca04bdd8585b48f2de6b7124ca6455358.zip | |
ssl: Reenable padding check for TLS-1.0 and provide backwards compatible
disable option
Diffstat (limited to 'lib/ssl/src/tls_connection.erl')
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index 7df73fb581..77d3aa7889 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2014. All Rights Reserved. +%% Copyright Ericsson AB 2007-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 @@ -482,8 +482,9 @@ next_record(#state{protocol_buffers = #protocol_buffers{tls_packets = [], tls_ci next_record(#state{protocol_buffers = #protocol_buffers{tls_packets = [], tls_cipher_texts = [CT | Rest]} = Buffers, - connection_states = ConnStates0} = State) -> - case tls_record:decode_cipher_text(CT, ConnStates0) of + connection_states = ConnStates0, + ssl_options = #ssl_options{padding_check = Check}} = State) -> + case tls_record:decode_cipher_text(CT, ConnStates0, Check) of {Plain, ConnStates} -> {Plain, State#state{protocol_buffers = Buffers#protocol_buffers{tls_cipher_texts = Rest}, |