diff options
author | Ingela Anderton Andin <[email protected]> | 2012-11-15 10:38:05 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2012-11-15 14:02:01 +0100 |
commit | dbf18b8a7713d76c0be307af40e97cd7c564aa53 (patch) | |
tree | 60f065f70d06bc4cdf43e49d36c73c9000ee6147 /lib/public_key/src/public_key.erl | |
parent | 689b6c5bacf0d7f89c7f3de028627753ad5a1438 (diff) | |
download | otp-dbf18b8a7713d76c0be307af40e97cd7c564aa53.tar.gz otp-dbf18b8a7713d76c0be307af40e97cd7c564aa53.tar.bz2 otp-dbf18b8a7713d76c0be307af40e97cd7c564aa53.zip |
public_key: Simplified PKCS-7 and PKCS-10 specs.
Used defenitions from PKIX1Explicit88 to avoid most
of the overcomplicated InformationalFrameWork (and friends) ASN-1 specs.
We want to keep the public_key API as small and simple as possible.
Diffstat (limited to 'lib/public_key/src/public_key.erl')
-rw-r--r-- | lib/public_key/src/public_key.erl | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl index f7252d18a6..d5df53e848 100644 --- a/lib/public_key/src/public_key.erl +++ b/lib/public_key/src/public_key.erl @@ -176,9 +176,7 @@ der_decode(Asn1Type, Der) when is_atom(Asn1Type), is_binary(Der) -> %% Description: Encodes a public key entity with asn1 DER encoding. %%-------------------------------------------------------------------- der_encode(Asn1Type, Entity) when (Asn1Type == 'PrivateKeyInfo') or - (Asn1Type == 'EncryptedPrivateKeyInfo') or - (Asn1Type == 'CertificationRequest') - -> + (Asn1Type == 'EncryptedPrivateKeyInfo') -> try {ok, Encoded} = 'PKCS-FRAME':encode(Asn1Type, Entity), iolist_to_binary(Encoded) |