diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-09-08 07:42:09 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2010-09-08 07:42:09 +0200 |
| commit | e058f26dabb1fa69dd691adac14bcfbe25a93e72 (patch) | |
| tree | 047cd6126dce99394a9111dca2ebe51467369f6c /lib/ssl/src/ssl.erl | |
| parent | a78b39a0e9ff2cfd13273ab077dc852d70565647 (diff) | |
| parent | a9b0039e971322b5ece78280e37df86b3ec0a843 (diff) | |
| download | otp-e058f26dabb1fa69dd691adac14bcfbe25a93e72.tar.gz otp-e058f26dabb1fa69dd691adac14bcfbe25a93e72.tar.bz2 otp-e058f26dabb1fa69dd691adac14bcfbe25a93e72.zip | |
Merge branch 'ia/ssl-forgot-DH-params-DER' into dev
* ia/ssl-forgot-DH-params-DER:
Add missed DER dh option.
Diffstat (limited to 'lib/ssl/src/ssl.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index dbc5faff14..cc01b35b64 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -580,6 +580,7 @@ handle_options(Opts0, _Role) -> password = handle_option(password, Opts, ""), cacerts = CaCerts, cacertfile = handle_option(cacertfile, Opts, CaCertDefault), + dh = handle_option(dh, Opts, undefined), dhfile = handle_option(dhfile, Opts, undefined), ciphers = handle_option(ciphers, Opts, []), %% Server side option @@ -594,7 +595,7 @@ handle_options(Opts0, _Role) -> SslOptions = [versions, verify, verify_fun, fail_if_no_peer_cert, verify_client_once, depth, cert, certfile, key, keyfile, - password, cacerts, cacertfile, dhfile, ciphers, + password, cacerts, cacertfile, dh, dhfile, ciphers, debug, reuse_session, reuse_sessions, ssl_imp, cb_info, renegotiate_at, secure_renegotiate], @@ -669,6 +670,9 @@ validate_option(cacertfile, undefined) -> ""; validate_option(cacertfile, Value) when is_list(Value), Value =/= "" -> Value; +validate_option(dh, Value) when Value == undefined; + is_binary(Value) -> + Value; validate_option(dhfile, undefined = Value) -> Value; validate_option(dhfile, Value) when is_list(Value), Value =/= "" -> |