aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public_key/test
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/test
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/test')
-rw-r--r--lib/public_key/test/public_key_SUITE.erl8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/public_key/test/public_key_SUITE.erl b/lib/public_key/test/public_key_SUITE.erl
index eeecdb7d8f..8dfd068d91 100644
--- a/lib/public_key/test/public_key_SUITE.erl
+++ b/lib/public_key/test/public_key_SUITE.erl
@@ -111,7 +111,7 @@ all() ->
groups() ->
[{pem_decode_encode, [], [dsa_pem, rsa_pem, encrypted_pem,
- dh_pem, cert_pem]},
+ dh_pem, cert_pem, pkcs10_pem]},
{ssh_public_key_decode_encode, [],
[ssh_rsa_public_key, ssh_dsa_public_key, ssh_rfc4716_rsa_comment,
ssh_rfc4716_dsa_comment, ssh_rfc4716_rsa_subject, ssh_known_hosts,
@@ -263,7 +263,11 @@ pkcs10_pem(Config) when is_list(Config) ->
erl_make_certs:der_to_pem(filename:join(Datadir, "new_req.pem"), [Entry]),
- public_key:der_decode('CertificationRequest', DerPKCS10).
+ PKCS10 = public_key:der_decode('CertificationRequest', DerPKCS10),
+ PKCS10 = public_key:pem_entry_decode(Entry),
+
+ Entry = public_key:pem_entry_encode('CertificationRequest', PKCS10).
+
%%--------------------------------------------------------------------
cert_pem(doc) ->