[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis] branch master updated: truth payment step needed
|
From: |
gnunet |
|
Subject: |
[taler-anastasis] branch master updated: truth payment step needed |
|
Date: |
Wed, 17 Mar 2021 20:55:35 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository anastasis.
The following commit(s) were added to refs/heads/master by this push:
new d4eb716 truth payment step needed
d4eb716 is described below
commit d4eb71681dfada038b3d4ecf084eae5a271faf36
Author: Christian Grothoff <grothoff@gnunet.org>
AuthorDate: Wed Mar 17 20:55:31 2021 +0100
truth payment step needed
---
src/backend/anastasis-httpd.c | 2 +-
src/backend/anastasis-httpd.h | 2 +-
src/cli/test_anastasis_reducer_enter_secret.sh | 32 ++++++++++++++++++++--
src/include/anastasis.h | 11 +++++---
src/include/anastasis_crypto_lib.h | 37 +++++++++++---------------
src/include/anastasis_service.h | 2 +-
src/include/anastasis_testing_lib.h | 6 +++--
src/lib/anastasis_backup.c | 26 +++++++++---------
src/lib/anastasis_recovery.c | 9 ++++---
src/reducer/anastasis_api_backup_redux.c | 20 +++++++-------
src/reducer/anastasis_api_recovery_redux.c | 2 +-
src/reducer/anastasis_api_redux.c | 2 +-
src/testing/testing_api_cmd_config.c | 2 +-
src/testing/testing_api_trait_salt.c | 6 ++---
src/util/anastasis_crypto.c | 4 +--
src/util/test_anastasis_crypto.c | 10 +++----
16 files changed, 102 insertions(+), 71 deletions(-)
diff --git a/src/backend/anastasis-httpd.c b/src/backend/anastasis-httpd.c
index eca67a9..531de76 100644
--- a/src/backend/anastasis-httpd.c
+++ b/src/backend/anastasis-httpd.c
@@ -94,7 +94,7 @@ struct GNUNET_TIME_Relative AH_truth_expiration;
/**
* Our server salt.
*/
-struct ANASTASIS_CRYPTO_PowSalt AH_server_salt;
+struct ANASTASIS_CRYPTO_ProviderSaltP AH_server_salt;
/**
* Our context for making HTTP requests.
diff --git a/src/backend/anastasis-httpd.h b/src/backend/anastasis-httpd.h
index 58c57fe..6df9b56 100644
--- a/src/backend/anastasis-httpd.h
+++ b/src/backend/anastasis-httpd.h
@@ -190,7 +190,7 @@ extern struct GNUNET_TIME_Relative AH_truth_expiration;
/**
* Our server salt.
*/
-extern struct ANASTASIS_CRYPTO_PowSalt AH_server_salt;
+extern struct ANASTASIS_CRYPTO_ProviderSaltP AH_server_salt;
/**
* Our context for making HTTP requests.
diff --git a/src/cli/test_anastasis_reducer_enter_secret.sh
b/src/cli/test_anastasis_reducer_enter_secret.sh
index 6b31849..da5ac68 100755
--- a/src/cli/test_anastasis_reducer_enter_secret.sh
+++ b/src/cli/test_anastasis_reducer_enter_secret.sh
@@ -276,9 +276,9 @@ $PREFIX anastasis-reducer -a \
enter_secret resources/06-backup.json $TFILE
STATE=`jq -r -e .backup_state < $TFILE`
-if test "$STATE" != "POLICIES_PAYING"
+if test "$STATE" != "TRUTHS_PAYING"
then
- exit_fail "Expected new state to be 'POLICIES_PAYING', got '$STATE'"
+ exit_fail "Expected new state to be 'TRUTHS_PAYING', got '$STATE'"
fi
TMETHOD=`jq -r -e '.policies[0].methods[0].truth.type' < $TFILE`
@@ -310,6 +310,34 @@ taler-wallet-cli --wallet-db=$WALLET_DB run-until-done
2>/dev/null >/dev/null
echo " OK"
+echo -en $COLOR$BOLD"Making payments for truth uploads ... "$NORM$NOCOLOR
+OBJECT_SIZE=`jq -r -e '.payments | length' < $TFILE`
+for ((INDEX=0; INDEX < $OBJECT_SIZE; INDEX++))
+do
+ PAY_URI=`jq --argjson INDEX $INDEX -r -e '.payments[$INDEX]' < $TFILE`
+ # run wallet CLI
+ echo -n "$INDEX"
+ taler-wallet-cli --wallet-db=$WALLET_DB handle-uri $PAY_URI -y 2>/dev/null
>/dev/null
+ echo -n ","
+done
+echo " OK"
+echo -e $COLOR$BOLD"Running wallet run-pending..."$NORM$NOCOLOR
+taler-wallet-cli --wallet-db=$WALLET_DB run-pending 2>/dev/null >/dev/null
+echo -e $COLOR$BOLD"Payments done"$NORM$NOCOLOR
+
+echo -en $COLOR$BOLD"Try to upload again ..."$NORM$NOCOLOR
+$PREFIX anastasis-reducer pay $TFILE $UFILE
+mv $UFILE $TFILE
+echo " OK"
+
+
+STATE=`jq -r -e .backup_state < $TFILE`
+if test "$STATE" != "POLICIES_PAYING"
+then
+ exit_fail "Expected new state to be 'POLICIES_PAYING', got '$STATE'"
+fi
+
+
echo -en $COLOR$BOLD"Making payments for policy uploads ... "$NORM$NOCOLOR
OBJECT_SIZE=`jq -r -e '.policy_payment_requests | length' < $TFILE`
for ((INDEX=0; INDEX < $OBJECT_SIZE; INDEX++))
diff --git a/src/include/anastasis.h b/src/include/anastasis.h
index ca277d8..633c995 100644
--- a/src/include/anastasis.h
+++ b/src/include/anastasis.h
@@ -462,7 +462,8 @@ ANASTASIS_recovery_begin (struct GNUNET_CURL_Context *ctx,
const json_t *id_data,
unsigned int version,
const char *anastasis_provider_url,
- const struct ANASTASIS_CRYPTO_PowSalt *provider_salt,
+ const struct
+ ANASTASIS_CRYPTO_ProviderSaltP *provider_salt,
ANASTASIS_PolicyCallback pc,
void *pc_cls,
ANASTASIS_CoreSecretCallback csc,
@@ -595,7 +596,8 @@ ANASTASIS_truth_upload (struct GNUNET_CURL_Context *ctx,
const char *type,
const char *instructions,
const char *mime_type,
- const struct ANASTASIS_CRYPTO_PowSalt *provider_salt,
+ const struct
+ ANASTASIS_CRYPTO_ProviderSaltP *provider_salt,
const void *truth_data,
size_t truth_data_size,
bool payment_requested,
@@ -635,14 +637,15 @@ ANASTASIS_truth_upload2 (struct GNUNET_CURL_Context *ctx,
const char *type,
const char *instructions,
const char *mime_type,
- const struct ANASTASIS_CRYPTO_PowSalt *provider_salt,
+ const struct
+ ANASTASIS_CRYPTO_ProviderSaltP *provider_salt,
const void *truth_data,
size_t truth_data_size,
bool payment_requested,
const struct ANASTASIS_PaymentSecretP *paid_order_id,
struct GNUNET_TIME_Relative pay_timeout,
const struct ANASTASIS_CRYPTO_TruthUUIDP *uuid,
- const struct ANASTASIS_CRYPTO_PowSalt *salt,
+ const struct ANASTASIS_CRYPTO_QuestionSaltP *salt,
const struct ANASTASIS_CRYPTO_TruthKeyP *truth_key,
const struct ANASTASIS_CRYPTO_KeyShareP *key_share,
ANASTASIS_TruthCallback tc,
diff --git a/src/include/anastasis_crypto_lib.h
b/src/include/anastasis_crypto_lib.h
index 67f0e70..96f77c1 100644
--- a/src/include/anastasis_crypto_lib.h
+++ b/src/include/anastasis_crypto_lib.h
@@ -89,23 +89,29 @@ struct ANASTASIS_CRYPTO_TruthKeyP
};
-// FIXME: split type, we have LOTS of salt values (provider, truth, policy)
-// and should have a different type for each to avoid confusions!
/**
- * Specifies a Salt value as a hash.
+ * Specifies a salt value used to encrypt the master public key.
*/
-struct ANASTASIS_CRYPTO_SaltP
+struct ANASTASIS_CRYPTO_MasterSaltP
{
struct GNUNET_HashCode salt GNUNET_PACKED;
};
-// FIXME: split type, we have LOTS of salt values (provider, truth, policy)
-// and should have a different type for each to avoid confusions!
/**
- * Specifies a Salt value of size 16 Byte for GNUNET_CRYPTO_pow_hash.
+ * Specifies a salt value used for salting the answer to a security question.
*/
-struct ANASTASIS_CRYPTO_PowSalt
+struct ANASTASIS_CRYPTO_QuestionSaltP
+{
+ struct GNUNET_ShortHashCode salt GNUNET_PACKED;
+};
+
+
+/**
+ * Specifies a salt value provided by an Anastasis provider,
+ * used for deriving the provider-specific user ID.
+ */
+struct ANASTASIS_CRYPTO_ProviderSaltP
{
struct GNUNET_CRYPTO_PowSalt salt;
};
@@ -255,17 +261,6 @@ struct ANASTASIS_AccountSignatureP
struct GNUNET_CRYPTO_EddsaSignature eddsa_sig;
};
-/**
- * Salt value of an Anastasis service provider.
- */
-struct ANASTASIS_Salt
-{
- /**
- * Salt is specified as 32 byte (256 bit).
- */
- char value[256];
-};
-
GNUNET_NETWORK_STRUCT_END
@@ -295,7 +290,7 @@ ANASTASIS_hash_answer (uint64_t code,
void
ANASTASIS_CRYPTO_user_identifier_derive (
const json_t *id_data,
- const struct ANASTASIS_CRYPTO_PowSalt *server_salt,
+ const struct ANASTASIS_CRYPTO_ProviderSaltP *server_salt,
struct ANASTASIS_CRYPTO_UserIdentifierP *id);
@@ -459,7 +454,7 @@ void
ANASTASIS_CRYPTO_policy_key_derive (
const struct ANASTASIS_CRYPTO_KeyShareP *key_shares,
unsigned int keyshare_length,
- const struct ANASTASIS_CRYPTO_SaltP *salt,
+ const struct ANASTASIS_CRYPTO_MasterSaltP *salt,
struct ANASTASIS_CRYPTO_PolicyKeyP *policy_key);
diff --git a/src/include/anastasis_service.h b/src/include/anastasis_service.h
index 15f5d19..0c1d592 100644
--- a/src/include/anastasis_service.h
+++ b/src/include/anastasis_service.h
@@ -106,7 +106,7 @@ struct ANASTASIS_Config
/**
* Server salt.
*/
- struct ANASTASIS_CRYPTO_PowSalt salt;
+ struct ANASTASIS_CRYPTO_ProviderSaltP salt;
};
diff --git a/src/include/anastasis_testing_lib.h
b/src/include/anastasis_testing_lib.h
index c82e610..bbf8d55 100644
--- a/src/include/anastasis_testing_lib.h
+++ b/src/include/anastasis_testing_lib.h
@@ -507,7 +507,8 @@ ANASTASIS_TESTING_cmd_keyshare_lookup (
int
ANASTASIS_TESTING_get_trait_salt (const struct TALER_TESTING_Command *cmd,
unsigned int index,
- const struct ANASTASIS_CRYPTO_PowSalt **s);
+ const struct
+ ANASTASIS_CRYPTO_ProviderSaltP **s);
/**
@@ -519,7 +520,8 @@ ANASTASIS_TESTING_get_trait_salt (const struct
TALER_TESTING_Command *cmd,
*/
struct TALER_TESTING_Trait
ANASTASIS_TESTING_make_trait_salt (unsigned int index,
- const struct ANASTASIS_CRYPTO_PowSalt *s);
+ const struct
+ ANASTASIS_CRYPTO_ProviderSaltP *s);
/**
diff --git a/src/lib/anastasis_backup.c b/src/lib/anastasis_backup.c
index 10ccd2e..85d6cd3 100644
--- a/src/lib/anastasis_backup.c
+++ b/src/lib/anastasis_backup.c
@@ -45,12 +45,12 @@ struct ANASTASIS_Truth
/**
* Server salt used to derive user identifier
*/
- struct ANASTASIS_CRYPTO_PowSalt provider_salt;
+ struct ANASTASIS_CRYPTO_ProviderSaltP provider_salt;
/**
* Server salt used to derive hash from security answer
*/
- struct ANASTASIS_CRYPTO_PowSalt salt;
+ struct ANASTASIS_CRYPTO_QuestionSaltP salt;
/**
* Url of the server
@@ -332,14 +332,15 @@ ANASTASIS_truth_upload2 (struct GNUNET_CURL_Context *ctx,
const char *type,
const char *instructions,
const char *mime_type,
- const struct ANASTASIS_CRYPTO_PowSalt *provider_salt,
+ const struct
+ ANASTASIS_CRYPTO_ProviderSaltP *provider_salt,
const void *truth_data,
size_t truth_data_size,
bool payment_requested,
const struct ANASTASIS_PaymentSecretP *paid_order_id,
struct GNUNET_TIME_Relative pay_timeout,
const struct ANASTASIS_CRYPTO_TruthUUIDP *uuid,
- const struct ANASTASIS_CRYPTO_PowSalt *salt,
+ const struct ANASTASIS_CRYPTO_QuestionSaltP *salt,
const struct ANASTASIS_CRYPTO_TruthKeyP *truth_key,
const struct ANASTASIS_CRYPTO_KeyShareP *key_share,
ANASTASIS_TruthCallback tc,
@@ -381,7 +382,8 @@ ANASTASIS_truth_upload (struct GNUNET_CURL_Context *ctx,
const char *type,
const char *instructions,
const char *mime_type,
- const struct ANASTASIS_CRYPTO_PowSalt *provider_salt,
+ const struct
+ ANASTASIS_CRYPTO_ProviderSaltP *provider_salt,
const void *truth_data,
size_t truth_data_size,
bool payment_requested,
@@ -390,14 +392,14 @@ ANASTASIS_truth_upload (struct GNUNET_CURL_Context *ctx,
ANASTASIS_TruthCallback tc,
void *tc_cls)
{
- struct ANASTASIS_CRYPTO_PowSalt salt;
+ struct ANASTASIS_CRYPTO_QuestionSaltP question_salt;
struct ANASTASIS_CRYPTO_TruthUUIDP uuid;
struct ANASTASIS_CRYPTO_TruthKeyP truth_key;
struct ANASTASIS_CRYPTO_KeyShareP key_share;
GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_NONCE,
- &salt,
- sizeof (salt));
+ &question_salt,
+ sizeof (question_salt));
GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_NONCE,
&uuid,
sizeof (uuid));
@@ -418,7 +420,7 @@ ANASTASIS_truth_upload (struct GNUNET_CURL_Context *ctx,
paid_order_id,
pay_timeout,
&uuid,
- &salt,
+ &question_salt,
&truth_key,
&key_share,
tc,
@@ -464,7 +466,7 @@ struct ANASTASIS_Policy
/**
* Salt used to encrypt the master key
*/
- struct ANASTASIS_CRYPTO_SaltP salt;
+ struct ANASTASIS_CRYPTO_MasterSaltP salt;
/**
* Array of truths
@@ -509,7 +511,7 @@ ANASTASIS_policy_create (const struct ANASTASIS_Truth
*truths[],
p = GNUNET_new (struct ANASTASIS_Policy);
GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_NONCE,
&p->salt,
- sizeof (struct ANASTASIS_CRYPTO_SaltP));
+ sizeof (p->salt));
{
struct ANASTASIS_CRYPTO_KeyShareP key_shares[truths_len];
@@ -563,7 +565,7 @@ struct PolicyStoreState
* Server salt. Points into a truth object from which we
* got the salt.
*/
- const struct ANASTASIS_CRYPTO_PowSalt *server_salt;
+ const struct ANASTASIS_CRYPTO_ProviderSaltP *server_salt;
/**
* The /policy POST operation handle.
diff --git a/src/lib/anastasis_recovery.c b/src/lib/anastasis_recovery.c
index 87b2153..3d0b34a 100644
--- a/src/lib/anastasis_recovery.c
+++ b/src/lib/anastasis_recovery.c
@@ -47,13 +47,13 @@ struct ANASTASIS_Challenge
/**
* Salt; used to derive hash from security question answers.
*/
- struct ANASTASIS_CRYPTO_PowSalt salt;
+ struct ANASTASIS_CRYPTO_QuestionSaltP salt;
/**
* Provider salt; used to derive our key material from our identity
* key.
*/
- struct ANASTASIS_CRYPTO_PowSalt provider_salt;
+ struct ANASTASIS_CRYPTO_ProviderSaltP provider_salt;
/**
* Decrypted key share for this challenge. Set once the
@@ -125,7 +125,7 @@ struct DecryptionPolicy
/**
* Salt used to decrypt master key.
*/
- struct ANASTASIS_CRYPTO_SaltP salt;
+ struct ANASTASIS_CRYPTO_MasterSaltP salt;
};
@@ -855,7 +855,8 @@ ANASTASIS_recovery_begin (struct GNUNET_CURL_Context *ctx,
const json_t *id_data,
unsigned int version,
const char *anastasis_provider_url,
- const struct ANASTASIS_CRYPTO_PowSalt *provider_salt,
+ const struct
+ ANASTASIS_CRYPTO_ProviderSaltP *provider_salt,
ANASTASIS_PolicyCallback pc,
void *pc_cls,
ANASTASIS_CoreSecretCallback csc,
diff --git a/src/reducer/anastasis_api_backup_redux.c
b/src/reducer/anastasis_api_backup_redux.c
index dd31284..5a1df71 100644
--- a/src/reducer/anastasis_api_backup_redux.c
+++ b/src/reducer/anastasis_api_backup_redux.c
@@ -1838,7 +1838,7 @@ check_upload_finished (struct UploadContext *uc)
static int
lookup_salt (const json_t *state,
const char *provider_url,
- struct ANASTASIS_CRYPTO_PowSalt *salt)
+ struct ANASTASIS_CRYPTO_ProviderSaltP *salt)
{
const json_t *aps;
const json_t *cfg;
@@ -2011,7 +2011,7 @@ add_truth_object (struct UploadContext *uc,
if ( (NULL == tue->tu) &&
(must_upload) )
{
- struct ANASTASIS_CRYPTO_PowSalt salt;
+ struct ANASTASIS_CRYPTO_ProviderSaltP salt;
struct ANASTASIS_CRYPTO_UserIdentifierP id;
bool force_payment = false;
void *truth_data;
@@ -2189,7 +2189,7 @@ check_truth_upload (struct UploadContext *uc,
&truth_data_size),
GNUNET_JSON_spec_end ()
};
- struct ANASTASIS_CRYPTO_PowSalt salt;
+ struct ANASTASIS_CRYPTO_ProviderSaltP provider_salt;
struct ANASTASIS_CRYPTO_UserIdentifierP id;
if (GNUNET_OK !=
@@ -2216,7 +2216,7 @@ check_truth_upload (struct UploadContext *uc,
if (GNUNET_OK !=
lookup_salt (uc->state,
provider_url,
- &salt))
+ &provider_salt))
{
GNUNET_break (0);
GNUNET_JSON_parse_free (spec);
@@ -2224,16 +2224,16 @@ check_truth_upload (struct UploadContext *uc,
return GNUNET_SYSERR;
}
ANASTASIS_CRYPTO_user_identifier_derive (user_id,
- &salt,
+ &provider_salt,
&id);
{
struct ANASTASIS_CRYPTO_TruthUUIDP uuid;
- struct ANASTASIS_CRYPTO_PowSalt salt;
+ struct ANASTASIS_CRYPTO_QuestionSaltP question_salt;
struct ANASTASIS_CRYPTO_TruthKeyP truth_key;
struct ANASTASIS_CRYPTO_KeyShareP key_share;
struct GNUNET_JSON_Specification jspec[] = {
GNUNET_JSON_spec_fixed_auto ("salt",
- &salt),
+ &question_salt),
GNUNET_JSON_spec_fixed_auto ("truth_key",
&truth_key),
GNUNET_JSON_spec_fixed_auto ("uuid",
@@ -2254,7 +2254,7 @@ check_truth_upload (struct UploadContext *uc,
type,
instructions,
mime_type,
- &salt,
+ &provider_salt,
truth_data,
truth_data_size,
force_payment,
@@ -2273,7 +2273,7 @@ check_truth_upload (struct UploadContext *uc,
type,
instructions,
mime_type,
- &salt,
+ &provider_salt,
truth_data,
truth_data_size,
force_payment,
@@ -2282,7 +2282,7 @@ check_truth_upload (struct UploadContext *uc,
: NULL,
uc->timeout,
&uuid,
- &salt,
+ &question_salt,
&truth_key,
&key_share,
&truth_upload_cb,
diff --git a/src/reducer/anastasis_api_recovery_redux.c
b/src/reducer/anastasis_api_recovery_redux.c
index 1757c43..71f1c7c 100644
--- a/src/reducer/anastasis_api_recovery_redux.c
+++ b/src/reducer/anastasis_api_recovery_redux.c
@@ -1399,7 +1399,7 @@ struct PolicyDownloadEntry
/**
* Salt to be used to derive the id for this provider
*/
- struct ANASTASIS_CRYPTO_PowSalt salt;
+ struct ANASTASIS_CRYPTO_ProviderSaltP salt;
/**
* Context we operate in.
diff --git a/src/reducer/anastasis_api_redux.c
b/src/reducer/anastasis_api_redux.c
index 8a2df70..f55d444 100644
--- a/src/reducer/anastasis_api_redux.c
+++ b/src/reducer/anastasis_api_redux.c
@@ -196,7 +196,7 @@ struct ConfigRequest
/**
* Server salt.
*/
- struct ANASTASIS_CRYPTO_PowSalt salt;
+ struct ANASTASIS_CRYPTO_ProviderSaltP salt;
/**
* Task to timeout /config requests.
diff --git a/src/testing/testing_api_cmd_config.c
b/src/testing/testing_api_cmd_config.c
index 97e2396..8906261 100644
--- a/src/testing/testing_api_cmd_config.c
+++ b/src/testing/testing_api_cmd_config.c
@@ -54,7 +54,7 @@ struct ConfigState
/**
* The salt value from server.
*/
- struct ANASTASIS_CRYPTO_PowSalt salt;
+ struct ANASTASIS_CRYPTO_ProviderSaltP salt;
};
diff --git a/src/testing/testing_api_trait_salt.c
b/src/testing/testing_api_trait_salt.c
index f79f006..116742f 100644
--- a/src/testing/testing_api_trait_salt.c
+++ b/src/testing/testing_api_trait_salt.c
@@ -26,7 +26,7 @@
#include "platform.h"
#include "anastasis_testing_lib.h"
-#define ANASTASIS_TESTING_TRAIT_SALT "anastasis-salt"
+#define ANASTASIS_TESTING_TRAIT_SALT "anastasis-provider-salt"
/**
@@ -41,7 +41,7 @@ int
ANASTASIS_TESTING_get_trait_salt
(const struct TALER_TESTING_Command *cmd,
unsigned int index,
- const struct ANASTASIS_CRYPTO_PowSalt **s)
+ const struct ANASTASIS_CRYPTO_ProviderSaltP **s)
{
return cmd->traits (cmd->cls,
(const void **) s,
@@ -60,7 +60,7 @@ ANASTASIS_TESTING_get_trait_salt
struct TALER_TESTING_Trait
ANASTASIS_TESTING_make_trait_salt
(unsigned int index,
- const struct ANASTASIS_CRYPTO_PowSalt *s)
+ const struct ANASTASIS_CRYPTO_ProviderSaltP *s)
{
struct TALER_TESTING_Trait ret = {
.index = index,
diff --git a/src/util/anastasis_crypto.c b/src/util/anastasis_crypto.c
index 354f629..0bb0e63 100644
--- a/src/util/anastasis_crypto.c
+++ b/src/util/anastasis_crypto.c
@@ -274,7 +274,7 @@ anastasis_decrypt (const void *key,
void
ANASTASIS_CRYPTO_user_identifier_derive (
const json_t *id_data,
- const struct ANASTASIS_CRYPTO_PowSalt *server_salt,
+ const struct ANASTASIS_CRYPTO_ProviderSaltP *server_salt,
struct ANASTASIS_CRYPTO_UserIdentifierP *id)
{
char *json_enc;
@@ -483,7 +483,7 @@ void
ANASTASIS_CRYPTO_policy_key_derive (
const struct ANASTASIS_CRYPTO_KeyShareP *key_shares,
unsigned int keyshare_length,
- const struct ANASTASIS_CRYPTO_SaltP *salt,
+ const struct ANASTASIS_CRYPTO_MasterSaltP *salt,
struct ANASTASIS_CRYPTO_PolicyKeyP *policy_key)
{
GNUNET_CRYPTO_hkdf (policy_key,
diff --git a/src/util/test_anastasis_crypto.c b/src/util/test_anastasis_crypto.c
index a211134..d3a4ea7 100644
--- a/src/util/test_anastasis_crypto.c
+++ b/src/util/test_anastasis_crypto.c
@@ -41,7 +41,7 @@ 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_PowSalt server_salt;
+ struct ANASTASIS_CRYPTO_ProviderSaltP server_salt;
char *salt_str = "Server-Salt-Test";
@@ -97,7 +97,7 @@ test_recovery_document (void)
void *plaintext;
size_t size_plaintext;
struct ANASTASIS_CRYPTO_UserIdentifierP id;
- struct ANASTASIS_CRYPTO_PowSalt server_salt;
+ struct ANASTASIS_CRYPTO_ProviderSaltP server_salt;
int ret;
json_t *id_data = json_object ();
@@ -212,13 +212,13 @@ test_core_secret (void)
const char *test_wrong = "TEST_CORE_WRONG";
void *enc_core_secret;
unsigned int policy_keys_length = 5;
- struct ANASTASIS_CRYPTO_SaltP salt;
+ struct ANASTASIS_CRYPTO_MasterSaltP salt;
struct ANASTASIS_CRYPTO_EncryptedMasterKeyP
encrypted_master_keys[policy_keys_length];
GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
&salt,
- sizeof (struct ANASTASIS_CRYPTO_SaltP));
+ sizeof (salt));
// construction of PolicyKey-array
struct ANASTASIS_CRYPTO_PolicyKeyP policy_keys[policy_keys_length];
@@ -295,7 +295,7 @@ test_public_key_derive (void)
{
struct ANASTASIS_CRYPTO_UserIdentifierP id;
struct ANASTASIS_CRYPTO_AccountPublicKeyP pub_key;
- struct ANASTASIS_CRYPTO_PowSalt server_salt;
+ struct ANASTASIS_CRYPTO_ProviderSaltP server_salt;
json_t *id_data = json_object ();
const char *salt_str = "Server-Salt-Test";
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-anastasis] branch master updated: truth payment step needed,
gnunet <=