[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis] branch master updated: rebase
|
From: |
gnunet |
|
Subject: |
[taler-anastasis] branch master updated: rebase |
|
Date: |
Mon, 20 Apr 2020 10:52:08 +0200 |
This is an automated email from the git hooks/post-receive script.
dennis-neufeld pushed a commit to branch master
in repository anastasis.
The following commit(s) were added to refs/heads/master by this push:
new 1a4d371 rebase
1a4d371 is described below
commit 1a4d371b3aa14b506b2de6bb22544c1ef98ed347
Author: Dennis Neufeld <address@hidden>
AuthorDate: Mon Apr 20 08:51:45 2020 +0000
rebase
---
src/lib/anastasis_api_keyshare_lookup.c | 18 ++-
src/lib/testing_api_cmd_keyshare_lookup.c | 205 ++++++++++++++++--------------
src/lib/testing_api_cmd_truth_store.c | 12 ++
3 files changed, 133 insertions(+), 102 deletions(-)
diff --git a/src/lib/anastasis_api_keyshare_lookup.c
b/src/lib/anastasis_api_keyshare_lookup.c
index a8e4fa3..a70596a 100644
--- a/src/lib/anastasis_api_keyshare_lookup.c
+++ b/src/lib/anastasis_api_keyshare_lookup.c
@@ -259,14 +259,19 @@ ANASTASIS_keyshare_lookup (struct GNUNET_CURL_Context
*ctx,
kslo->cb = cb;
kslo->cb_cls = cb_cls;
kslo->truth_key = truth_key;
+ << << << < HEAD
- GNUNET_assert (NULL != truth_uuid);
+ GNUNET_assert (NULL != truth_uuid);
uuid_str = GNUNET_STRINGS_data_to_string_alloc (truth_uuid,
sizeof (*truth_uuid));
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"UUID in keyshare lookup: %s\n",
uuid_str);
GNUNET_assert (NULL != hashed_answer);
+ ====== =
+ uuid_str = GNUNET_STRINGS_data_to_string_alloc (truth_uuid,
+ sizeof (*truth_uuid));
+ >> >> >> > f6a488c ... modified salt request
hashed_answer_str = GNUNET_STRINGS_data_to_string_alloc (hashed_answer,
sizeof (struct
GNUNET_HashCode));
@@ -281,10 +286,13 @@ ANASTASIS_keyshare_lookup (struct GNUNET_CURL_Context
*ctx,
GNUNET_free (path);
GNUNET_free (uuid_str);
GNUNET_free (hashed_answer_str);
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Url get request (keyshare lookup): %s\n",
- kslo->url);
- eh = curl_easy_init ();
+ << << << < HEAD
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Url get request (keyshare lookup): %s\n",
+ kslo->url);
+ ====== =
+ >> >> >> > f6a488c ... modified salt request
+ eh = curl_easy_init ();
GNUNET_assert (CURLE_OK ==
curl_easy_setopt (eh,
CURLOPT_HEADERFUNCTION,
diff --git a/src/lib/testing_api_cmd_keyshare_lookup.c
b/src/lib/testing_api_cmd_keyshare_lookup.c
index c98f677..ec2f491 100644
--- a/src/lib/testing_api_cmd_keyshare_lookup.c
+++ b/src/lib/testing_api_cmd_keyshare_lookup.c
@@ -131,45 +131,56 @@ keyshare_lookup_run (void *cls,
TALER_TESTING_interpreter_fail (ksls->is);
return;
}
- {
- const uuid_t *uuid;
-
- if (GNUNET_OK !=
- ANASTASIS_TESTING_get_trait_uuid (upload_cmd,
- 0,
- &uuid))
- {
- GNUNET_break (0);
- TALER_TESTING_interpreter_fail (ksls->is);
- return;
- }
- ksls->truth_uuid = uuid;
- if (NULL == ksls->truth_uuid)
- {
- GNUNET_break (0);
- TALER_TESTING_interpreter_fail (ksls->is);
- return;
+ << << << < HEAD
+ {
+ const uuid_t *uuid;
+
+ if (GNUNET_OK !=
+ ANASTASIS_TESTING_get_trait_uuid (upload_cmd,
+ 0,
+ &uuid))
+ {
+ GNUNET_break (0);
+ TALER_TESTING_interpreter_fail (ksls->is);
+ return;
+ }
+ ksls->truth_uuid = uuid;
+ if (NULL == ksls->truth_uuid)
+ {
+ GNUNET_break (0);
+ TALER_TESTING_interpreter_fail (ksls->is);
+ return;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Uuid from trait: %s\n",
+ TALER_B2S (ksls->truth_uuid));
+
+ ====== =
+ if (GNUNET_OK !=
+ ANASTASIS_TESTING_get_trait_uuid (upload_cmd,
+ 0,
+ &ksls->truth_uuid))
+ {
+ GNUNET_break (0);
+ TALER_TESTING_interpreter_fail (ksls->is);
+ return;
+ >> >> >> > f6a488c ... modified salt request
+ }
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Uuid from trait: %s\n",
- TALER_B2S (ksls->truth_uuid));
-
+ ksls->kslo = ANASTASIS_keyshare_lookup (is->ctx,
+ ksls->anastasis_url,
+ ksls->truth_uuid,
+ ksls->truth_key,
+ &ksls->hashed_answer,
+ &keyshare_lookup_cb,
+ ksls);
+ if (NULL == ksls->kslo)
+ {
+ GNUNET_break (0);
+ TALER_TESTING_interpreter_fail (ksls->is);
+ return;
}
}
- ksls->kslo = ANASTASIS_keyshare_lookup (is->ctx,
- ksls->anastasis_url,
- ksls->truth_uuid,
- ksls->truth_key,
- &ksls->hashed_answer,
- &keyshare_lookup_cb,
- ksls);
- if (NULL == ksls->kslo)
- {
- GNUNET_break (0);
- TALER_TESTING_interpreter_fail (ksls->is);
- return;
- }
-}
/**
@@ -179,22 +190,22 @@ keyshare_lookup_run (void *cls,
* @param cls closure.
* @param cmd command being freed.
*/
-static void
-keyshare_lookup_cleanup (void *cls,
- const struct TALER_TESTING_Command *cmd)
-{
- struct KeyShareLookupState *ksls = cls;
-
- if (NULL != ksls->kslo)
+ static void
+ keyshare_lookup_cleanup (void *cls,
+ const struct TALER_TESTING_Command *cmd)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Command '%s' did not complete (keyshare lookup)\n",
- cmd->label);
- ANASTASIS_keyshare_lookup_cancel (ksls->kslo);
- ksls->kslo = NULL;
+ struct KeyShareLookupState *ksls = cls;
+
+ if (NULL != ksls->kslo)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Command '%s' did not complete (keyshare lookup)\n",
+ cmd->label);
+ ANASTASIS_keyshare_lookup_cancel (ksls->kslo);
+ ksls->kslo = NULL;
+ }
+ GNUNET_free (ksls);
}
- GNUNET_free (ksls);
-}
/**
@@ -204,19 +215,19 @@ keyshare_lookup_cleanup (void *cls,
* @param size_answer size of the answer
* @return hash of the answer
*/
-struct GNUNET_HashCode
-ANASTASIS_TESTING_make_hashed_answer (const void *answer,
- size_t size_answer)
-{
- struct GNUNET_HashCode hashed_answer;
- GNUNET_CRYPTO_hash (answer,
- size_answer,
- &hashed_answer);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Hashed answer: %s\n",
- TALER_B2S (&hashed_answer));
- return hashed_answer;
-}
+ struct GNUNET_HashCode
+ ANASTASIS_TESTING_make_hashed_answer (const void *answer,
+ size_t size_answer)
+ {
+ struct GNUNET_HashCode hashed_answer;
+ GNUNET_CRYPTO_hash (answer,
+ size_answer,
+ &hashed_answer);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Hashed answer: %s\n",
+ TALER_B2S (&hashed_answer));
+ return hashed_answer;
+ }
/**
@@ -231,42 +242,42 @@ ANASTASIS_TESTING_make_hashed_answer (const void *answer,
* @param upload_ref reference to upload command
* @return the command
*/
-struct TALER_TESTING_Command
-ANASTASIS_TESTING_cmd_keyshare_lookup (const char *label,
- const char *anastasis_url,
- unsigned int http_status,
- const struct GNUNET_HashCode answer,
- const struct
- ANASTASIS_CRYPTO_TruthKey *key,
- const char *upload_ref)
-{
- struct KeyShareLookupState *ksls;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Hashed answer in keyshare lookup cmd: %s\n",
- TALER_B2S (&answer));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "TruthKey in keyshare lookup cmd: %s\n",
- TALER_B2S (key));
-
- GNUNET_assert (NULL != upload_ref);
- ksls = GNUNET_new (struct KeyShareLookupState);
- ksls->http_status = http_status;
- ksls->anastasis_url = anastasis_url;
- ksls->upload_reference = upload_ref;
- ksls->hashed_answer = answer;
- ksls->truth_key = key;
+ struct TALER_TESTING_Command
+ ANASTASIS_TESTING_cmd_keyshare_lookup (const char *label,
+ const char *anastasis_url,
+ unsigned int http_status,
+ const struct GNUNET_HashCode answer,
+ const struct
+ ANASTASIS_CRYPTO_TruthKey *key,
+ const char *upload_ref)
{
- struct TALER_TESTING_Command cmd = {
- .cls = ksls,
- .label = label,
- .run = &keyshare_lookup_run,
- .cleanup = &keyshare_lookup_cleanup
- };
-
- return cmd;
+ struct KeyShareLookupState *ksls;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Hashed answer in keyshare lookup cmd: %s\n",
+ TALER_B2S (&answer));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "TruthKey in keyshare lookup cmd: %s\n",
+ TALER_B2S (key));
+
+ GNUNET_assert (NULL != upload_ref);
+ ksls = GNUNET_new (struct KeyShareLookupState);
+ ksls->http_status = http_status;
+ ksls->anastasis_url = anastasis_url;
+ ksls->upload_reference = upload_ref;
+ ksls->hashed_answer = answer;
+ ksls->truth_key = key;
+ {
+ struct TALER_TESTING_Command cmd = {
+ .cls = ksls,
+ .label = label,
+ .run = &keyshare_lookup_run,
+ .cleanup = &keyshare_lookup_cleanup
+ };
+
+ return cmd;
+ }
}
-}
/* end of testing_api_cmd_keyshare_lookup.c */
\ No newline at end of file
diff --git a/src/lib/testing_api_cmd_truth_store.c
b/src/lib/testing_api_cmd_truth_store.c
index 7b26375..bb52a4c 100644
--- a/src/lib/testing_api_cmd_truth_store.c
+++ b/src/lib/testing_api_cmd_truth_store.c
@@ -5,11 +5,19 @@
Anastasis is free software; you can redistribute it and/or modify it under
the
terms of the GNU Lesser General Public License as published by the Free
Software
Foundation; either version 3, or (at your option) any later version.
+<<<<<<< HEAD
Anastasis is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+=======
+
+ Anastasis is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+>>>>>>> f6a488c... modified salt request
You should have received a copy of the GNU General Public License along with
Anastasis; see the file COPYING.GPL. If not, see
<http://www.gnu.org/licenses/>
*/
@@ -333,7 +341,11 @@ truth_store_traits (void *cls,
ANASTASIS_TESTING_make_trait_hash (ANASTASIS_TESTING_TRAIT_HASH_CURRENT,
&tss->curr_hash),
ANASTASIS_TESTING_make_trait_uuid (0,
+ << << << < HEAD
tss->truth_uuid),
+ ====== =
+ &tss->truth_uuid),
+ >> >> >> > f6a488c ... modified salt request
TALER_TESTING_make_trait_order_id (0,
tss->payment_order_id),
TALER_TESTING_trait_end ()
--
To stop receiving notification emails like this one, please contact
address@hidden.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-anastasis] branch master updated: rebase,
gnunet <=