[taler-anastasis] branch master updated (0d66dc2 -> 0ca921b)

[gnunet]

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

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

    from 0d66dc2  begone, evil code
     new 7568bfc  modified makefile
     new caf935f  if defined debug for scrypt
     new 0ca921b  small fixes

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitignore                            |  3 ++-
 src/include/anastasis_service.h       |  1 +
 src/lib/Makefile.am                   |  5 -----
 src/lib/testing_api_cmd_truth_store.c |  2 +-
 src/util/anastasis_crypto.c           | 10 +++++++++-
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 87fc46a..59e8fbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -89,4 +89,5 @@ src/util/vgcore.*
 src/statis/vgcore.*
 src/lib/valgrind*.txt
 src/stasis/valgrind*.txt
-src/util/valgrind*.txt
\ No newline at end of file
+src/util/valgrind*.txt
+src/lib/test_anastasis
\ No newline at end of file
diff --git a/src/include/anastasis_service.h b/src/include/anastasis_service.h
index d20ffb9..1b8e9d9 100644
--- a/src/include/anastasis_service.h
+++ b/src/include/anastasis_service.h
@@ -63,6 +63,7 @@ struct ANASTASIS_UploadSignaturePS
   struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
 
   /**
+   * FIXME: Do we need this? (Copied from Sync)
    * Hash of the previous backup, all zeros for none.
    */
   // struct GNUNET_HashCode old_recovery_data_hash;
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 46deac6..9056b66 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -137,9 +137,4 @@ EXTRA_DIST = \
   test_anastasis_api_home/.local/share/taler/exchange/offline-keys/master.priv 
\
   #test_anastasis_api_home/.config/taler/merchant/wire/test.json \
   #test_anastasis_api_home/.config/taler/test.json \
-  test_anastasis.conf \
-  test_anastasis_home/.config/taler/exchange/account-2.json \
-  test_anastasis_home/.local/share/taler/exchange/offline-keys/master.priv \
-  #test_anastasis_home/.config/taler/merchant/wire/test.json \
-  #test_anastasis_home/.config/taler/test.json \
   #test_merchant.priv
diff --git a/src/lib/testing_api_cmd_truth_store.c 
b/src/lib/testing_api_cmd_truth_store.c
index d6b297a..ddaa2cf 100644
--- a/src/lib/testing_api_cmd_truth_store.c
+++ b/src/lib/testing_api_cmd_truth_store.c
@@ -66,7 +66,7 @@ struct TruthStoreState
   /**
    * The nonce.
    */
-  struct GNUNET_CRYPTO_EddsaPublicKey nonce;
+  struct GNUNET_CRYPTO_EddsaPublicKey pub;
 
   /**
    * URL of the anastasis backend.
diff --git a/src/util/anastasis_crypto.c b/src/util/anastasis_crypto.c
index 24db515..89ee857 100644
--- a/src/util/anastasis_crypto.c
+++ b/src/util/anastasis_crypto.c
@@ -28,6 +28,14 @@
 #include <gnunet/gnunet_util_lib.h>
 #include <string.h>
 
+#if defined(DEBUG) || defined(DEBUG2)
+#define SCRYPT_ITERATION 1
+
+#else
+#define SCRYPT_ITERATION 1000
+#endif
+
+
 /**
  * Compute @a key and @a iv.
  *
@@ -295,7 +303,7 @@ ANASTASIS_CRYPTO_user_identifier_derive (
                                   1, // subalgo
                                   server_salt->salt,
                                   strlen (server_salt->salt),
-                                  1000, // iterations
+                                  SCRYPT_ITERATION, // iterations
                                   sizeof (struct
                                           ANASTASIS_CRYPTO_UserIdentifier),
                                   id));

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