[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis] 03/06: fixed error with GNUNET_CRYPTO_pow_hash
From: |
gnunet |
Subject: |
[taler-anastasis] 03/06: fixed error with GNUNET_CRYPTO_pow_hash |
Date: |
Wed, 19 Aug 2020 12:32:24 +0200 |
This is an automated email from the git hooks/post-receive script.
dennis-neufeld pushed a commit to branch master
in repository anastasis.
commit 2ee1034699a8040164ad38b34c927b88f162cee3
Author: Dennis Neufeld <dennis.neufeld@students.bfh.ch>
AuthorDate: Sun Aug 16 17:41:35 2020 +0000
fixed error with GNUNET_CRYPTO_pow_hash
---
src/util/anastasis_crypto.c | 14 +++++++++-----
src/util/test_anastasis_crypto.c | 12 ++++++------
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/util/anastasis_crypto.c b/src/util/anastasis_crypto.c
index 69a464d..68d21e0 100644
--- a/src/util/anastasis_crypto.c
+++ b/src/util/anastasis_crypto.c
@@ -323,10 +323,14 @@ ANASTASIS_CRYPTO_user_identifier_derive (
struct ANASTASIS_CRYPTO_UserIdentifierP *id)
{
char *json_enc;
- char *salt_str;
-
- salt_str = GNUNET_STRINGS_data_to_string_alloc (server_salt,
- sizeof (*server_salt));
+ char *salt_str_buf;
+ char salt_str[16];
+
+ salt_str_buf = GNUNET_STRINGS_data_to_string_alloc (server_salt,
+ sizeof (*server_salt));
+ // GNUNET_CRYPTO_pow_hash needs a salt value of exactly 16 Bytes
+ strncpy (salt_str,salt_str_buf, 16);
+ salt_str[16] = '\0';
json_enc = json_dumps (id_data,
JSON_COMPACT | JSON_SORT_KEYS);
GNUNET_assert (NULL != json_enc);
@@ -336,7 +340,7 @@ ANASTASIS_CRYPTO_user_identifier_derive (
&id->hash);
free (json_enc);
- GNUNET_free (salt_str);
+ GNUNET_free (salt_str_buf);
}
diff --git a/src/util/test_anastasis_crypto.c b/src/util/test_anastasis_crypto.c
index 9171119..7abd455 100644
--- a/src/util/test_anastasis_crypto.c
+++ b/src/util/test_anastasis_crypto.c
@@ -96,19 +96,18 @@ test_recovery_document (void)
void *plaintext;
size_t size_plaintext;
struct ANASTASIS_CRYPTO_UserIdentifierP id;
- struct ANASTASIS_CRYPTO_SaltP salt;
int ret;
-
+ struct ANASTASIS_CRYPTO_SaltP *salt = GNUNET_new (struct
+ ANASTASIS_CRYPTO_SaltP);
json_t *id_data = json_object ();
const char *test = "TEST_ERD";
- GNUNET_CRYPTO_hash_from_string2 ("Server Salt",
- strlen ("Server Salt"),
- &salt.salt);
+ GNUNET_CRYPTO_hash_from_string ("Server Salt",
+ &salt->salt);
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,
@@ -132,6 +131,7 @@ test_recovery_document (void)
GNUNET_assert (strlen (test) == size_plaintext);
ret = strncmp (plaintext, test, strlen (test));
json_decref (id_data);
+ GNUNET_free (salt);
GNUNET_free (ciphertext);
GNUNET_free (plaintext);
return ret;
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-anastasis] branch master updated (a735150 -> 8b5083a), gnunet, 2020/08/19
- [taler-anastasis] 01/06: worked on dependency-fix, gnunet, 2020/08/19
- [taler-anastasis] 02/06: fixed Anastasis to build, testing fails, gnunet, 2020/08/19
- [taler-anastasis] 03/06: fixed error with GNUNET_CRYPTO_pow_hash,
gnunet <=
- [taler-anastasis] 06/06: fix api test, gnunet, 2020/08/19
- [taler-anastasis] 05/06: fixed salt issue with GNUNET_CRYPTO_pow_hash, gnunet, 2020/08/19
- [taler-anastasis] 04/06: fixed some dependencies in testing, gnunet, 2020/08/19