[taler-anastasis] branch master updated: modified salt request again :D

[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 fc60a08  modified salt request again :D
fc60a08 is described below

commit fc60a083be5bc47cb4487596deab00e83f3cb1db
Author: Dennis Neufeld <address@hidden>
AuthorDate: Fri Apr 17 09:12:24 2020 +0000

    modified salt request again :D
---
 src/include/anastasis_crypto_lib.h    |   4 ++--
 src/lib/anastasis.c                   |   4 ++--
 src/lib/anastasis_api_truth_store.c   |   1 +
 src/lib/test_anastasis_api.c          |   1 +
 src/lib/testing_api_cmd_truth_store.c |   1 +
 src/lib/vgcore.382850                 | Bin 0 -> 54247424 bytes
 src/lib/vgcore.383219                 | Bin 0 -> 54247424 bytes
 src/lib/vgcore.383659                 | Bin 0 -> 54247424 bytes
 src/util/anastasis_crypto.c           |   6 +++---
 src/util/test_anastasis_crypto.c      |  10 +++++-----
 src/util/vgcore.380224                | Bin 0 -> 16338944 bytes
 src/util/vgcore.381169                | Bin 0 -> 41508864 bytes
 12 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/include/anastasis_crypto_lib.h 
b/src/include/anastasis_crypto_lib.h
index 3e3eeb3..a9a7f1e 100644
--- a/src/include/anastasis_crypto_lib.h
+++ b/src/include/anastasis_crypto_lib.h
@@ -57,7 +57,7 @@ struct ANASTASIS_CRYPTO_TruthKey
 */
 struct ANASTASIS_CRYPTO_Salt
 {
-  char *salt;
+  const char *salt;
 };
 
 
@@ -165,7 +165,7 @@ struct ANASTASIS_CRYPTO_UserIdentifier
 void
 ANASTASIS_CRYPTO_user_identifier_derive (
   const json_t *id_data,
-  const struct ANASTASIS_CRYPTO_Salt server_salt,
+  const struct ANASTASIS_CRYPTO_Salt *server_salt,
   struct ANASTASIS_CRYPTO_UserIdentifier *id);
 
 
diff --git a/src/lib/anastasis.c b/src/lib/anastasis.c
index ff34aad..ef82156 100644
--- a/src/lib/anastasis.c
+++ b/src/lib/anastasis.c
@@ -288,7 +288,7 @@ ANASTASIS_recovery_begin (const json_t *id_data,
                            &salt_cb,
                            ss);
   ANASTASIS_CRYPTO_user_identifier_derive (id_data,
-                                           ss->so->salt,
+                                           &ss->so->salt,
                                            &r->id);
   salt_cleanup (ss);
   ANASTASIS_CRYPTO_account_public_key_derive (&r->id,
@@ -579,7 +579,7 @@ ANASTASIS_truth_upload (const json_t *id_data,
 
   ANASTASIS_CRYPTO_key_share_create (&t->key_share);
   ANASTASIS_CRYPTO_user_identifier_derive (id_data,
-                                           ss->so->salt,
+                                           &ss->so->salt,
                                            &tu->id);
   ANASTASIS_CRYPTO_key_share_encrypt (&t->key_share,
                                       &tu->id,
diff --git a/src/lib/anastasis_api_truth_store.c 
b/src/lib/anastasis_api_truth_store.c
index 3b8e19d..3aced1a 100644
--- a/src/lib/anastasis_api_truth_store.c
+++ b/src/lib/anastasis_api_truth_store.c
@@ -345,5 +345,6 @@ ANASTASIS_truth_store (struct GNUNET_CURL_Context *ctx,
                                       GNUNET_NO,
                                       &handle_truth_store_finished,
                                       tso);
+  json_decref (truth_data);
   return tso;
 }
diff --git a/src/lib/test_anastasis_api.c b/src/lib/test_anastasis_api.c
index 984699a..e7daad8 100644
--- a/src/lib/test_anastasis_api.c
+++ b/src/lib/test_anastasis_api.c
@@ -244,6 +244,7 @@ run (void *cls,
                                        ANASTASIS_TESTING_make_truth_example (
                                          "Truth method",
                                          "Truth mime")),
+
     TALER_TESTING_cmd_end ()
   };
 
diff --git a/src/lib/testing_api_cmd_truth_store.c 
b/src/lib/testing_api_cmd_truth_store.c
index 11c44ac..7d2fd19 100644
--- a/src/lib/testing_api_cmd_truth_store.c
+++ b/src/lib/testing_api_cmd_truth_store.c
@@ -299,6 +299,7 @@ truth_store_cleanup (void *cls,
 
   GNUNET_free_non_null ((void *) tss->payment_order_id);
   GNUNET_free (tss);
+  json_decref (tss->truth_data);
 }
 
 
diff --git a/src/lib/vgcore.382850 b/src/lib/vgcore.382850
new file mode 100644
index 0000000..d5bbb9c
Binary files /dev/null and b/src/lib/vgcore.382850 differ
diff --git a/src/lib/vgcore.383219 b/src/lib/vgcore.383219
new file mode 100644
index 0000000..0ee95a8
Binary files /dev/null and b/src/lib/vgcore.383219 differ
diff --git a/src/lib/vgcore.383659 b/src/lib/vgcore.383659
new file mode 100644
index 0000000..89fc1eb
Binary files /dev/null and b/src/lib/vgcore.383659 differ
diff --git a/src/util/anastasis_crypto.c b/src/util/anastasis_crypto.c
index fade009..6d22103 100644
--- a/src/util/anastasis_crypto.c
+++ b/src/util/anastasis_crypto.c
@@ -244,7 +244,7 @@ anastasis_decrypt (const void *key,
 void
 ANASTASIS_CRYPTO_user_identifier_derive (
   const json_t *id_data,
-  const struct ANASTASIS_CRYPTO_Salt server_salt,
+  const struct ANASTASIS_CRYPTO_Salt *server_salt,
   struct ANASTASIS_CRYPTO_UserIdentifier *id)
 {
   char *json_enc;
@@ -254,8 +254,8 @@ ANASTASIS_CRYPTO_user_identifier_derive (
                                   strlen (json_enc),
                                   GCRY_KDF_SCRYPT,
                                   1, // subalgo
-                                  server_salt.salt,
-                                  strlen (server_salt.salt),
+                                  server_salt->salt,
+                                  strlen (server_salt->salt),
                                   1000, // iterations
                                   sizeof (struct
                                           ANASTASIS_CRYPTO_UserIdentifier),
diff --git a/src/util/test_anastasis_crypto.c b/src/util/test_anastasis_crypto.c
index ac17f9e..2c7f65c 100644
--- a/src/util/test_anastasis_crypto.c
+++ b/src/util/test_anastasis_crypto.c
@@ -56,13 +56,13 @@ test_user_identifier_derive (void)
   json_object_set_new (id_data_3, "arg1", json_string ("Hallo2"));
 
   ANASTASIS_CRYPTO_user_identifier_derive (id_data_1,
-                                           salt,
+                                           &salt,
                                            &id_1);
   ANASTASIS_CRYPTO_user_identifier_derive (id_data_2,
-                                           salt,
+                                           &salt,
                                            &id_2);
   ANASTASIS_CRYPTO_user_identifier_derive (id_data_3,
-                                           salt,
+                                           &salt,
                                            &id_3);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "UserIdentifier_1: %s\n",
@@ -99,7 +99,7 @@ test_recovery_document (void)
 
   json_object_set_new (id_data, "arg1", json_string ("ID_DATA"));
   ANASTASIS_CRYPTO_user_identifier_derive (id_data,
-                                           salt,
+                                           &salt,
                                            &id);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -291,7 +291,7 @@ test_public_key_derive ()
 
   json_object_set_new (id_data, "arg1", json_string ("ID_DATA"));
   ANASTASIS_CRYPTO_user_identifier_derive (id_data,
-                                           server_salt,
+                                           &server_salt,
                                            &id);
 
   ANASTASIS_CRYPTO_account_public_key_derive (&id,
diff --git a/src/util/vgcore.380224 b/src/util/vgcore.380224
new file mode 100644
index 0000000..233334c
Binary files /dev/null and b/src/util/vgcore.380224 differ
diff --git a/src/util/vgcore.381169 b/src/util/vgcore.381169
new file mode 100644
index 0000000..c64f830
Binary files /dev/null and b/src/util/vgcore.381169 differ

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