aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl_config.erl
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2018-07-20 14:09:36 +0200
committerErlang/OTP <[email protected]>2018-07-20 14:09:36 +0200
commitc836bcd577762cef4b8475a7b6ad1bdf7aba9332 (patch)
tree71e46fd9f05bbb08485b40a3bc7eab1d5eaedefb /lib/ssl/src/ssl_config.erl
parent4f5729d3d2618e07d6e23dacbdcd57e2b51fc113 (diff)
parentdcd0547dd2e1a78f89dced3ca5918ae539b11de3 (diff)
downloadotp-c836bcd577762cef4b8475a7b6ad1bdf7aba9332.tar.gz
otp-c836bcd577762cef4b8475a7b6ad1bdf7aba9332.tar.bz2
otp-c836bcd577762cef4b8475a7b6ad1bdf7aba9332.zip
Merge branch 'ingela/ssl/engine-vs-certfile/ERLERL-211/OTP-15193' into maint-20
* ingela/ssl/engine-vs-certfile/ERLERL-211/OTP-15193: ssl: Engine key trumps certfile option
Diffstat (limited to 'lib/ssl/src/ssl_config.erl')
-rw-r--r--lib/ssl/src/ssl_config.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl_config.erl b/lib/ssl/src/ssl_config.erl
index 452a98e683..028721341c 100644
--- a/lib/ssl/src/ssl_config.erl
+++ b/lib/ssl/src/ssl_config.erl
@@ -91,9 +91,9 @@ init_certificates(undefined, #{pem_cache := PemCache} = Config, CertFile, server
end;
init_certificates(Cert, Config, _, _) ->
{ok, Config#{own_certificate => Cert}}.
-init_private_key(_, #{algorithm := Alg} = Key, <<>>, _Password, _Client) when Alg == ecdsa;
- Alg == rsa;
- Alg == dss ->
+init_private_key(_, #{algorithm := Alg} = Key, _, _Password, _Client) when Alg == ecdsa;
+ Alg == rsa;
+ Alg == dss ->
case maps:is_key(engine, Key) andalso maps:is_key(key_id, Key) of
true ->
Key;