diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-11-10 14:49:19 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-11-10 14:49:19 +0100 |
| commit | 44072a52acfe5df18ca22e1c9408770532c1af15 (patch) | |
| tree | a395ea8cc03496ffdbf019ae253de2ffa47dade9 /lib/ssl/src/ssl.erl | |
| parent | 3d0f90bfea2c64c7809c036fb2d569f04aad95e3 (diff) | |
| parent | e21f3eb30a384fab1db839ac6a21a6f2055cfb6f (diff) | |
| download | otp-44072a52acfe5df18ca22e1c9408770532c1af15.tar.gz otp-44072a52acfe5df18ca22e1c9408770532c1af15.tar.bz2 otp-44072a52acfe5df18ca22e1c9408770532c1af15.zip | |
Merge branch 'maint'
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) -> |