diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-01-26 08:36:03 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-01-26 08:36:03 +0100 |
| commit | 51bc4157763032e18342eefe1ccbd7f262505483 (patch) | |
| tree | 772cf5da56cf94ab78ea68ccb2772fd061e2db61 /lib/ssl/src/ssl.erl | |
| parent | e3175a030bcb3ddbdea328c218bcc79913b746c1 (diff) | |
| parent | e53c55dd0ab69982bc511396ccf8655d27c6d38c (diff) | |
| download | otp-51bc4157763032e18342eefe1ccbd7f262505483.tar.gz otp-51bc4157763032e18342eefe1ccbd7f262505483.tar.bz2 otp-51bc4157763032e18342eefe1ccbd7f262505483.zip | |
Merge branch 'ia/ssl/maint/poddle/OTP-12420' into maint
* ia/ssl/maint/poddle/OTP-12420:
ssl: Reenable padding check for TLS-1.0 and provide backwards compatible disable option
Diffstat (limited to 'lib/ssl/src/ssl.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index b4bea25942..4b7f49547b 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2014. All Rights Reserved. +%% Copyright Ericsson AB 1999-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 @@ -656,7 +656,8 @@ handle_options(Opts0) -> log_alert = handle_option(log_alert, Opts, true), server_name_indication = handle_option(server_name_indication, Opts, undefined), honor_cipher_order = handle_option(honor_cipher_order, Opts, false), - protocol = proplists:get_value(protocol, Opts, tls) + protocol = proplists:get_value(protocol, Opts, tls), + padding_check = proplists:get_value(padding_check, Opts, true) }, CbInfo = proplists:get_value(cb_info, Opts, {gen_tcp, tcp, tcp_closed, tcp_error}), @@ -669,7 +670,7 @@ handle_options(Opts0) -> cb_info, renegotiate_at, secure_renegotiate, hibernate_after, erl_dist, next_protocols_advertised, client_preferred_next_protocols, log_alert, - server_name_indication, honor_cipher_order], + server_name_indication, honor_cipher_order, padding_check], SockOpts = lists:foldl(fun(Key, PropList) -> proplists:delete(Key, PropList) @@ -847,6 +848,8 @@ validate_option(server_name_indication, undefined) -> undefined; validate_option(honor_cipher_order, Value) when is_boolean(Value) -> Value; +validate_option(padding_check, Value) when is_boolean(Value) -> + Value; validate_option(Opt, Value) -> throw({error, {options, {Opt, Value}}}). |