diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-11-15 10:44:52 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-11-15 10:44:52 +0100 |
| commit | 96890a04beaa831ac10a2c30e595acbaf0823dc4 (patch) | |
| tree | a992415691fd93eb327616f64a7116927360ce9c /lib/ssl/src/ssl.erl | |
| parent | b50243cb644e13fb37c9880d5b4a8faf2987a34b (diff) | |
| parent | 0eeda739555deda1c7db37ae68b324230d3d9be9 (diff) | |
| download | otp-96890a04beaa831ac10a2c30e595acbaf0823dc4.tar.gz otp-96890a04beaa831ac10a2c30e595acbaf0823dc4.tar.bz2 otp-96890a04beaa831ac10a2c30e595acbaf0823dc4.zip | |
Merge branch 'ia/public_key/ssl/crypto/PKCS-8/OTP-9312'
* ia/public_key/ssl/crypto/PKCS-8/OTP-9312:
Add clause for expected input to pubkey:pseudo_random_function/2 when ASN-1 compiler is fixed.
Clean up of public_key code adding specs and documentation
Added PKCS-8 support in ssl
Additions to crypto and public_key needed for full PKCS-8 support
Add PKCS-8 support to public_key
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; |