summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2013-05-05 17:27:59 +0200
committerLoïc Hoguin <[email protected]>2013-05-05 17:27:59 +0200
commit03a27991428d3510f9ef6ff53a3bd7347a3831b4 (patch)
tree6e0b760ed2f11d5a1568129f72e41e7c5e3c9bdb
parent117cb7171106aba8fe7028fbf9ed07a037778bcd (diff)
parent59c8660a593312f77725507a997428489e9b1ada (diff)
downloadct_helper-03a27991428d3510f9ef6ff53a3bd7347a3831b4.tar.gz
ct_helper-03a27991428d3510f9ef6ff53a3bd7347a3831b4.tar.bz2
ct_helper-03a27991428d3510f9ef6ff53a3bd7347a3831b4.zip
Merge branch 'support-r15b' of git://github.com/fishcakez/ct_helper
-rw-r--r--src/ct_helper.erl5
-rw-r--r--src/erl_make_certs.erl4
2 files changed, 4 insertions, 5 deletions
diff --git a/src/ct_helper.erl b/src/ct_helper.erl
index 23ae693..d572d68 100644
--- a/src/ct_helper.erl
+++ b/src/ct_helper.erl
@@ -26,6 +26,5 @@
-> {CaCert::der_encoded(), Cert::der_encoded(), Key::key()}.
make_certs() ->
CaInfo = {CaCert, _} = erl_make_certs:make_cert([{key, dsa}]),
- {Cert, Key0} = erl_make_certs:make_cert([{key, dsa}, {issuer, CaInfo}]),
- Key = erlang:delete_element(3, Key0),
- {CaCert, Cert, Key}.
+ {Cert, {Asn1Type, Der, _}} = erl_make_certs:make_cert([{key, dsa}, {issuer, CaInfo}]),
+ {CaCert, Cert, {Asn1Type, Der}}.
diff --git a/src/erl_make_certs.erl b/src/erl_make_certs.erl
index acd5459..82923cb 100644
--- a/src/erl_make_certs.erl
+++ b/src/erl_make_certs.erl
@@ -137,10 +137,10 @@ decode_key(PemBin, Pw) ->
encode_key(Key = #'RSAPrivateKey'{}) ->
{ok, Der} = 'OTP-PUB-KEY':encode('RSAPrivateKey', Key),
- {'RSAPrivateKey', Der, not_encrypted};
+ {'RSAPrivateKey', iolist_to_binary(Der), not_encrypted};
encode_key(Key = #'DSAPrivateKey'{}) ->
{ok, Der} = 'OTP-PUB-KEY':encode('DSAPrivateKey', Key),
- {'DSAPrivateKey', Der, not_encrypted}.
+ {'DSAPrivateKey', iolist_to_binary(Der), not_encrypted}.
make_tbs(SubjectKey, Opts) ->
Version = list_to_atom("v"++integer_to_list(proplists:get_value(version, Opts, 3))),