diff options
author | Christian Grothoff <christian@grothoff.org> | 2021-11-17 22:02:08 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2021-11-17 22:02:08 +0100 |
commit | 3ccacbd78bf720294363648a496b635abe072408 (patch) | |
tree | d03414707aebbaaffa7add6a7ca0ea02be1b6ca7 /src/testing | |
parent | 36e8be14334cd619d2847e3e8c1ecc136f402d71 (diff) | |
download | anastasis-3ccacbd78bf720294363648a496b635abe072408.tar.gz anastasis-3ccacbd78bf720294363648a496b635abe072408.tar.bz2 anastasis-3ccacbd78bf720294363648a496b635abe072408.zip |
make anastasis build against latest Exchange
Diffstat (limited to 'src/testing')
-rw-r--r-- | src/testing/Makefile.am | 16 | ||||
-rw-r--r-- | src/testing/testing_api_cmd_config.c | 4 | ||||
-rw-r--r-- | src/testing/testing_api_cmd_keyshare_lookup.c | 51 | ||||
-rw-r--r-- | src/testing/testing_api_cmd_policy_lookup.c | 2 | ||||
-rw-r--r-- | src/testing/testing_api_cmd_policy_store.c | 22 | ||||
-rw-r--r-- | src/testing/testing_api_cmd_truth_store.c | 24 | ||||
-rw-r--r-- | src/testing/testing_cmd_challenge_answer.c | 42 | ||||
-rw-r--r-- | src/testing/testing_cmd_policy_create.c | 11 | ||||
-rw-r--r-- | src/testing/testing_cmd_recover_secret.c | 16 | ||||
-rw-r--r-- | src/testing/testing_cmd_secret_share.c | 23 | ||||
-rw-r--r-- | src/testing/testing_cmd_truth_upload.c | 8 |
11 files changed, 86 insertions, 133 deletions
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am index 8fc710b..9a98530 100644 --- a/src/testing/Makefile.am +++ b/src/testing/Makefile.am @@ -19,24 +19,12 @@ libanastasistesting_la_SOURCES = \ testing_api_cmd_keyshare_lookup.c \ testing_api_cmd_config.c \ testing_api_helpers.c \ - testing_api_trait_account_pub.c \ - testing_api_trait_account_priv.c \ - testing_api_trait_eks.c \ - testing_api_trait_payment_secret.c \ - testing_api_trait_truth_key.c \ - testing_api_trait_truth_uuid.c \ - testing_api_trait_hash.c \ - testing_api_trait_salt.c \ - testing_api_trait_code.c \ + testing_api_traits.c \ testing_cmd_truth_upload.c \ testing_cmd_policy_create.c \ testing_cmd_secret_share.c \ testing_cmd_recover_secret.c \ - testing_cmd_challenge_answer.c \ - testing_trait_truth.c \ - testing_trait_policy.c \ - testing_trait_core_secret.c \ - testing_trait_challenge.c + testing_cmd_challenge_answer.c libanastasistesting_la_LIBADD = \ $(top_builddir)/src/restclient/libanastasisrest.la \ $(top_builddir)/src/lib/libanastasis.la \ diff --git a/src/testing/testing_api_cmd_config.c b/src/testing/testing_api_cmd_config.c index 4b4a5cc..b4cf6e0 100644 --- a/src/testing/testing_api_cmd_config.c +++ b/src/testing/testing_api_cmd_config.c @@ -167,10 +167,8 @@ config_traits (void *cls, unsigned int index) { struct ConfigState *ss = cls; - struct TALER_TESTING_Trait traits[] = { - ANASTASIS_TESTING_make_trait_salt (0, - &ss->salt), + ANASTASIS_TESTING_make_trait_salt (&ss->salt), TALER_TESTING_trait_end () }; diff --git a/src/testing/testing_api_cmd_keyshare_lookup.c b/src/testing/testing_api_cmd_keyshare_lookup.c index 2d12767..5b2adea 100644 --- a/src/testing/testing_api_cmd_keyshare_lookup.c +++ b/src/testing/testing_api_cmd_keyshare_lookup.c @@ -222,7 +222,7 @@ keyshare_lookup_run (void *cls, const struct ANASTASIS_CRYPTO_TruthKeyP *truth_key; const struct ANASTASIS_CRYPTO_TruthUUIDP *truth_uuid; const struct ANASTASIS_PaymentSecretP *payment_secret; - const char *answer; + const char **answer; ksls->is = is; if (NULL == ksls->upload_reference) @@ -244,23 +244,21 @@ keyshare_lookup_run (void *cls, return; } { - const char *fn; + const char **fn; if (GNUNET_OK != - TALER_TESTING_get_trait_string (upload_cmd, - 0, - &fn)) + ANASTASIS_TESTING_get_trait_filename (upload_cmd, + &fn)) { GNUNET_break (0); TALER_TESTING_interpreter_fail (ksls->is); return; } - if (NULL != fn) - ksls->filename = GNUNET_strdup (fn); + if (NULL != *fn) + ksls->filename = GNUNET_strdup (*fn); } if (GNUNET_OK != ANASTASIS_TESTING_get_trait_truth_uuid (upload_cmd, - 0, &truth_uuid)) { GNUNET_break (0); @@ -275,7 +273,6 @@ keyshare_lookup_run (void *cls, } if (GNUNET_OK != ANASTASIS_TESTING_get_trait_truth_key (upload_cmd, - 0, &truth_key)) { GNUNET_break (0); @@ -304,14 +301,13 @@ keyshare_lookup_run (void *cls, } if (GNUNET_OK != ANASTASIS_TESTING_get_trait_code (download_cmd, - 0, &answer)) { GNUNET_break (0); TALER_TESTING_interpreter_fail (ksls->is); return; } - if (NULL == answer) + if (NULL == *answer) { GNUNET_break (0); TALER_TESTING_interpreter_fail (ksls->is); @@ -321,19 +317,18 @@ keyshare_lookup_run (void *cls, else { /* answer is the answer */ - answer = ksls->answer; + answer = &ksls->answer; } if (NULL != ksls->payment_reference) { const struct TALER_TESTING_Command *payment_cmd; - payment_cmd = TALER_TESTING_interpreter_lookup_command - (is, - ksls->payment_reference); + payment_cmd = TALER_TESTING_interpreter_lookup_command ( + is, + ksls->payment_reference); if (GNUNET_OK != ANASTASIS_TESTING_get_trait_payment_secret (payment_cmd, - 0, &payment_secret)) { GNUNET_break (0); @@ -349,9 +344,9 @@ keyshare_lookup_run (void *cls, { struct GNUNET_HashCode h_answer; - if (NULL != answer) - GNUNET_CRYPTO_hash (answer, - strlen (answer), + if (NULL != *answer) + GNUNET_CRYPTO_hash (*answer, + strlen (*answer), &h_answer); ksls->kslo = ANASTASIS_keyshare_lookup (is->ctx, ksls->anastasis_url, @@ -359,7 +354,7 @@ keyshare_lookup_run (void *cls, truth_key, payment_secret, GNUNET_TIME_UNIT_ZERO, - (NULL != answer) + (NULL != *answer) ? &h_answer : NULL, &keyshare_lookup_cb, @@ -414,14 +409,14 @@ keyshare_lookup_traits (void *cls, { struct KeyShareLookupState *ksls = cls; struct TALER_TESTING_Trait traits[] = { - ANASTASIS_TESTING_make_trait_payment_secret (0, - &ksls->payment_secret_response), - TALER_TESTING_make_trait_url (TALER_TESTING_UT_TALER_URL, - ksls->pay_uri), - TALER_TESTING_make_trait_order_id (0, - ksls->order_id), - ANASTASIS_TESTING_make_trait_code (0, - ksls->code), + ANASTASIS_TESTING_make_trait_payment_secret ( + &ksls->payment_secret_response), + TALER_TESTING_make_trait_payto_uri ( + (const char **) ksls->pay_uri), + TALER_TESTING_make_trait_order_id ( + (const char **) &ksls->order_id), + ANASTASIS_TESTING_make_trait_code ( + (const char **) ksls->code), TALER_TESTING_trait_end () }; diff --git a/src/testing/testing_api_cmd_policy_lookup.c b/src/testing/testing_api_cmd_policy_lookup.c index f66ee98..1f59b12 100644 --- a/src/testing/testing_api_cmd_policy_lookup.c +++ b/src/testing/testing_api_cmd_policy_lookup.c @@ -140,7 +140,6 @@ policy_lookup_run (void *cls, } if (GNUNET_OK != ANASTASIS_TESTING_get_trait_hash (upload_cmd, - ANASTASIS_TESTING_TRAIT_HASH_CURRENT, &pls->upload_hash)) { GNUNET_break (0); @@ -149,7 +148,6 @@ policy_lookup_run (void *cls, } if (GNUNET_OK != ANASTASIS_TESTING_get_trait_account_pub (upload_cmd, - 0, &anastasis_pub)) { GNUNET_break (0); diff --git a/src/testing/testing_api_cmd_policy_store.c b/src/testing/testing_api_cmd_policy_store.c index 524ad92..d1ee3c0 100644 --- a/src/testing/testing_api_cmd_policy_store.c +++ b/src/testing/testing_api_cmd_policy_store.c @@ -229,7 +229,6 @@ policy_store_run (void *cls, if (GNUNET_OK != ANASTASIS_TESTING_get_trait_account_priv (ref, - 0, &priv)) { GNUNET_break (0); @@ -243,7 +242,6 @@ policy_store_run (void *cls, if (GNUNET_OK != ANASTASIS_TESTING_get_trait_account_pub (ref, - 0, &pub)) { GNUNET_break (0); @@ -257,7 +255,6 @@ policy_store_run (void *cls, if (GNUNET_OK != ANASTASIS_TESTING_get_trait_payment_secret (ref, - 0, &ps)) { GNUNET_break (0); @@ -341,18 +338,13 @@ policy_store_traits (void *cls, { struct PolicyStoreState *pss = cls; struct TALER_TESTING_Trait traits[] = { - TALER_TESTING_make_trait_claim_token (0, - &pss->claim_token), - TALER_TESTING_make_trait_order_id (0, - pss->order_id), - ANASTASIS_TESTING_make_trait_hash (0, - &pss->curr_hash), - ANASTASIS_TESTING_make_trait_account_pub (0, - &pss->anastasis_pub), - ANASTASIS_TESTING_make_trait_account_priv (0, - &pss->anastasis_priv), - ANASTASIS_TESTING_make_trait_payment_secret (0, - &pss->payment_secret_response), + TALER_TESTING_make_trait_claim_token (&pss->claim_token), + TALER_TESTING_make_trait_order_id ( + (const char **) &pss->order_id), + ANASTASIS_TESTING_make_trait_hash (&pss->curr_hash), + ANASTASIS_TESTING_make_trait_account_pub (&pss->anastasis_pub), + ANASTASIS_TESTING_make_trait_account_priv (&pss->anastasis_priv), + ANASTASIS_TESTING_make_trait_payment_secret (&pss->payment_secret_response), TALER_TESTING_trait_end () }; diff --git a/src/testing/testing_api_cmd_truth_store.c b/src/testing/testing_api_cmd_truth_store.c index e511926..0972210 100644 --- a/src/testing/testing_api_cmd_truth_store.c +++ b/src/testing/testing_api_cmd_truth_store.c @@ -205,7 +205,6 @@ truth_store_run (void *cls, if (GNUNET_OK != ANASTASIS_TESTING_get_trait_truth_uuid (ref, - 0, &uuid)) { GNUNET_break (0); @@ -215,7 +214,6 @@ truth_store_run (void *cls, tss->uuid = *uuid; if (GNUNET_OK != ANASTASIS_TESTING_get_trait_eks (ref, - 0, &eks)) { GNUNET_break (0); @@ -335,7 +333,7 @@ truth_store_cleanup (void *cls, * @param index index number of the object to extract. * @return #GNUNET_OK on success */ -static int +static enum GNUNET_GenericReturnValue truth_store_traits (void *cls, const void **ret, const char *trait, @@ -343,18 +341,14 @@ truth_store_traits (void *cls, { struct TruthStoreState *tss = cls; struct TALER_TESTING_Trait traits[] = { - ANASTASIS_TESTING_make_trait_truth_uuid (0, - &tss->uuid), - ANASTASIS_TESTING_make_trait_truth_key (0, - &tss->key), - ANASTASIS_TESTING_make_trait_eks (0, - &tss->encrypted_keyshare), - ANASTASIS_TESTING_make_trait_payment_secret (0, - &tss->payment_secret_response), - TALER_TESTING_make_trait_url (TALER_TESTING_UT_TALER_URL, - tss->pay_uri), - TALER_TESTING_make_trait_string (0, - tss->filename), + ANASTASIS_TESTING_make_trait_truth_uuid (&tss->uuid), + ANASTASIS_TESTING_make_trait_truth_key (&tss->key), + ANASTASIS_TESTING_make_trait_eks (&tss->encrypted_keyshare), + ANASTASIS_TESTING_make_trait_payment_secret (&tss->payment_secret_response), + TALER_TESTING_make_trait_payto_uri ( + (const char **) &tss->pay_uri), + ANASTASIS_TESTING_make_trait_filename ( + (const char **) &tss->filename), TALER_TESTING_trait_end () }; diff --git a/src/testing/testing_cmd_challenge_answer.c b/src/testing/testing_cmd_challenge_answer.c index e6122e3..ec8d03d 100644 --- a/src/testing/testing_cmd_challenge_answer.c +++ b/src/testing/testing_cmd_challenge_answer.c @@ -259,7 +259,7 @@ challenge_answer_run (void *cls, struct TALER_TESTING_Interpreter *is) { struct ChallengeState *cs = cls; - const struct ANASTASIS_Challenge *c; + const struct ANASTASIS_Challenge **c; const struct ANASTASIS_PaymentSecretP *ps; cs->is = is; @@ -277,14 +277,15 @@ challenge_answer_run (void *cls, return; } if (GNUNET_OK != - ANASTASIS_TESTING_get_trait_challenge (ref, - cs->challenge_index, - &c)) + ANASTASIS_TESTING_get_trait_challenges (ref, + cs->challenge_index, + &c)) { GNUNET_break (0); TALER_TESTING_interpreter_fail (cs->is); return; } + cs->c = (struct ANASTASIS_Challenge *) *c; } if (NULL != cs->payment_ref) @@ -301,7 +302,6 @@ challenge_answer_run (void *cls, } if (GNUNET_OK != ANASTASIS_TESTING_get_trait_payment_secret (ref, - 0, &ps)) { GNUNET_break (0); @@ -314,12 +314,10 @@ challenge_answer_run (void *cls, ps = NULL; } - cs->c = (struct ANASTASIS_Challenge *) c; - if (1 == cs->mode) { const struct TALER_TESTING_Command *ref; - const char *answer; + const char **answer; unsigned long long code; char dummy; @@ -333,7 +331,6 @@ challenge_answer_run (void *cls, } if (GNUNET_OK != ANASTASIS_TESTING_get_trait_code (ref, - 0, &answer)) { GNUNET_break (0); @@ -341,7 +338,7 @@ challenge_answer_run (void *cls, return; } if (1 != - sscanf (answer, + sscanf (*answer, "%llu%c", &code, &dummy)) @@ -397,7 +394,7 @@ challenge_start_run (void *cls, struct TALER_TESTING_Interpreter *is) { struct ChallengeState *cs = cls; - const struct ANASTASIS_Challenge *c; + const struct ANASTASIS_Challenge **c; const struct TALER_TESTING_Command *ref; const struct ANASTASIS_PaymentSecretP *ps; @@ -412,9 +409,9 @@ challenge_start_run (void *cls, return; } if (GNUNET_OK != - ANASTASIS_TESTING_get_trait_challenge (ref, - cs->challenge_index, - &c)) + ANASTASIS_TESTING_get_trait_challenges (ref, + cs->challenge_index, + &c)) { GNUNET_break (0); TALER_TESTING_interpreter_fail (cs->is); @@ -434,7 +431,6 @@ challenge_start_run (void *cls, } if (GNUNET_OK != ANASTASIS_TESTING_get_trait_payment_secret (ref, - 0, &ps)) { GNUNET_break (0); @@ -505,14 +501,14 @@ challenge_create_traits (void *cls, { struct ChallengeState *cs = cls; struct TALER_TESTING_Trait traits[] = { - ANASTASIS_TESTING_make_trait_code (0, - cs->code), - ANASTASIS_TESTING_make_trait_payment_secret (0, - &cs->payment_order_req), - TALER_TESTING_make_trait_url (TALER_TESTING_UT_TALER_URL, - cs->payment_uri), - TALER_TESTING_make_trait_order_id (0, - cs->order_id), + ANASTASIS_TESTING_make_trait_code ( + (const char **) cs->code), + ANASTASIS_TESTING_make_trait_payment_secret ( + &cs->payment_order_req), + TALER_TESTING_make_trait_payto_uri ( + (const char **) cs->payment_uri), + TALER_TESTING_make_trait_order_id ( + (const char **) &cs->order_id), TALER_TESTING_trait_end () }; diff --git a/src/testing/testing_cmd_policy_create.c b/src/testing/testing_cmd_policy_create.c index 33d5975..64f7060 100644 --- a/src/testing/testing_cmd_policy_create.c +++ b/src/testing/testing_cmd_policy_create.c @@ -82,7 +82,7 @@ policy_create_run (void *cls, for (unsigned int i = 0; i < pcs->cmd_label_array_length; i++) { const struct TALER_TESTING_Command *ref; - const struct ANASTASIS_Truth *truth; + const struct ANASTASIS_Truth **truth; ref = TALER_TESTING_interpreter_lookup_command (is, pcs->cmd_label_array[i]); @@ -94,15 +94,14 @@ policy_create_run (void *cls, } if (GNUNET_OK != ANASTASIS_TESTING_get_trait_truth (ref, - 0, &truth)) { GNUNET_break (0); TALER_TESTING_interpreter_fail (pcs->is); return; } - GNUNET_assert (NULL != truth); - truths[i] = truth; + GNUNET_assert (NULL != *truth); + truths[i] = *truth; } } @@ -159,8 +158,8 @@ policy_create_traits (void *cls, { struct PolicyCreateState *pcs = cls; struct TALER_TESTING_Trait traits[] = { - ANASTASIS_TESTING_make_trait_policy (0, - pcs->policy), + ANASTASIS_TESTING_make_trait_policy ( + (const struct ANASTASIS_Policy **) &pcs->policy), TALER_TESTING_trait_end () }; diff --git a/src/testing/testing_cmd_recover_secret.c b/src/testing/testing_cmd_recover_secret.c index 8e75e4b..153143d 100644 --- a/src/testing/testing_cmd_recover_secret.c +++ b/src/testing/testing_cmd_recover_secret.c @@ -79,7 +79,7 @@ struct RecoverSecretState /** * Coresecret to check if decryption worked */ - const void *core_secret; + const void **core_secret; /** * Task scheduled to wait for recovery to complete. @@ -151,7 +151,7 @@ core_secret_cb (void *cls, return; } if (0 != memcmp (secret, - rss->core_secret, + *rss->core_secret, secret_size)) { GNUNET_break (0); @@ -204,7 +204,6 @@ recover_secret_run (void *cls, } if (GNUNET_OK != ANASTASIS_TESTING_get_trait_salt (ref, - 0, &salt)) { GNUNET_break (0); @@ -224,9 +223,9 @@ recover_secret_run (void *cls, return; } if (GNUNET_OK != - ANASTASIS_TESTING_get_trait_core_secret (ref, - 0, - &rss->core_secret)) + ANASTASIS_TESTING_get_trait_core_secret ( + ref, + (const void ***) &rss->core_secret)) { GNUNET_break (0); TALER_TESTING_interpreter_fail (rss->is); @@ -327,8 +326,9 @@ recover_secret_traits (void *cls, } { struct TALER_TESTING_Trait traits[] = { - ANASTASIS_TESTING_make_trait_challenge (index, - rss->ri->cs[index]), + ANASTASIS_TESTING_make_trait_challenges ( + index, + (const struct ANASTASIS_Challenge **) &rss->ri->cs[index]), TALER_TESTING_trait_end () }; diff --git a/src/testing/testing_cmd_secret_share.c b/src/testing/testing_cmd_secret_share.c index a4f8819..7a9dbc0 100644 --- a/src/testing/testing_cmd_secret_share.c +++ b/src/testing/testing_cmd_secret_share.c @@ -199,7 +199,7 @@ secret_share_run (void *cls, for (unsigned int i = 0; i < sss->cmd_label_array_length; i++) { const struct TALER_TESTING_Command *ref; - const struct ANASTASIS_Policy *policy; + const struct ANASTASIS_Policy **policy; ref = TALER_TESTING_interpreter_lookup_command (is, sss->cmd_label_array[i]); @@ -211,22 +211,21 @@ secret_share_run (void *cls, } if (GNUNET_OK != ANASTASIS_TESTING_get_trait_policy (ref, - 0, &policy)) { GNUNET_break (0); TALER_TESTING_interpreter_fail (sss->is); return; } - GNUNET_assert (NULL != policy); - policies[i] = policy; + GNUNET_assert (NULL != *policy); + policies[i] = *policy; } } if (NULL != sss->prev_secret_share) { const struct TALER_TESTING_Command *ref; - const char *order_id; + const char **order_id; ref = TALER_TESTING_interpreter_lookup_command (is, sss->prev_secret_share); @@ -238,14 +237,13 @@ secret_share_run (void *cls, } if (GNUNET_OK != TALER_TESTING_get_trait_order_id (ref, - 0, &order_id)) { GNUNET_break (0); TALER_TESTING_interpreter_fail (sss->is); return; } - sss->payment_order_id = (char *) order_id; + sss->payment_order_id = (char *) *order_id; if (NULL == sss->payment_order_id) { @@ -289,7 +287,6 @@ secret_share_run (void *cls, } if (GNUNET_OK != ANASTASIS_TESTING_get_trait_salt (ref, - 0, &salt)) { GNUNET_break (0); @@ -368,12 +365,10 @@ secret_share_traits (void *cls, { struct SecretShareState *sss = cls; struct TALER_TESTING_Trait traits[] = { - TALER_TESTING_make_trait_claim_token (0, - &sss->token), - ANASTASIS_TESTING_make_trait_core_secret (0, - sss->core_secret), - TALER_TESTING_make_trait_order_id (0, - sss->payment_order_id), + TALER_TESTING_make_trait_claim_token (&sss->token), + ANASTASIS_TESTING_make_trait_core_secret (&sss->core_secret), + TALER_TESTING_make_trait_order_id ( + (const char **) &sss->payment_order_id), TALER_TESTING_trait_end () }; diff --git a/src/testing/testing_cmd_truth_upload.c b/src/testing/testing_cmd_truth_upload.c index 030549d..99c2879 100644 --- a/src/testing/testing_cmd_truth_upload.c +++ b/src/testing/testing_cmd_truth_upload.c @@ -198,7 +198,6 @@ truth_upload_run (void *cls, } if (GNUNET_OK != ANASTASIS_TESTING_get_trait_salt (ref, - 0, &salt)) { GNUNET_break (0); @@ -285,10 +284,9 @@ truth_upload_traits (void *cls, { struct TruthUploadState *tus = cls; struct TALER_TESTING_Trait traits[] = { - ANASTASIS_TESTING_make_trait_truth (0, - tus->truth), - ANASTASIS_TESTING_make_trait_payment_secret (0, - &tus->payment_secret_response), + ANASTASIS_TESTING_make_trait_truth ( + (const struct ANASTASIS_Truth **) &tus->truth), + ANASTASIS_TESTING_make_trait_payment_secret (&tus->payment_secret_response), TALER_TESTING_trait_end () }; |