[taler-anastasis] branch master updated: encryption and decryption of erd now working, but some strange behaviour in test: see PLAINTEXT_AFTER(int) and PLAINTEXT_AFTER(ext) in Log after make check

[gnunet]

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

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

The following commit(s) were added to refs/heads/master by this push:
     new a6e3eb8  encryption and decryption of erd now working, but some 
strange behaviour in test: see PLAINTEXT_AFTER(int) and PLAINTEXT_AFTER(ext) in 
Log after make check
a6e3eb8 is described below

commit a6e3eb8c08fbeb418e9aa3d18e59d7dde75c9f45
Author: Dennis Neufeld <address@hidden>
AuthorDate: Wed Mar 25 13:43:02 2020 +0000

    encryption and decryption of erd now working, but some strange behaviour in 
test: see PLAINTEXT_AFTER(int) and PLAINTEXT_AFTER(ext) in Log after make check
---
 src/util/anastasis_crypto.c      | 45 +++++++++++++++++-----------------------
 src/util/test_anastasis_crypto.c |  7 +++++--
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/src/util/anastasis_crypto.c b/src/util/anastasis_crypto.c
index 4572364..386fcb1 100644
--- a/src/util/anastasis_crypto.c
+++ b/src/util/anastasis_crypto.c
@@ -60,18 +60,20 @@ get_iv_key (const struct ANASTASIS_CRYPTO_UserIdentifier 
*kdf_id,
 {
   char res[AES_KEY_SIZE + AES_IV_SIZE];
 
-  GNUNET_CRYPTO_hkdf (res,
-                      sizeof(res),
-                      GCRY_MD_SHA512,
-                      GCRY_MD_SHA256,
-                      &kdf_id,
-                      sizeof(struct ANASTASIS_CRYPTO_UserIdentifier),
-                      nonce,
-                      sizeof(struct ANASTASIS_CRYPTO_Nonce),
-                      &salt,
-                      strlen (salt),
-                      NULL,
-                      0);
+  GNUNET_assert (GNUNET_YES ==
+                 GNUNET_CRYPTO_hkdf (res,
+                                     sizeof (res),
+                                     GCRY_MD_SHA512,
+                                     GCRY_MD_SHA256,
+                                     kdf_id,
+                                     sizeof(struct
+                                            ANASTASIS_CRYPTO_UserIdentifier),
+                                     nonce,
+                                     sizeof(struct ANASTASIS_CRYPTO_Nonce),
+                                     salt,
+                                     sizeof (*salt),
+                                     NULL,
+                                     0));
   memcpy (key, res, AES_KEY_SIZE);
   memcpy (iv, &res[AES_KEY_SIZE], AES_IV_SIZE);
 }
@@ -159,9 +161,6 @@ ANASTASIS_CRYPTO_recovery_document_encrypt (
   GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_NONCE,
                               &nonce,
                               sizeof (struct ANASTASIS_CRYPTO_Nonce));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "NONCE_1:  %s\n",
-              TALER_B2S (&nonce));
   get_iv_key (id, &nonce, "erd", sym_key, iv);
   GNUNET_assert (0 ==
                  gcry_cipher_open (&cipher,
@@ -172,10 +171,6 @@ ANASTASIS_CRYPTO_recovery_document_encrypt (
                            sym_key,
                            sizeof (sym_key));
   GNUNET_assert ((0 == rc) || ((char) rc == GPG_ERR_WEAK_KEY));
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "SYMKEY_1:  %s\n",
-              TALER_B2S (&sym_key));
   rc = gcry_cipher_setiv (cipher,
                           &iv,
                           sizeof (iv));
@@ -245,9 +240,7 @@ ANASTASIS_CRYPTO_recovery_document_decrypt (
           data_size - sizeof (struct ANASTASIS_CRYPTO_Nonce) - GCM_TAG_SIZE);
 
   get_iv_key (id, &nonce, "erd", sym_key, iv);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "NONCE_2:  %s\n",
-              TALER_B2S (&nonce));
+
   GNUNET_assert (0 == gcry_cipher_open (&cipher,
                                         GCRY_CIPHER_AES256,
                                         GCRY_CIPHER_MODE_GCM,
@@ -257,18 +250,18 @@ ANASTASIS_CRYPTO_recovery_document_decrypt (
                            sizeof (sym_key));
   GNUNET_assert ((0 == rc) || ((char) rc == GPG_ERR_WEAK_KEY));
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "SYMKEY_2:  %s\n",
-              TALER_B2S (&sym_key));
   rc = gcry_cipher_setiv (cipher,
                           &iv,
                           sizeof (iv));
   GNUNET_assert ((0 == rc) || ((char) rc == GPG_ERR_WEAK_KEY));
 
   GNUNET_assert (0 == gcry_cipher_decrypt (cipher,
-                                           res, *res_size,
+                                           *res, *res_size,
                                            ciphertext,
                                            sizeof (ciphertext)));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "PLAINTEXT_AFTER(int):   %s\n",
+              TALER_B2S (*res));
   gcry_cipher_close (cipher);
 }
 
diff --git a/src/util/test_anastasis_crypto.c b/src/util/test_anastasis_crypto.c
index 4f3a3c2..6bc43df 100644
--- a/src/util/test_anastasis_crypto.c
+++ b/src/util/test_anastasis_crypto.c
@@ -42,6 +42,9 @@ test_recovery_document ()
                               &id,
                               sizeof (struct ANASTASIS_CRYPTO_UserIdentifier));
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "PLAINTEXT_BEFORE:   %s\n",
+              TALER_B2S ("TestTest"));
 
   ANASTASIS_CRYPTO_recovery_document_encrypt (&id,
                                               "TestTest",
@@ -55,8 +58,8 @@ test_recovery_document ()
                                               &plaintext,
                                               &size_plaintext);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Plaintext:   %s\n",
-              TALER_B2S (&plaintext));
+              "PLAINTEXT_AFTER(ext):   %s\n",
+              TALER_B2S ((char*) &plaintext));
   // return strncmp ("Text", dec_plaintext, sizeof (dec_plaintext));
   return 1;
 }

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