diff options
author | Magnus Ahltorp <map@kth.se> | 2014-10-24 06:34:00 +0200 |
---|---|---|
committer | Magnus Ahltorp <map@kth.se> | 2014-10-24 06:34:00 +0200 |
commit | 52c373e7f342b0c4cfe931165be78458c4c4b425 (patch) | |
tree | f8638421c46a5f8c6947e46aa8160682d64b5a17 | |
parent | 9229c14078bda5c0386a43fc89fcc5f3f5471670 (diff) |
!fixup merge errorsmochiweb
-rw-r--r-- | src/catlfish.erl | 1 | ||||
-rw-r--r-- | src/v1.erl | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/catlfish.erl b/src/catlfish.erl index 66141d8..73066bb 100644 --- a/src/catlfish.erl +++ b/src/catlfish.erl @@ -4,6 +4,7 @@ -module(catlfish). -export([add_chain/2, entries/2, entry_and_proof/2]). -export([known_roots/0, update_known_roots/0]). +-include_lib("eunit/include/eunit.hrl"). -define(PROTOCOL_VERSION, 0). @@ -21,7 +21,7 @@ request(post, "ct/v1/add-chain", Input) -> Roots = catlfish:known_roots(), case x509:normalise_chain(Roots, [LeafCert|CertChain]) of {ok, [Leaf | Chain]} -> - catlfish:add_chain(Leaf, Chain); + success(catlfish:add_chain(Leaf, Chain)); {Err, Msg} -> html("add-chain: ", [Msg, Err]) end; @@ -30,7 +30,7 @@ request(post, "ct/v1/add-chain", Input) -> end; _ -> html("add-chain: missing input: chain", Input) end, - success(R); + R; request(post, "ct/v1/add-pre-chain", _Input) -> niy(); |