diff options
| -rw-r--r-- | src/ct_helper.erl | 2 | ||||
| -rw-r--r-- | src/ct_helper_error_h.erl | 5 | ||||
| -rw-r--r-- | src/erl_make_certs.erl | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/ct_helper.erl b/src/ct_helper.erl index 8e9d6d1..ff6c3d7 100644 --- a/src/ct_helper.erl +++ b/src/ct_helper.erl @@ -232,7 +232,7 @@ make_certs_in_ets() -> %% them. {versions, ['tlsv1.2']} ], - Pid = spawn(fun() -> receive after infinity -> ok end end), + Pid = spawn(fun() -> receive shutdown -> ok after infinity -> ok end end), ?MODULE = ets:new(?MODULE, [ordered_set, public, named_table, {heir, Pid, undefined}]), ets:insert(?MODULE, {cert_opts, CertOpts}), diff --git a/src/ct_helper_error_h.erl b/src/ct_helper_error_h.erl index 796e07a..2cf88c8 100644 --- a/src/ct_helper_error_h.erl +++ b/src/ct_helper_error_h.erl @@ -156,9 +156,10 @@ code_change(_, State, _) -> %% Internal. write_event(Event) -> - error_logger_tty_h:write_event( + _ = error_logger_tty_h:write_event( {erlang:universaltime(), Event}, - io). + io), + ok. count_args("]" ++ _, N, 0) -> N; diff --git a/src/erl_make_certs.erl b/src/erl_make_certs.erl index dfa9955..884230d 100644 --- a/src/erl_make_certs.erl +++ b/src/erl_make_certs.erl @@ -194,7 +194,7 @@ issuer(true, Opts, SubjectKey) -> issuer({Issuer, IssuerKey}, _Opts, _SubjectKey) when is_binary(Issuer) -> {issuer_der(Issuer), decode_key(IssuerKey)}; issuer({File, IssuerKey}, _Opts, _SubjectKey) when is_list(File) -> - {ok, [{cert, Cert, _}|_]} = pem_to_der(File), + [{'Certificate', Cert, _}|_] = pem_to_der(File), {issuer_der(Cert), decode_key(IssuerKey)}. issuer_der(Issuer) -> |