diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-10-19 10:08:25 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-11-01 16:54:41 +0100 |
| commit | 1564b5853f286c97a7c9e1d6715d3c6f10bea50f (patch) | |
| tree | b28f6c1ba414a4747f8c8d52d80783e266fa9d5a /lib/ssl/src/ssl.erl | |
| parent | b211df3a0cca478822d57836dac3dd6452aab32a (diff) | |
| download | otp-1564b5853f286c97a7c9e1d6715d3c6f10bea50f.tar.gz otp-1564b5853f286c97a7c9e1d6715d3c6f10bea50f.tar.bz2 otp-1564b5853f286c97a7c9e1d6715d3c6f10bea50f.zip | |
Added PKCS-8 support in ssl
Diffstat (limited to 'lib/ssl/src/ssl.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 35f9410562..d0693445e0 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -608,8 +608,11 @@ validate_option(certfile, Value) when Value == undefined; is_list(Value) -> validate_option(key, undefined) -> undefined; validate_option(key, {KeyType, Value}) when is_binary(Value), - KeyType == rsa; - KeyType == dsa -> + KeyType == rsa; %% Backwards compatibility + KeyType == dsa; %% Backwards compatibility + KeyType == 'RSAPrivateKey'; + KeyType == 'DSAPrivateKey'; + KeyType == 'PrivateKeyInfo' -> {KeyType, Value}; validate_option(keyfile, Value) when is_list(Value) -> Value; |