diff options
author | Linus Nordberg <linus@nordu.net> | 2014-05-12 17:08:23 +0200 |
---|---|---|
committer | Linus Nordberg <linus@nordu.net> | 2014-05-12 17:08:23 +0200 |
commit | 1065955a36169d357c8ca4588e2e4dc068c842c7 (patch) | |
tree | c8d1264b99cec0ba9abdca7f665deef417d8b606 | |
parent | 467e119f1d88a9b3c0ec3c338906e2934d02679f (diff) | |
parent | 74fa8bfa586da34eb2c9be14d39d10f5cac1955b (diff) |
Merge branch 'master' of /home/linus/repo/ctls
Conflicts:
src/v1.erl
-rw-r--r-- | src/v1.erl | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -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) -> |