diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-09-10 11:37:33 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-09-10 11:37:33 +0200 |
| commit | b2ca2db15c8d34e384813dd140063d97d55de795 (patch) | |
| tree | b21ed8805ce25349955de09b4fb8a302df069f61 /lib/ssl/src | |
| parent | b176c71146871323a4c0e5fbff3ffdba92f30006 (diff) | |
| parent | facf240769311d63564921b20e2fa049c64073d5 (diff) | |
| download | otp-b2ca2db15c8d34e384813dd140063d97d55de795.tar.gz otp-b2ca2db15c8d34e384813dd140063d97d55de795.tar.bz2 otp-b2ca2db15c8d34e384813dd140063d97d55de795.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 9f2af73204..120e8b59ed 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -804,6 +804,7 @@ validate_option(key, {KeyType, Value}) when is_binary(Value), KeyType == dsa; %% Backwards compatibility KeyType == 'RSAPrivateKey'; KeyType == 'DSAPrivateKey'; + KeyType == 'ECPrivateKey'; KeyType == 'PrivateKeyInfo' -> {KeyType, Value}; |