From 59c8660a593312f77725507a997428489e9b1ada Mon Sep 17 00:00:00 2001
From: James Fish <james@fishcakez.com>
Date: Fri, 3 May 2013 16:27:35 +0100
Subject: Support R15B

---
 src/ct_helper.erl      | 5 ++---
 src/erl_make_certs.erl | 4 ++--
 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))),
-- 
cgit v1.2.3