summaryrefslogtreecommitdiff
path: root/src/signing.erl
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2017-03-01 09:54:07 +0100
committerLinus Nordberg <linus@nordu.net>2017-03-01 09:54:07 +0100
commita6652b80f4281cfc7cbf78c008342e2fda36c715 (patch)
treecaab69e703adaee7b0669e38ccc99f305991ef0d /src/signing.erl
parent21a7ceeda03f851da2643e175c2dff7b0a012fe1 (diff)
parent11fc428f6eb52936bdbde1be5a6cd4e56704bc68 (diff)
Merge branch 'map-storage-signature'
Diffstat (limited to 'src/signing.erl')
-rw-r--r--src/signing.erl7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/signing.erl b/src/signing.erl
index 86ccb88..9cced1b 100644
--- a/src/signing.erl
+++ b/src/signing.erl
@@ -1,4 +1,4 @@
-%%% Copyright (c) 2014-2015, NORDUnet A/S.
+%%% Copyright (c) 2014-2017, NORDUnet A/S.
%%% See LICENSE for licensing information.
%%% @doc Signing node API
@@ -15,8 +15,8 @@ request(post, ?APPURL_PLOP_SIGNING, "sct", Input) ->
html("sendentry: bad input:", E);
{struct, PropList} ->
Data = base64:decode(proplists:get_value(<<"data">>, PropList)),
-
- Result = sign:sign_sct(Data),
+ Signatures = proplists:get_value(<<"signatures">>, PropList, []),
+ Result = sign:sign_sct(Data, Signatures),
success({[{result, base64:encode(Result)}]})
end;
request(post, ?APPURL_PLOP_SIGNING, "sth", Input) ->
@@ -25,7 +25,6 @@ request(post, ?APPURL_PLOP_SIGNING, "sth", Input) ->
html("sendentry: bad input:", E);
{struct, PropList} ->
Data = base64:decode(proplists:get_value(<<"data">>, PropList)),
-
Result = sign:sign_sth(Data),
success({[{result, base64:encode(Result)}]})
end.