[taler-anastasis] 03/03: merge

[gnunet]

This is an automated email from the git hooks/post-receive script.

dennis-neufeld pushed a commit to branch master
in repository anastasis.

commit 039678d47df3b979061b0265a6dca0c02f5691a5
Author: Dennis Neufeld <address@hidden>
AuthorDate: Mon Apr 13 07:18:00 2020 +0000

    merge
---
 src/lib/anastasis.c | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/lib/anastasis.c b/src/lib/anastasis.c
index 5518e3a..109478f 100644
--- a/src/lib/anastasis.c
+++ b/src/lib/anastasis.c
@@ -169,7 +169,7 @@ policy_lookup_cb (void *cls,
                   unsigned int http_status,
                   const struct ANASTASIS_DownloadDetails *dd)
 {
-  //FIXME
+  // FIXME
   struct ANASTASIS_Recovery *r = cls;
   r->plo = NULL;
   if (MHD_HTTP_OK == http_status)
@@ -222,10 +222,12 @@ ANASTASIS_recovery_begin (const json_t *id_data,
 
   if (version != 0)
   {
-    while (i < provider_candidates_length || r->encrypted_recovery_document != 
NULL)
+    while (i < provider_candidates_length || r->encrypted_recovery_document !=
+           NULL)
     {
       r->plo = ANASTASIS_policy_lookup_version (r->ctx,
-                                                
anastasis_provider_url_candidates[i],
+                                                
anastasis_provider_url_candidates
+                                                [i],
                                                 &r->pub_key,
                                                 &policy_lookup_cb,
                                                 r,
@@ -236,7 +238,8 @@ ANASTASIS_recovery_begin (const json_t *id_data,
   }
   else
   {
-    while (i < provider_candidates_length || r->encrypted_recovery_document != 
NULL)
+    while (i < provider_candidates_length || r->encrypted_recovery_document !=
+           NULL)
     {
       r->plo = ANASTASIS_policy_lookup (r->ctx,
                                         anastasis_provider_url_candidates[i],
@@ -261,9 +264,10 @@ ANASTASIS_recovery_begin (const json_t *id_data,
                                               &size_plaintext);
 
 
-  recovery_document = json_loadb((char 
*)plaintext,size_plaintext,JSON_DECODE_ANY,&json_error);
+  recovery_document = json_loadb ((char *) plaintext,size_plaintext,
+                                  JSON_DECODE_ANY,&json_error);
 
-  //FIXME CALLBACK AND RECOVERY DOCUMENT BUILD
+  // FIXME CALLBACK AND RECOVERY DOCUMENT BUILD
 
 
 
@@ -396,14 +400,14 @@ struct ANASTASIS_Policy
    * salt used to encrypt the master key
    */
   struct ANASTASIS_CRYPTO_Salt salt;
-   /**
-   * size of the truths
-   */
+  /**
+  * size of the truths
+  */
   unsigned int truths_len;
-   /**
-   * set of truths inside this policy
-   */
-   struct ANASTASIS_Truth *truths[];
+  /**
+  * set of truths inside this policy
+  */
+  struct ANASTASIS_Truth *truths[];
 };
 
 /**
@@ -420,14 +424,14 @@ ANASTASIS_policy_create (struct ANASTASIS_Truth *truths[],
   p = GNUNET_new (struct ANASTASIS_Policy);
   struct ANASTASIS_CRYPTO_PolicyKey policy_key;
   struct ANASTASIS_CRYPTO_KeyShare key_shares[truths_len];
-  //p->truths = truths;
-  //p->truths_len = truths_len;
+  // p->truths = truths;
+  // p->truths_len = truths_len;
 
   for (unsigned int i = 0; i < truths_len; i++)
   {
     key_shares[i] = truths[i]->key_share;
   }
-  //FIXME SALT
+  // FIXME SALT
   ANASTASIS_CRYPTO_policy_key_derive (&key_shares,
                                       truths_len,
                                       &p->salt,

-- 
To stop receiving notification emails like this one, please contact
address@hidden.