aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2017-10-06 17:15:52 +0200
committerIngela Anderton Andin <[email protected]>2017-10-12 16:26:10 +0200
commit4f4bf872831b12cac8913e8a62e35725d0173b0d (patch)
treecb1ac90917d8367417fb419fec78beba31561b17 /lib/ssl
parentf37f9eac178836e6bcdf575fa4c72642f146de35 (diff)
downloadotp-4f4bf872831b12cac8913e8a62e35725d0173b0d.tar.gz
otp-4f4bf872831b12cac8913e8a62e35725d0173b0d.tar.bz2
otp-4f4bf872831b12cac8913e8a62e35725d0173b0d.zip
public_key, ssl: Handles keys so that APIs are preserved correctly
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/test/x509_test.erl15
1 files changed, 6 insertions, 9 deletions
diff --git a/lib/ssl/test/x509_test.erl b/lib/ssl/test/x509_test.erl
index 031fad1216..fea01efdaf 100644
--- a/lib/ssl/test/x509_test.erl
+++ b/lib/ssl/test/x509_test.erl
@@ -64,15 +64,12 @@ do_gen_pem_config_files(Config, CertFile, KeyFile, CAFile) ->
cert_entry(Cert) ->
{'Certificate', Cert, not_encrypted}.
-key_entry(Key = #'RSAPrivateKey'{}) ->
- Der = public_key:der_encode('RSAPrivateKey', Key),
- {'RSAPrivateKey', Der, not_encrypted};
-key_entry(Key = #'DSAPrivateKey'{}) ->
- Der = public_key:der_encode('DSAPrivateKey', Key),
- {'DSAPrivateKey', Der, not_encrypted};
-key_entry(Key = #'ECPrivateKey'{}) ->
- Der = public_key:der_encode('ECPrivateKey', Key),
- {'ECPrivateKey', Der, not_encrypted}.
+key_entry({'RSAPrivateKey', DERKey}) ->
+ {'RSAPrivateKey', DERKey, not_encrypted};
+key_entry({'DSAPrivateKey', DERKey}) ->
+ {'DSAPrivateKey', DERKey, not_encrypted};
+key_entry({'ECPrivateKey', DERKey}) ->
+ {'ECPrivateKey', DERKey, not_encrypted}.
ca_entries(CAs) ->
[{'Certificate', CACert, not_encrypted} || CACert <- CAs].