diff options
| author | Linus Nordberg <linus@nordu.net> | 2014-05-10 11:22:46 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2014-05-10 11:22:46 +0200 |
| commit | 467e119f1d88a9b3c0ec3c338906e2934d02679f (patch) | |
| tree | 45d0e785e38bab94b08ad059a1afcd38ba247644 /src | |
| parent | 17e9e4f72b13893443b135bce67b0f55abe4627f (diff) | |
| parent | b4b5e0c94ed3f3d579ec033a52b2a8d70069cc64 (diff) | |
Merge branch 'master' of /home/linus/repo/ctls
Conflicts:
src/v1.erl
Diffstat (limited to 'src')
| -rw-r--r-- | src/v1.erl | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -3,7 +3,7 @@ get_sth_consistency/3, get_proof_by_hash/3, get_entries/3, get_roots/3, get_entry_and_proof/3]). -export([hello/3]). --include("/home/linus/usr/src/ct/plop/include/plop.hrl"). +-include("$CTROOT/plop/include/plop.hrl"). -define(PROTOCOL_VERSION, 1). %% Public functions. @@ -36,7 +36,7 @@ get_sth(SessionID, _Env, _Input) -> R = [{tree_size, Treesize}, {timestamp, Timestamp}, {sha256_root_hash, base64:encode(Roothash)}, - {tree_head_signature, base64:encode(Signature)}], + {tree_head_signature, Signature}], deliver(SessionID, jiffy:encode({R})). get_sth_consistency(SessionID, _Env, _Input) -> |