[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis] branch master updated: fixed warnings fixed json in an
From: |
gnunet |
Subject: |
[taler-anastasis] branch master updated: fixed warnings fixed json in anastasis.c |
Date: |
Wed, 22 Apr 2020 16:13:24 +0200 |
This is an automated email from the git hooks/post-receive script.
ds-meister pushed a commit to branch master
in repository anastasis.
The following commit(s) were added to refs/heads/master by this push:
new c0aaeaa fixed warnings fixed json in anastasis.c
c0aaeaa is described below
commit c0aaeaafe773453f859bd8879cfe447dceef41d6
Author: Dominik Meister <address@hidden>
AuthorDate: Wed Apr 22 16:13:08 2020 +0200
fixed warnings fixed json in anastasis.c
---
src/lib/anastasis.c | 34 +++++++++++++++++++++-------------
1 file changed, 21 insertions(+), 13 deletions(-)
diff --git a/src/lib/anastasis.c b/src/lib/anastasis.c
index eaa60c8..1c2b0b2 100644
--- a/src/lib/anastasis.c
+++ b/src/lib/anastasis.c
@@ -833,11 +833,11 @@ ANASTASIS_secret_share (const json_t *id_data,
size_t enc_rec_doc_size;
- //Recovery document contains the array decryption policies and the array
escrow methods
+ // Recovery document contains the array decryption policies and the array
escrow methods
json_t *recovery_document;
- //json array
+ // json array
json_t *dec_policies;
- //json array
+ // json array
json_t *esc_methods;
for (unsigned int i = 0; i < policies_len; i++)
@@ -852,18 +852,22 @@ ANASTASIS_secret_share (const json_t *id_data,
&encrypted_core_secret,
encrypted_master_keys);
- dec_policies = json_array();
- esc_methods = json_array();
+ dec_policies = json_array ();
+ esc_methods = json_array ();
for (unsigned int k = 0; k < policies_len; k++ )
{
json_t *dec_policy = json_pack ("{s:o," /* encrypted master key */
" s:o}", /* policy uuids */
"master_key",
- GNUNET_JSON_from_data_auto
(&encrypted_master_keys[k]),
+ GNUNET_JSON_from_data_auto (
+ &encrypted_master_keys[k]),
"uuids",
- GNUNET_JSON_from_data (policies[k]->uuids,
policies[k]->uuid_length * sizeof(uuid_t)));
+ GNUNET_JSON_from_data (policies[k]->uuids,
+ policies[k]->
+ uuid_length
+ * sizeof(uuid_t)));
- json_array_append_new(dec_policies, dec_policy);
+ json_array_append_new (dec_policies, dec_policy);
}
// FIXME CHALLENGE
for (unsigned int l = 0; l < truths_len; l++)
@@ -874,12 +878,15 @@ ANASTASIS_secret_share (const json_t *id_data,
" s:o," /* truth salt */
" s:s}", /* escrow method */
"uuid",
- GNUNET_JSON_from_data (truths[l]->uuid,
sizeof(uuid_t)),
+ GNUNET_JSON_from_data (truths[l]->uuid,
+ sizeof(uuid_t)),
"url", truths[l]->url,
- "truth_key",
GNUNET_JSON_from_data_auto(&truths[l]->truth_key),
- "salt",
GNUNET_JSON_from_data_auto(truths[l]->salt),
+ "truth_key", GNUNET_JSON_from_data_auto (
+ &truths[l]->truth_key),
+ "salt", GNUNET_JSON_from_data_auto (
+ truths[l]->salt),
"escrow_method", truths[l]->method);
- json_array_append_new(esc_methods, esc_method);
+ json_array_append_new (esc_methods, esc_method);
}
recovery_document = json_pack (
@@ -888,7 +895,8 @@ ANASTASIS_secret_share (const json_t *id_data,
" s:o}", /* encrypted core secret */
"policies", dec_policies,
"escrow_methods", esc_methods,
- "core_secret", GNUNET_JSON_from_data (&encrypted_core_secret,
core_secret_size));
+ "core_secret", GNUNET_JSON_from_data (&encrypted_core_secret,
+ core_secret_size));
st->so = ANASTASIS_salt (ss->ctx,
--
To stop receiving notification emails like this one, please contact
address@hidden.