diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-04-20 08:44:29 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-04-20 08:44:29 +0200 |
| commit | ddfbbcbbd489913120a55b2a054b046c68b40a8a (patch) | |
| tree | 8e22768a89ca891d6f471805bc797467823382f8 /lib/public_key/src/pubkey_pem.erl | |
| parent | aa8efa1cc3f776d5b3b5af24afd4369ca1f7da00 (diff) | |
| parent | 5674d81d4112206e9fb03527137525ca544285de (diff) | |
| download | otp-ddfbbcbbd489913120a55b2a054b046c68b40a8a.tar.gz otp-ddfbbcbbd489913120a55b2a054b046c68b40a8a.tar.bz2 otp-ddfbbcbbd489913120a55b2a054b046c68b40a8a.zip | |
Merge branch 'ia/public_key/bitstring/OTP-12110'
* ia/public_key/bitstring/OTP-12110:
ssl: Adjust to public_key application removing legacy compact_bit_string switch
public_key: Update vsn for OTP 18
public_key: Reject bad signatures as early as possible
public_key: Remove legacy switch compact_bit_string
Diffstat (limited to 'lib/public_key/src/pubkey_pem.erl')
| -rw-r--r-- | lib/public_key/src/pubkey_pem.erl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/public_key/src/pubkey_pem.erl b/lib/public_key/src/pubkey_pem.erl index 98881c4a6a..a62658923f 100644 --- a/lib/public_key/src/pubkey_pem.erl +++ b/lib/public_key/src/pubkey_pem.erl @@ -143,8 +143,7 @@ decode_encrypted_private_keyinfo(Der) -> encryptedData = Data} = public_key:der_decode('EncryptedPrivateKeyInfo', Der), DecryptParams = pubkey_pbe:decrypt_parameters(AlgorithmInfo), - {'PrivateKeyInfo', iolist_to_binary(Data), DecryptParams}. - + {'PrivateKeyInfo', Data, DecryptParams}. encode_encrypted_private_keyinfo(EncData, EncryptParmams) -> AlgorithmInfo = pubkey_pbe:encrypt_parameters(EncryptParmams), |