[taler-anastasis] 07/09: PolicyKey to hash

[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 539764143635f98f349d6d6fc22a7f885c1d246a
Author: Dennis Neufeld <address@hidden>
AuthorDate: Wed Apr 1 07:45:33 2020 +0000

    PolicyKey to hash
---
 src/include/anastasis_crypto_lib.h |  2 +-
 src/util/anastasis_crypto.c        | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/include/anastasis_crypto_lib.h 
b/src/include/anastasis_crypto_lib.h
index 8175155..29e52e4 100644
--- a/src/include/anastasis_crypto_lib.h
+++ b/src/include/anastasis_crypto_lib.h
@@ -70,7 +70,7 @@ struct ANASTASIS_CRYPTO_Salt
 */
 struct ANASTASIS_CRYPTO_PolicyKey
 {
-  uint32_t key[8];
+  struct GNUNET_HashCode key;
 };
 
 
diff --git a/src/util/anastasis_crypto.c b/src/util/anastasis_crypto.c
index f22d599..38bf085 100644
--- a/src/util/anastasis_crypto.c
+++ b/src/util/anastasis_crypto.c
@@ -574,12 +574,8 @@ ANASTASIS_CRYPTO_core_secret_encrypt (
   {
     struct GNUNET_CRYPTO_SymmetricSessionKey i_sk;
     struct GNUNET_CRYPTO_SymmetricInitializationVector i_iv;
-    struct GNUNET_HashCode hashed_policy_key;
 
-    GNUNET_CRYPTO_hash (&policy_keys[i],
-                        sizeof (struct ANASTASIS_CRYPTO_PolicyKey),
-                        &hashed_policy_key);
-    GNUNET_CRYPTO_hash_to_aes_key (&hashed_policy_key, &i_sk, &i_iv);
+    GNUNET_CRYPTO_hash_to_aes_key (&policy_keys[i].key, &i_sk, &i_iv);
     GNUNET_assert (GNUNET_SYSERR !=
                    GNUNET_CRYPTO_symmetric_encrypt (&master_key,
                                                     sizeof (struct
@@ -615,13 +611,9 @@ ANASTASIS_CRYPTO_core_secret_recover (
   struct GNUNET_CRYPTO_SymmetricInitializationVector mk_iv;
   struct GNUNET_CRYPTO_SymmetricSessionKey core_sk;
   struct GNUNET_CRYPTO_SymmetricInitializationVector core_iv;
-  struct GNUNET_HashCode hashed_policy_key;
   struct GNUNET_HashCode master_key;
 
-  GNUNET_CRYPTO_hash (policy_key,
-                      sizeof (struct ANASTASIS_CRYPTO_PolicyKey),
-                      &hashed_policy_key);
-  GNUNET_CRYPTO_hash_to_aes_key (&hashed_policy_key, &mk_sk, &mk_iv);
+  GNUNET_CRYPTO_hash_to_aes_key (&policy_key->key, &mk_sk, &mk_iv);
   GNUNET_assert (GNUNET_SYSERR !=
                  GNUNET_CRYPTO_symmetric_decrypt (encrypted_master_key,
                                                   sizeof (struct

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