[taler-anastasis] branch master updated: added salt

[gnunet]

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 b2eb6dd  added salt
b2eb6dd is described below

commit b2eb6ddff38647e9d11868ee2af3bd6b305d414f
Author: Dominik Meister <address@hidden>
AuthorDate: Wed May 13 12:27:18 2020 +0200

    added salt
---
 src/include/anastasis.h |  4 ++++
 src/lib/anastasis.c     | 12 +++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/include/anastasis.h b/src/include/anastasis.h
index d521836..4b37bae 100644
--- a/src/include/anastasis.h
+++ b/src/include/anastasis.h
@@ -64,6 +64,10 @@ struct ANASTASIS_DecryptionPolicy
    * encrypted masterkey ( encrypted with the policy key)
    */
   struct ANASTASIS_CRYPTO_EncryptedMasterKeyP *emk;
+  /**
+   * salt used to decrypt master key
+   */
+  struct ANASTASIS_CRYPTO_SaltP salt;
 };
 
 /**
diff --git a/src/lib/anastasis.c b/src/lib/anastasis.c
index 3085429..bd77dfb 100644
--- a/src/lib/anastasis.c
+++ b/src/lib/anastasis.c
@@ -362,9 +362,8 @@ keyshare_lookup_cb (void *cls,
       }
     }
     ANASTASIS_CRYPTO_policy_key_derive (key_shares,
-                                        c->recovery->ri->dps[success].
-                                        uuids_length,
-                                        &c->recovery->policy_salt,
+                                        
c->recovery->ri->dps[success].uuids_length,
+                                        &c->recovery->ri->dps[success].salt,
                                         &policy_key);
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "At %s:%d the policy key is %s-%llu b\n", __FILE__, __LINE__,
@@ -607,9 +606,11 @@ policy_lookup_cb (void *cls,
                    json_unpack (json_array_get (dec_policies, j),
                                 "{s:o,"         /* encrypted master key */
                                 " s:o,"         /* policy uuids  */
+                                " s:o,"         /* policy salt */
                                 " s:i}",        /* policy uuids length */
                                 "master_key",r->ri->dps[j].emk,
                                 "uuids",r->ri->dps[j].escrow_uuids,
+                                "salt", r->ri->dps[j].salt,
                                 "uuids_length", r->ri->dps[j].uuids_length));
 
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -621,6 +622,11 @@ policy_lookup_cb (void *cls,
                 "At %s:%d escrow uuids are %s-%llu b\n", __FILE__, __LINE__,
                 TALER_B2S (&r->ri->dps[j].escrow_uuids),
                 (unsigned long long) sizeof (r->ri->dps[j].escrow_uuids));
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "At %s:%d policy salt is %s-%llu b\n", __FILE__, __LINE__,
+                TALER_B2S (&r->ri->dps[j].salt),
+                (unsigned long long) sizeof (r->ri->dps[j].salt));
+
   }
   r->solved_challenge_pos = 0;
   r->ri->cs = &cs;

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