[taler-anastasis] branch master updated: fix checks'

[gnunet]

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

grothoff pushed a commit to branch master
in repository anastasis.

The following commit(s) were added to refs/heads/master by this push:
     new eb1e2ab  fix checks'
eb1e2ab is described below

commit eb1e2ab89e388c2d43ed807b3262edb42e5bc629
Author: Christian Grothoff <address@hidden>
AuthorDate: Mon Mar 30 09:45:00 2020 +0200

    fix checks'
---
 src/util/anastasis_crypto.c | 66 +++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 39 deletions(-)

diff --git a/src/util/anastasis_crypto.c b/src/util/anastasis_crypto.c
index 82ad93c..56a14c0 100644
--- a/src/util/anastasis_crypto.c
+++ b/src/util/anastasis_crypto.c
@@ -521,17 +521,17 @@ ANASTASIS_CRYPTO_core_secret_encrypt (
   struct GNUNET_CRYPTO_SymmetricSessionKey sk;
   struct GNUNET_CRYPTO_SymmetricInitializationVector iv;
   struct GNUNET_HashCode master_key;
+
   GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_STRONG,
                               &master_key,
                               sizeof (struct GNUNET_HashCode));
   GNUNET_CRYPTO_hash_to_aes_key (&master_key, &sk, &iv);
-  if (-1 == GNUNET_CRYPTO_symmetric_encrypt (core_secret,
-                                             core_secret_size,
-                                             &sk,
-                                             &iv,
-                                             *enc_core_secret))
-    ;
-
+  GNUNET_assert (GNUNET_SYSERR !=
+                 GNUNET_CRYPTO_symmetric_encrypt (core_secret,
+                                                  core_secret_size,
+                                                  &sk,
+                                                  &iv,
+                                                  *enc_core_secret));
   for (unsigned int i = 0; i < policy_keys_length; i++)
   {
     struct GNUNET_CRYPTO_SymmetricSessionKey i_sk;
@@ -542,16 +542,13 @@ ANASTASIS_CRYPTO_core_secret_encrypt (
                         sizeof (struct ANASTASIS_CRYPTO_PolicyKey),
                         &hashed_policy_key);
     GNUNET_CRYPTO_hash_to_aes_key (&hashed_policy_key, &i_sk, &i_iv);
-    if (-1 ==
-        GNUNET_CRYPTO_symmetric_encrypt (&master_key,
-                                         sizeof (struct GNUNET_HashCode),
-                                         &i_sk,
-                                         &i_iv,
-                                         &encrypted_master_keys[0]))
-      ;
-    {
-      GNUNET_break (0);
-    }
+    GNUNET_assert (GNUNET_SYSERR !=
+                   GNUNET_CRYPTO_symmetric_encrypt (&master_key,
+                                                    sizeof (struct
+                                                            GNUNET_HashCode),
+                                                    &i_sk,
+                                                    &i_iv,
+                                                    
&encrypted_master_keys[0]));
   }
 }
 
@@ -587,29 +584,20 @@ ANASTASIS_CRYPTO_core_secret_recover (
                       sizeof (struct ANASTASIS_CRYPTO_PolicyKey),
                       &hashed_policy_key);
   GNUNET_CRYPTO_hash_to_aes_key (&hashed_policy_key, &mk_sk, &mk_iv);
-  if (-1 ==
-      GNUNET_CRYPTO_symmetric_decrypt (encrypted_master_key,
-                                       sizeof (struct
-                                               
ANASTASIS_CRYPTO_EncryptedMasterKey),
-                                       &mk_sk,
-                                       &mk_iv,
-                                       &master_key))
-    ;
-  {
-    GNUNET_break (0);
-  }
-
+  GNUNET_assert (GNUNET_SYSERR !=
+                 GNUNET_CRYPTO_symmetric_decrypt (encrypted_master_key,
+                                                  sizeof (struct
+                                                          
ANASTASIS_CRYPTO_EncryptedMasterKey),
+                                                  &mk_sk,
+                                                  &mk_iv,
+                                                  &master_key));
   GNUNET_CRYPTO_hash_to_aes_key (&master_key, &core_sk, &core_iv);
-  if (-1 ==
-      GNUNET_CRYPTO_symmetric_decrypt (encrypted_core_secret,
-                                       encrypted_core_secret_size,
-                                       &core_sk,
-                                       &core_iv,
-                                       *core_secret))
-    ;
-  {
-    GNUNET_break (0);
-  }
+  GNUNET_assert (GNUNET_SYSERR !=
+                 GNUNET_CRYPTO_symmetric_decrypt (encrypted_core_secret,
+                                                  encrypted_core_secret_size,
+                                                  &core_sk,
+                                                  &core_iv,
+                                                  *core_secret));
 }
 
 

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