diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-09-02 15:23:18 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-09-02 15:23:18 +0200 |
| commit | e946b152f3b8c5a31b3096a733c6387d9681f0c5 (patch) | |
| tree | 12ead3590607204e21cfc431afc6d4e38b6e16a2 /lib/public_key/src/public_key.erl | |
| parent | 698caba96be3a544e3841aa417f3ca5ab4d536f8 (diff) | |
| parent | 1a57f9d04b0e846ba6dccdb99643c4f7ab17705f (diff) | |
| download | otp-e946b152f3b8c5a31b3096a733c6387d9681f0c5.tar.gz otp-e946b152f3b8c5a31b3096a733c6387d9681f0c5.tar.bz2 otp-e946b152f3b8c5a31b3096a733c6387d9681f0c5.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/public_key/src/public_key.erl')
| -rw-r--r-- | lib/public_key/src/public_key.erl | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl index cdbfe6e07c..a4b6b8ad15 100644 --- a/lib/public_key/src/public_key.erl +++ b/lib/public_key/src/public_key.erl @@ -118,6 +118,13 @@ pem_entry_decode({Asn1Type, CryptDer, {Cipher, Salt}} = PemEntry, is_list(Cipher) andalso is_binary(Salt) andalso erlang:byte_size(Salt) == 8 -> + do_pem_entry_decode(PemEntry, Password); +pem_entry_decode({Asn1Type, CryptDer, {"AES-128-CBC"=Cipher, IV}} = PemEntry, + Password) when is_atom(Asn1Type) andalso + is_binary(CryptDer) andalso + is_list(Cipher) andalso + is_binary(IV) andalso + erlang:byte_size(IV) == 16 -> do_pem_entry_decode(PemEntry, Password). %%-------------------------------------------------------------------- |