diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-11-10 14:48:42 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-11-10 14:48:42 +0100 |
| commit | e21f3eb30a384fab1db839ac6a21a6f2055cfb6f (patch) | |
| tree | 0ff2f3894d3e8e0b372c9eb22b05fc2c23199788 /lib/ssl/src/ssl.erl | |
| parent | 4d9d6776aadee9e0d27b34460fa5269a6b6988aa (diff) | |
| parent | 7a0a2e9fa132cba32f4a287d03c04e9ff78a44ec (diff) | |
| download | otp-e21f3eb30a384fab1db839ac6a21a6f2055cfb6f.tar.gz otp-e21f3eb30a384fab1db839ac6a21a6f2055cfb6f.tar.bz2 otp-e21f3eb30a384fab1db839ac6a21a6f2055cfb6f.zip | |
Merge branch 'ingela/ssl/engine-API/OTP-14448' into maint
* ingela/ssl/engine-API/OTP-14448:
ssl: Add private key configuration for crypto engine
Diffstat (limited to 'lib/ssl/src/ssl.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 60118549e4..4007e44a83 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -896,7 +896,8 @@ validate_option(key, {KeyType, Value}) when is_binary(Value), KeyType == 'ECPrivateKey'; KeyType == 'PrivateKeyInfo' -> {KeyType, Value}; - +validate_option(key, #{algorithm := _} = Value) -> + Value; validate_option(keyfile, undefined) -> <<>>; validate_option(keyfile, Value) when is_binary(Value) -> |