[taler-anastasis] 02/02: merge

[gnunet]

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

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

commit a1e290cc95c6a9810f27e7302e3c20ad8faa8397
Merge: 5ab9ede da080ef
Author: Dennis Neufeld <address@hidden>
AuthorDate: Sun Mar 29 16:21:37 2020 +0000

    merge

 src/util/anastasis_crypto.c      | 35 ++++++++++++++++++++++++-----------
 src/util/test_anastasis_crypto.c | 13 +++++++++----
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --cc src/util/anastasis_crypto.c
index 94c6612,aed3038..59a3861
--- a/src/util/anastasis_crypto.c
+++ b/src/util/anastasis_crypto.c
@@@ -206,21 -209,20 +209,23 @@@ ANASTASIS_CRYPTO_user_identifier_deriv
    const json_t *id_data,
    struct ANASTASIS_CRYPTO_UserIdentifier *id)
  {
 +  char *json_enc;
 +  json_enc = json_dumps (id_data, 0);
-   GNUNET_assert (0 == gcry_kdf_derive (json_enc,
-                                        strlen (json_enc),
-                                        GCRY_KDF_SCRYPT,
-                                        1, // subalgo
-                                        "SERVER_SALT", // FIXME: Set real salt 
value!!!
-                                        strlen ("SERVER_SALT"),
-                                        1000, // iterations
-                                        sizeof (struct
-                                                
ANASTASIS_CRYPTO_UserIdentifier),
-                                        id));
+   GNUNET_assert (0 ==
 -                 gcry_kdf_derive (id_data,
 -                                  sizeof (*id_data),
++                 gcry_kdf_derive (json_enc,
++                                  strlen (json_enc),
+                                   GCRY_KDF_SCRYPT,
+                                   1, // subalgo
+                                   "SERVER_SALT", // FIXME: Set real salt 
value!!!
+                                   strlen ("SERVER_SALT"),
+                                   1000, // iterations
+                                   sizeof (struct
+                                           ANASTASIS_CRYPTO_UserIdentifier),
+                                   id));
 +  GNUNET_free (json_enc);
  }
  
+ 
  /**
   * Generates the eddsa public Key used as the account identifier on the 
providers
   * @param id holds a hashed user secret which is used as entropy source for 
the public key generation

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