diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-07-17 14:23:47 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-07-17 14:41:20 +0200 |
| commit | dcd0547dd2e1a78f89dced3ca5918ae539b11de3 (patch) | |
| tree | 64f276eac4c209c384f91620aa0b08a2a9a34853 /lib/ssl/src | |
| parent | 857156bcadae45fe112911bd7ca735ac6f3ca9d2 (diff) | |
| download | otp-dcd0547dd2e1a78f89dced3ca5918ae539b11de3.tar.gz otp-dcd0547dd2e1a78f89dced3ca5918ae539b11de3.tar.bz2 otp-dcd0547dd2e1a78f89dced3ca5918ae539b11de3.zip | |
ssl: Engine key trumps certfile option
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/ssl_config.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl_config.erl b/lib/ssl/src/ssl_config.erl index 022fb7eac0..81b18c15af 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; |