[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis] 06/12: worked on keyshare lookup testing
|
From: |
gnunet |
|
Subject: |
[taler-anastasis] 06/12: worked on keyshare lookup testing |
|
Date: |
Mon, 20 Apr 2020 09:46:01 +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 4b0bea558965e9f84df487ddcb636245512122c7
Author: Dennis Neufeld <address@hidden>
AuthorDate: Sat Apr 18 16:53:39 2020 +0000
worked on keyshare lookup testing
---
src/include/anastasis_crypto_lib.h | 6 +++---
src/include/anastasis_service.h | 2 +-
src/include/anastasis_testing_lib.h | 2 +-
src/lib/anastasis.c | 8 ++++----
src/lib/anastasis_api_keyshare_lookup.c | 31 ++++++++++++++++--------------
src/lib/anastasis_api_truth_store.c | 1 +
src/lib/testing_api_cmd_keyshare_lookup.c | 6 +++---
src/lib/testing_api_cmd_truth_store.c | 6 +++---
src/lib/vgcore.566055 | Bin 0 -> 54255616 bytes
src/lib/vgcore.566275 | Bin 0 -> 50061312 bytes
src/lib/vgcore.566407 | Bin 0 -> 54255616 bytes
src/lib/vgcore.566707 | Bin 0 -> 54255616 bytes
src/lib/vgcore.568856 | Bin 0 -> 54255616 bytes
src/lib/vgcore.575537 | Bin 0 -> 54255616 bytes
src/lib/vgcore.581649 | Bin 0 -> 54255616 bytes
src/lib/vgcore.599107 | Bin 0 -> 54255616 bytes
src/util/anastasis_crypto.c | 6 +++---
src/util/test_anastasis_crypto.c | 20 +++++++++----------
18 files changed, 46 insertions(+), 42 deletions(-)
diff --git a/src/include/anastasis_crypto_lib.h
b/src/include/anastasis_crypto_lib.h
index a9a7f1e..a3cec5c 100644
--- a/src/include/anastasis_crypto_lib.h
+++ b/src/include/anastasis_crypto_lib.h
@@ -229,7 +229,7 @@ ANASTASIS_CRYPTO_recovery_document_decrypt (
* @param enc_key_share[out] holds the encrypted share, the first 48 Bytes are
the used nonce and tag
*/
void
-ANASTASIS_CRYPTO_key_share_encrypt (
+ANASTASIS_CRYPTO_keyshare_encrypt (
const struct ANASTASIS_CRYPTO_KeyShare *key_share,
const struct ANASTASIS_CRYPTO_UserIdentifier *id,
struct ANASTASIS_CRYPTO_EncryptedKeyShare **enc_key_share);
@@ -243,7 +243,7 @@ ANASTASIS_CRYPTO_key_share_encrypt (
* @param key_share[out] the result of decryption
*/
void
-ANASTASIS_CRYPTO_key_share_decrypt (
+ANASTASIS_CRYPTO_keyshare_decrypt (
const struct ANASTASIS_CRYPTO_EncryptedKeyShare *enc_key_share,
const struct ANASTASIS_CRYPTO_UserIdentifier *id,
struct ANASTASIS_CRYPTO_KeyShare **key_share);
@@ -297,7 +297,7 @@ ANASTASIS_CRYPTO_truth_decrypt (
* @param key_share[out] reference to the created key share.
*/
void
-ANASTASIS_CRYPTO_key_share_create (
+ANASTASIS_CRYPTO_keyshare_create (
struct ANASTASIS_CRYPTO_KeyShare *key_share);
diff --git a/src/include/anastasis_service.h b/src/include/anastasis_service.h
index f74ab5b..b10e145 100644
--- a/src/include/anastasis_service.h
+++ b/src/include/anastasis_service.h
@@ -191,7 +191,7 @@ struct ANASTASIS_KeyShareDownloadDetails
/**
* Number of bytes in truth_data.
*/
- size_t encrypted_key_share_size;
+ size_t encrypted_keyshare_size;
};
/**
diff --git a/src/include/anastasis_testing_lib.h
b/src/include/anastasis_testing_lib.h
index bf8f863..5c43a5f 100644
--- a/src/include/anastasis_testing_lib.h
+++ b/src/include/anastasis_testing_lib.h
@@ -360,7 +360,7 @@ ANASTASIS_TESTING_make_hashed_answer (const void *answer,
* @param key the key to encrypt the truth
* @return truth in json format
*/
-json_t*
+json_t *
ANASTASIS_TESTING_make_truth_example (const char *method,
const char *mime_type,
const struct GNUNET_HashCode answer,
diff --git a/src/lib/anastasis.c b/src/lib/anastasis.c
index ef82156..b5be6d7 100644
--- a/src/lib/anastasis.c
+++ b/src/lib/anastasis.c
@@ -577,13 +577,13 @@ ANASTASIS_truth_upload (const json_t *id_data,
&salt_cb,
ss);
- ANASTASIS_CRYPTO_key_share_create (&t->key_share);
+ ANASTASIS_CRYPTO_keyshare_create (&t->key_share);
ANASTASIS_CRYPTO_user_identifier_derive (id_data,
&ss->so->salt,
&tu->id);
- ANASTASIS_CRYPTO_key_share_encrypt (&t->key_share,
- &tu->id,
- &encrypted_key_share);
+ ANASTASIS_CRYPTO_keyshare_encrypt (&t->key_share,
+ &tu->id,
+ &encrypted_key_share);
salt_cleanup (ss);
GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_STRONG,
diff --git a/src/lib/anastasis_api_keyshare_lookup.c
b/src/lib/anastasis_api_keyshare_lookup.c
index 609c6b4..92f14d0 100644
--- a/src/lib/anastasis_api_keyshare_lookup.c
+++ b/src/lib/anastasis_api_keyshare_lookup.c
@@ -79,14 +79,15 @@ struct ANASTASIS_KeyShareLookupOperation
const struct GNUNET_HashCode *hashed_answer;
};
+
/**
* Cancel a pending /truth GET request
*
* @param handle from the operation to cancel
*/
void
-ANASTASIS_key_share_lookup_cancel (struct
- ANASTASIS_KeyShareLookupOperation *kslo)
+ANASTASIS_keyshare_lookup_cancel (struct
+ ANASTASIS_KeyShareLookupOperation *kslo)
{
if (NULL != kslo->job)
{
@@ -102,10 +103,10 @@ ANASTASIS_key_share_lookup_cancel (struct
* Process GET /truth response
*/
static void
-handle_key_share_lookup_finished (void *cls,
- long response_code,
- const void *data,
- size_t data_size)
+handle_keyshare_lookup_finished (void *cls,
+ long response_code,
+ const void *data,
+ size_t data_size)
{
struct ANASTASIS_KeyShareLookupOperation *kslo = cls;
@@ -125,12 +126,12 @@ handle_key_share_lookup_finished (void *cls,
/* Success, call callback with all details! */
memset (&kdd, 0, sizeof (kdd));
kdd.encrypted_key_share = data;
- kdd.encrypted_key_share_size = data_size;
+ kdd.encrypted_keyshare_size = data_size;
kslo->cb (kslo->cb_cls,
response_code,
&kdd);
kslo->cb = NULL;
- ANASTASIS_key_share_lookup_cancel (kslo);
+ ANASTASIS_keyshare_lookup_cancel (kslo);
return;
}
case MHD_HTTP_BAD_REQUEST:
@@ -160,7 +161,7 @@ handle_key_share_lookup_finished (void *cls,
NULL);
kslo->cb = NULL;
}
- ANASTASIS_key_share_lookup_cancel (kslo);
+ ANASTASIS_keyshare_lookup_cancel (kslo);
}
@@ -258,10 +259,11 @@ ANASTASIS_keyshare_lookup (struct GNUNET_CURL_Context
*ctx,
kslo->cb = cb;
kslo->cb_cls = cb_cls;
kslo->truth_key = truth_key;
- uuid_str = GNUNET_STRINGS_data_to_string_alloc (&truth_uuid,
- sizeof (truth_uuid));
- hashed_answer_str = GNUNET_STRINGS_data_to_string_alloc (&hashed_answer,
- sizeof
(hashed_answer));
+ uuid_str = GNUNET_STRINGS_data_to_string_alloc (truth_uuid,
+ sizeof (*truth_uuid));
+ hashed_answer_str = GNUNET_STRINGS_data_to_string_alloc (hashed_answer,
+ sizeof (struct
+
GNUNET_HashCode));
GNUNET_asprintf (&path,
"truth/%s",
uuid_str);
@@ -272,6 +274,7 @@ ANASTASIS_keyshare_lookup (struct GNUNET_CURL_Context *ctx,
hashed_answer_str,
NULL);
GNUNET_free (path);
+ GNUNET_free (uuid_str);
GNUNET_free (hashed_answer_str);
eh = curl_easy_init ();
GNUNET_assert (CURLE_OK ==
@@ -286,7 +289,7 @@ ANASTASIS_keyshare_lookup (struct GNUNET_CURL_Context *ctx,
kslo->job = GNUNET_CURL_job_add_raw (ctx,
eh,
GNUNET_NO,
- &handle_key_share_lookup_finished,
+ &handle_keyshare_lookup_finished,
kslo);
return kslo;
}
diff --git a/src/lib/anastasis_api_truth_store.c
b/src/lib/anastasis_api_truth_store.c
index 7304833..409d3ad 100644
--- a/src/lib/anastasis_api_truth_store.c
+++ b/src/lib/anastasis_api_truth_store.c
@@ -341,6 +341,7 @@ ANASTASIS_truth_store (struct GNUNET_CURL_Context *ctx,
GNUNET_NO,
&handle_truth_store_finished,
tso);
+ GNUNET_free (json_str);
json_decref (truth_data);
return tso;
}
diff --git a/src/lib/testing_api_cmd_keyshare_lookup.c
b/src/lib/testing_api_cmd_keyshare_lookup.c
index 89499a5..7128863 100644
--- a/src/lib/testing_api_cmd_keyshare_lookup.c
+++ b/src/lib/testing_api_cmd_keyshare_lookup.c
@@ -55,7 +55,7 @@ struct KeyShareLookupState
/**
* Hashed answer to a challenge
*/
- const struct GNUNET_HashCode *hashed_answer;
+ struct GNUNET_HashCode hashed_answer;
/**
* Key to decrypt truth
@@ -145,7 +145,7 @@ keyshare_lookup_run (void *cls,
ksls->anastasis_url,
ksls->truth_uuid,
ksls->truth_key,
- ksls->hashed_answer,
+ &ksls->hashed_answer,
&keyshare_lookup_cb,
ksls);
if (NULL == ksls->kslo)
@@ -229,7 +229,7 @@ ANASTASIS_TESTING_cmd_keyshare_lookup (const char *label,
ksls->http_status = http_status;
ksls->anastasis_url = anastasis_url;
ksls->upload_reference = upload_ref;
- ksls->hashed_answer = &answer;
+ ksls->hashed_answer = answer;
ksls->truth_key = key;
{
struct TALER_TESTING_Command cmd = {
diff --git a/src/lib/testing_api_cmd_truth_store.c
b/src/lib/testing_api_cmd_truth_store.c
index 00303f6..cb4a820 100644
--- a/src/lib/testing_api_cmd_truth_store.c
+++ b/src/lib/testing_api_cmd_truth_store.c
@@ -341,7 +341,7 @@ truth_store_traits (void *cls,
* @param key the key to encrypt the truth
* @return truth in json format
*/
-json_t*
+json_t *
ANASTASIS_TESTING_make_truth_example (const char *method,
const char *mime_type,
const struct GNUNET_HashCode answer,
@@ -364,7 +364,7 @@ ANASTASIS_TESTING_make_truth_example (const char *method,
sizeof (struct GNUNET_HashCode));
ANASTASIS_CRYPTO_truth_encrypt (key,
&answer,
- sizeof (struct GNUNET_HashCode *),
+ sizeof (answer),
&encrypted_truth,
&size_encrypted_truth);
@@ -384,7 +384,7 @@ ANASTASIS_TESTING_make_truth_example (const char *method,
"Truth json before upload: %s\n",
json_dumps (truth_data, JSON_COMPACT));
GNUNET_assert (NULL != truth_data);
-
+ GNUNET_free (encrypted_truth);
return truth_data;
}
diff --git a/src/lib/vgcore.566055 b/src/lib/vgcore.566055
new file mode 100644
index 0000000..c5e7e25
Binary files /dev/null and b/src/lib/vgcore.566055 differ
diff --git a/src/lib/vgcore.566275 b/src/lib/vgcore.566275
new file mode 100644
index 0000000..b42ca04
Binary files /dev/null and b/src/lib/vgcore.566275 differ
diff --git a/src/lib/vgcore.566407 b/src/lib/vgcore.566407
new file mode 100644
index 0000000..9133fbb
Binary files /dev/null and b/src/lib/vgcore.566407 differ
diff --git a/src/lib/vgcore.566707 b/src/lib/vgcore.566707
new file mode 100644
index 0000000..86d8638
Binary files /dev/null and b/src/lib/vgcore.566707 differ
diff --git a/src/lib/vgcore.568856 b/src/lib/vgcore.568856
new file mode 100644
index 0000000..df551d4
Binary files /dev/null and b/src/lib/vgcore.568856 differ
diff --git a/src/lib/vgcore.575537 b/src/lib/vgcore.575537
new file mode 100644
index 0000000..b6beb14
Binary files /dev/null and b/src/lib/vgcore.575537 differ
diff --git a/src/lib/vgcore.581649 b/src/lib/vgcore.581649
new file mode 100644
index 0000000..e255495
Binary files /dev/null and b/src/lib/vgcore.581649 differ
diff --git a/src/lib/vgcore.599107 b/src/lib/vgcore.599107
new file mode 100644
index 0000000..4f24f23
Binary files /dev/null and b/src/lib/vgcore.599107 differ
diff --git a/src/util/anastasis_crypto.c b/src/util/anastasis_crypto.c
index 6d22103..2762f52 100644
--- a/src/util/anastasis_crypto.c
+++ b/src/util/anastasis_crypto.c
@@ -378,7 +378,7 @@ ANASTASIS_CRYPTO_recovery_document_decrypt (
* @param enc_key_share[out] holds the encrypted share, the first 48 Bytes are
the used nonce and tag
*/
void
-ANASTASIS_CRYPTO_key_share_encrypt (
+ANASTASIS_CRYPTO_keyshare_encrypt (
const struct ANASTASIS_CRYPTO_KeyShare *key_share,
const struct ANASTASIS_CRYPTO_UserIdentifier *id,
struct ANASTASIS_CRYPTO_EncryptedKeyShare **enc_key_share)
@@ -409,7 +409,7 @@ ANASTASIS_CRYPTO_key_share_encrypt (
* @param key_share[out] the result of decryption
*/
void
-ANASTASIS_CRYPTO_key_share_decrypt (
+ANASTASIS_CRYPTO_keyshare_decrypt (
const struct ANASTASIS_CRYPTO_EncryptedKeyShare *enc_key_share,
const struct ANASTASIS_CRYPTO_UserIdentifier *id,
struct ANASTASIS_CRYPTO_KeyShare **key_share)
@@ -495,7 +495,7 @@ ANASTASIS_CRYPTO_truth_decrypt (
* @param key_share[out] reference to the created key share.
*/
void
-ANASTASIS_CRYPTO_key_share_create (
+ANASTASIS_CRYPTO_keyshare_create (
struct ANASTASIS_CRYPTO_KeyShare *key_share)
{
GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_STRONG,
diff --git a/src/util/test_anastasis_crypto.c b/src/util/test_anastasis_crypto.c
index 2c7f65c..ae12658 100644
--- a/src/util/test_anastasis_crypto.c
+++ b/src/util/test_anastasis_crypto.c
@@ -138,24 +138,24 @@ test_key_share (void)
GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_NONCE,
&id,
sizeof (struct ANASTASIS_CRYPTO_UserIdentifier));
- ANASTASIS_CRYPTO_key_share_create (&key_share);
+ ANASTASIS_CRYPTO_keyshare_create (&key_share);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"KEYSHARE_BEFORE: %s\n",
TALER_B2S (&key_share));
- ANASTASIS_CRYPTO_key_share_encrypt (&key_share,
- &id,
- &ciphertext);
- ANASTASIS_CRYPTO_key_share_decrypt (ciphertext,
- &id,
- &plaintext);
+ ANASTASIS_CRYPTO_keyshare_encrypt (&key_share,
+ &id,
+ &ciphertext);
+ ANASTASIS_CRYPTO_keyshare_decrypt (ciphertext,
+ &id,
+ &plaintext);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"KEYSHARE_AFTER: %s\n",
TALER_B2S (plaintext));
// testing creation of keyshares
- ANASTASIS_CRYPTO_key_share_create (&key_share_1);
- ANASTASIS_CRYPTO_key_share_create (&key_share_2);
+ ANASTASIS_CRYPTO_keyshare_create (&key_share_1);
+ ANASTASIS_CRYPTO_keyshare_create (&key_share_2);
GNUNET_assert (0 !=
GNUNET_memcmp (&key_share_1, &key_share_2));
@@ -223,7 +223,7 @@ test_core_secret (void)
struct ANASTASIS_CRYPTO_KeyShare keyshares[keyshare_length];
for (unsigned int j = 0; j < keyshare_length; j++)
{
- ANASTASIS_CRYPTO_key_share_create (&keyshares[j]);
+ ANASTASIS_CRYPTO_keyshare_create (&keyshares[j]);
if (j > 0)
GNUNET_assert (0 !=
GNUNET_memcmp (&keyshares[j - 1], &keyshares[j]));
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [taler-anastasis] branch master updated (f3a0f2e -> 5234d69), gnunet, 2020/04/20
- [taler-anastasis] 03/12: worked on keyshare request, gnunet, 2020/04/20
- [taler-anastasis] 05/12: fixed compiling warnings, gnunet, 2020/04/20
- [taler-anastasis] 04/12: fixed compiling errors, gnunet, 2020/04/20
- [taler-anastasis] 07/12: worked on keyshare lookup api, gnunet, 2020/04/20
- [taler-anastasis] 09/12: .gitignore, gnunet, 2020/04/20
- [taler-anastasis] 10/12: merge, gnunet, 2020/04/20
- [taler-anastasis] 08/12: .gitignore, gnunet, 2020/04/20
- [taler-anastasis] 06/12: worked on keyshare lookup testing,
gnunet <=
- [taler-anastasis] 01/12: modified header, gnunet, 2020/04/20
- [taler-anastasis] 02/12: worked on keyshare request, gnunet, 2020/04/20
- [taler-anastasis] 11/12: fix wrong GNUNET_assert usage..., gnunet, 2020/04/20
- [taler-anastasis] 12/12: worked on fixing uuid issue... still something wrong, gnunet, 2020/04/20