aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public_key/src/pubkey_pem.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2012-11-15 10:38:05 +0100
committerIngela Anderton Andin <[email protected]>2012-11-15 14:02:01 +0100
commitdbf18b8a7713d76c0be307af40e97cd7c564aa53 (patch)
tree60f065f70d06bc4cdf43e49d36c73c9000ee6147 /lib/public_key/src/pubkey_pem.erl
parent689b6c5bacf0d7f89c7f3de028627753ad5a1438 (diff)
downloadotp-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/pubkey_pem.erl')
-rw-r--r--lib/public_key/src/pubkey_pem.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/public_key/src/pubkey_pem.erl b/lib/public_key/src/pubkey_pem.erl
index 15290387ff..4012825f20 100644
--- a/lib/public_key/src/pubkey_pem.erl
+++ b/lib/public_key/src/pubkey_pem.erl
@@ -219,7 +219,9 @@ pem_end(<<"-----BEGIN ENCRYPTED PRIVATE KEY-----">>) ->
pem_end(<<"-----BEGIN CERTIFICATE REQUEST-----">>) ->
<<"-----END CERTIFICATE REQUEST-----">>;
pem_end(<<"-----BEGIN PKCS7-----">>) ->
- <<"-----END PKCS7-----">>.
+ <<"-----END PKCS7-----">>;
+pem_end(_) ->
+ undefined.
asn1_type(<<"-----BEGIN CERTIFICATE-----">>) ->
'Certificate';