[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis] 01/02: fixed PowSalt
From: |
gnunet |
Subject: |
[taler-anastasis] 01/02: fixed PowSalt |
Date: |
Wed, 19 Aug 2020 20:25:25 +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 faa944dc396ebc13510649c8b434e78e54a9f0a9
Author: Dennis Neufeld <dennis.neufeld@students.bfh.ch>
AuthorDate: Wed Aug 19 10:59:12 2020 +0000
fixed PowSalt
---
src/backend/anastasis-httpd_salt.c | 9 +++++----
src/include/anastasis_crypto_lib.h | 2 +-
src/util/anastasis_crypto.c | 2 +-
src/util/test_anastasis_crypto.c | 27 ++++++++++++++++++++-------
4 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/src/backend/anastasis-httpd_salt.c
b/src/backend/anastasis-httpd_salt.c
index 34b2315..9a5fc12 100644
--- a/src/backend/anastasis-httpd_salt.c
+++ b/src/backend/anastasis-httpd_salt.c
@@ -38,11 +38,12 @@ AH_handler_salt (struct MHD_Connection *connection,
const char *url,
void **con_cls)
{
- struct ANASTASIS_CRYPTO_PowSaltP salt;
+ struct ANASTASIS_CRYPTO_PowSaltP *salt = GNUNET_new (struct
+
ANASTASIS_CRYPTO_PowSaltP);
- GNUNET_CRYPTO_hash (AH_server_salt,
- strlen (AH_server_salt),
- &salt.salt);
+ GNUNET_memcpy (salt,
+ AH_server_salt,
+ strlen (AH_server_salt));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"At %s:%d Server Salt is %s-%llu b\n", __FILE__, __LINE__,
diff --git a/src/include/anastasis_crypto_lib.h
b/src/include/anastasis_crypto_lib.h
index 23d18db..ce06399 100644
--- a/src/include/anastasis_crypto_lib.h
+++ b/src/include/anastasis_crypto_lib.h
@@ -82,7 +82,7 @@ struct ANASTASIS_CRYPTO_SaltP
*/
struct ANASTASIS_CRYPTO_PowSaltP
{
- uint8_t salt[16];
+ struct GNUNET_CRYPTO_PowSalt salt;
};
diff --git a/src/util/anastasis_crypto.c b/src/util/anastasis_crypto.c
index 78b95c8..6956072 100644
--- a/src/util/anastasis_crypto.c
+++ b/src/util/anastasis_crypto.c
@@ -327,7 +327,7 @@ ANASTASIS_CRYPTO_user_identifier_derive (
json_enc = json_dumps (id_data,
JSON_COMPACT | JSON_SORT_KEYS);
GNUNET_assert (NULL != json_enc);
- GNUNET_CRYPTO_pow_hash (server_salt,
+ GNUNET_CRYPTO_pow_hash (&server_salt->salt,
json_enc,
strlen (json_enc),
&id->hash);
diff --git a/src/util/test_anastasis_crypto.c b/src/util/test_anastasis_crypto.c
index 8797882..1ef1a29 100644
--- a/src/util/test_anastasis_crypto.c
+++ b/src/util/test_anastasis_crypto.c
@@ -41,7 +41,13 @@ test_user_identifier_derive (void)
struct ANASTASIS_CRYPTO_UserIdentifierP id_1;
struct ANASTASIS_CRYPTO_UserIdentifierP id_2;
struct ANASTASIS_CRYPTO_UserIdentifierP id_3;
+ struct ANASTASIS_CRYPTO_PowSaltP server_salt;
+
+ char *salt_str = "Server-Salt-Test";
+ GNUNET_memcpy (&server_salt,
+ salt_str,
+ strlen (salt_str));
// sample data 1
id_data_1 = json_object ();
json_object_set_new (id_data_1, "arg1", json_string ("Hallo"));
@@ -53,13 +59,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,
- "Server-Salt-Test",
+ &server_salt,
&id_1);
ANASTASIS_CRYPTO_user_identifier_derive (id_data_2,
- "Server-Salt-Test",
+ &server_salt,
&id_2);
ANASTASIS_CRYPTO_user_identifier_derive (id_data_3,
- "Server-Salt-Test",
+ &server_salt,
&id_3);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"UserIdentifier_1: %s\n",
@@ -91,13 +97,19 @@ test_recovery_document (void)
void *plaintext;
size_t size_plaintext;
struct ANASTASIS_CRYPTO_UserIdentifierP id;
+ struct ANASTASIS_CRYPTO_PowSaltP server_salt;
int ret;
json_t *id_data = json_object ();
const char *test = "TEST_ERD";
+ char *salt_str = "Server-Salt-Test";
+
+ GNUNET_memcpy (&server_salt,
+ salt_str,
+ strlen (salt_str));
json_object_set_new (id_data, "arg1", json_string ("ID_DATA"));
ANASTASIS_CRYPTO_user_identifier_derive (id_data,
- "Server-Salt-Test",
+ &server_salt,
&id);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -303,10 +315,11 @@ test_public_key_derive ()
struct ANASTASIS_CRYPTO_PowSaltP server_salt;
json_t *id_data = json_object ();
+ char *salt_str = "Server-Salt-Test";
- GNUNET_CRYPTO_hash ("Server Salt",
- strlen ("Server Salt"),
- &server_salt.salt);
+ GNUNET_memcpy (&server_salt,
+ salt_str,
+ strlen (salt_str));
json_object_set_new (id_data, "arg1", json_string ("ID_DATA"));
ANASTASIS_CRYPTO_user_identifier_derive (id_data,
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.