[taler-anastasis] branch master updated: testing crypto...

[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 703568f  testing crypto...
703568f is described below

commit 703568f88a6f178b800391d6fe9e530dd7e10f1c
Author: Dennis Neufeld <address@hidden>
AuthorDate: Tue Mar 24 17:35:51 2020 +0000

    testing crypto...
---
 .gitignore                       |  4 ++++
 src/util/Makefile.am             |  6 ++++--
 src/util/anastasis_crypto.c      |  8 ++++----
 src/util/test_anastasis_crypto.c | 17 +++++++++++------
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index e7c6df5..e77457d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,3 +79,7 @@ src/stasis/test_anastasis_db-postgres
 src/stasis/test_anastasis_db-postgres.log
 src/stasis/test_anastasis_db-postgres.trs
 src/stasis/test-suite.log
+src/util/test-suite.log
+src/util/test_anastasis_crypto.log
+src/util/test_anastasis_crypto
+src/util/test_anastasis_crypto.trs
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index e625442..c6f2db5 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -18,10 +18,11 @@ lib_LTLIBRARIES = \
   libanastasisutil.la
 
 libanastasisutil_la_SOURCES = \
-  os_installation.c \
-  anastasis_crypto.c
+  anastasis_crypto.c \
+  os_installation.c 
 libanastasisutil_la_LIBADD = \
   -lgnunetutil \
+  $(LIBGCRYPT_LIBS) \
   -ljansson \
   $(XLIB)
 libanastasisutil_la_LDFLAGS = \
@@ -38,4 +39,5 @@ test_anastasis_crypto_SOURCES = \
   test_anastasis_crypto.c
 test_anastasis_crypto_LDADD = \
   -lgnunetutil \
+  -ltalerutil \
   libanastasisutil.la
\ No newline at end of file
diff --git a/src/util/anastasis_crypto.c b/src/util/anastasis_crypto.c
index 2352cda..64ff0fe 100644
--- a/src/util/anastasis_crypto.c
+++ b/src/util/anastasis_crypto.c
@@ -64,10 +64,10 @@ get_iv_key (const struct ANASTASIS_CRYPTO_UserIdentifier 
*kdf_id,
                       sizeof(res),
                       GCRY_MD_SHA512,
                       GCRY_MD_SHA256,
-                      &kdf_id->hash,
-                      sizeof(kdf_id->hash),
-                      &nonce->nonce,
-                      sizeof(nonce->nonce),
+                      &kdf_id,
+                      sizeof(struct ANASTASIS_CRYPTO_UserIdentifier),
+                      nonce,
+                      sizeof(struct ANASTASIS_CRYPTO_Nonce),
                       &salt,
                       strlen (salt),
                       NULL,
diff --git a/src/util/test_anastasis_crypto.c b/src/util/test_anastasis_crypto.c
index 3e1f224..e49e3cd 100644
--- a/src/util/test_anastasis_crypto.c
+++ b/src/util/test_anastasis_crypto.c
@@ -25,6 +25,8 @@
  * @author Dominik Meister
  */
 #include "platform.h"
+#include <taler/taler_util.h>
+#include <gnunet/gnunet_util_lib.h>
 #include "anastasis_crypto_lib.h"
 
 static int test_recovery_document ()
@@ -33,23 +35,26 @@ static int test_recovery_document ()
   size_t size_ciphertext;
   void *plaintext;
   size_t size_plaintext;
-  const struct ANASTASIS_CRYPTO_UserIdentifier *id;
+  const struct ANASTASIS_CRYPTO_UserIdentifier id;
+
   GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_NONCE,
                               &id,
-                              sizeof (id));
+                              sizeof (struct ANASTASIS_CRYPTO_UserIdentifier));
+
 
-  ANASTASIS_CRYPTO_recovery_document_encrypt (id,
+  ANASTASIS_CRYPTO_recovery_document_encrypt (&id,
                                               "Test",
                                               strlen ("Test"),
                                               &ciphertext,
                                               &size_ciphertext);
 
-  /*ANASTASIS_CRYPTO_recovery_document_decrypt (id,
+  ANASTASIS_CRYPTO_recovery_document_decrypt (&id,
                                               ciphertext,
                                               size_ciphertext,
                                               &plaintext,
-                                              &size_plaintext);*/
-  return 1;
+                                              &size_plaintext);
+
+  return 0;
 }
 
 int

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