diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-04-13 14:30:10 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-04-20 08:43:15 +0200 |
| commit | 3bf1096068c3a123a23e6a1499152976a2da131e (patch) | |
| tree | 6e310de5b2728749ce85bea27959448251d71e9e /lib/public_key/src/pubkey_pem.erl | |
| parent | aa8efa1cc3f776d5b3b5af24afd4369ca1f7da00 (diff) | |
| download | otp-3bf1096068c3a123a23e6a1499152976a2da131e.tar.gz otp-3bf1096068c3a123a23e6a1499152976a2da131e.tar.bz2 otp-3bf1096068c3a123a23e6a1499152976a2da131e.zip | |
public_key: Remove legacy switch compact_bit_string
* E.I bitstrings will not be decode as {Unused, Binary}, they are now
Erlang bitstrings.
* Also the compact_bit_string implies the legacy_erlang_types switch
- So removing the switch will also make OCTET STRING values be represented
as binaries.
- Undecoded open type will now be wrapped in a asn1_OPENTYPE tuple.
We need to handle this in pubkey_pbe.erl, maybe this can be eliminated
later by updating/refreshing ASN1-specs.
This will change some values in records returned by the public_key API
making this change a potentiall incompatibility.
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), |