diff options
| author | John Högberg <[email protected]> | 2018-07-24 08:51:26 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2018-07-24 08:51:26 +0200 |
| commit | a6f8c69c4ea731c50d146e6cea5b2cd8f96e45a0 (patch) | |
| tree | 53699383cb0e25d246a44f21e76ba60c8332e213 /lib/ssl/src | |
| parent | c814c388d5c45c8d70426389e702426424086eca (diff) | |
| parent | 958ad184c843ce32497eef319f10db7a3a3759c2 (diff) | |
| download | otp-a6f8c69c4ea731c50d146e6cea5b2cd8f96e45a0.tar.gz otp-a6f8c69c4ea731c50d146e6cea5b2cd8f96e45a0.tar.bz2 otp-a6f8c69c4ea731c50d146e6cea5b2cd8f96e45a0.zip | |
Merge branch 'maint'
* maint:
Fix typo in xmerl_scan:string/1
Updated OTP version
Prepare release
ssl: Engine key trumps certfile option
inets: Prepare for release
inets: Improve error handling
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 63c0a416ef..1e6dab9276 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; |