diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-06-07 10:17:40 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-06-07 10:17:40 +0200 |
| commit | 58beb31dc61edb16fb669317097242f9865149ca (patch) | |
| tree | 762c43af5cf79a400a014d6178ff6d6f0eef69c6 /lib/ssl/src/ssl.erl | |
| parent | ac18b8705c78be8bec5bdc14c412af2ced740916 (diff) | |
| parent | 33afe108de9cf24be47b9ebd740a8f5e19daca79 (diff) | |
| download | otp-58beb31dc61edb16fb669317097242f9865149ca.tar.gz otp-58beb31dc61edb16fb669317097242f9865149ca.tar.bz2 otp-58beb31dc61edb16fb669317097242f9865149ca.zip | |
Merge branch 'ingela/ssl/phase-out-sslv2-hello/OTP-13465'
* ingela/ssl/phase-out-sslv2-hello/OTP-13465:
ssl: Add option to phase out support for sslv2 client hello
Diffstat (limited to 'lib/ssl/src/ssl.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 33d5c1c6d6..0058e5ec9a 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -732,7 +732,8 @@ handle_options(Opts0, Role) -> false, Role)), client, Role), crl_check = handle_option(crl_check, Opts, false), - crl_cache = handle_option(crl_cache, Opts, {ssl_crl_cache, {internal, []}}) + crl_cache = handle_option(crl_cache, Opts, {ssl_crl_cache, {internal, []}}), + v2_hello_compatible = handle_option(v2_hello_compatible, Opts, false) }, CbInfo = proplists:get_value(cb_info, Opts, {gen_tcp, tcp, tcp_closed, tcp_error}), @@ -747,7 +748,7 @@ handle_options(Opts0, Role) -> alpn_preferred_protocols, next_protocols_advertised, client_preferred_next_protocols, log_alert, server_name_indication, honor_cipher_order, padding_check, crl_check, crl_cache, - fallback, signature_algs, beast_mitigation], + fallback, signature_algs, beast_mitigation, v2_hello_compatible], SockOpts = lists:foldl(fun(Key, PropList) -> proplists:delete(Key, PropList) @@ -991,6 +992,8 @@ validate_option(beast_mitigation, Value) when Value == one_n_minus_one orelse Value == zero_n orelse Value == disabled -> Value; +validate_option(v2_hello_compatible, Value) when is_boolean(Value) -> + Value; validate_option(Opt, Value) -> throw({error, {options, {Opt, Value}}}). |