summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2014-05-12 17:08:23 +0200
committerLinus Nordberg <linus@nordu.net>2014-05-12 17:08:23 +0200
commit1065955a36169d357c8ca4588e2e4dc068c842c7 (patch)
treec8d1264b99cec0ba9abdca7f665deef417d8b606 /src
parent467e119f1d88a9b3c0ec3c338906e2934d02679f (diff)
parent74fa8bfa586da34eb2c9be14d39d10f5cac1955b (diff)
Merge branch 'master' of /home/linus/repo/ctls
Conflicts: src/v1.erl
Diffstat (limited to 'src')
-rw-r--r--src/v1.erl7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/v1.erl b/src/v1.erl
index 57458bb..32dabab 100644
--- a/src/v1.erl
+++ b/src/v1.erl
@@ -18,7 +18,9 @@ add_chain(SessionID, _Env, Input) ->
{id, base64:encode(SPT#spt.logid)},
{timestamp, SPT#spt.timestamp},
{extensions, []},
- {signature, base64:encode(SPT#spt.signature)}],
+ {signature,
+ base64:encode(
+ list_to_binary(plop:serialise(SPT#spt.signature)))}],
jiffy:encode({R});
_ -> html("add-chain: missing input: chain; see RFC 6962", Input)
end,
@@ -36,7 +38,8 @@ get_sth(SessionID, _Env, _Input) ->
R = [{tree_size, Treesize},
{timestamp, Timestamp},
{sha256_root_hash, base64:encode(Roothash)},
- {tree_head_signature, Signature}],
+ {tree_head_signature, base64:encode(
+ list_to_binary(plop:serialise(Signature)))}],
deliver(SessionID, jiffy:encode({R})).
get_sth_consistency(SessionID, _Env, _Input) ->