[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 108/171: -fixes
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] 108/171: -fixes |
Date: |
Thu, 04 Jan 2018 16:10:16 +0100 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
commit 8cb2e0da6845a2edad4be52a2c785715a91f4658
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Sun Jul 9 22:37:00 2017 +0200
-fixes
---
src/identity-provider/gnunet-idp.c | 6 ++--
.../gnunet-service-identity-provider.c | 32 +++++++++++++---------
2 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/src/identity-provider/gnunet-idp.c
b/src/identity-provider/gnunet-idp.c
index 2d7a1777f..6b2bdcc96 100644
--- a/src/identity-provider/gnunet-idp.c
+++ b/src/identity-provider/gnunet-idp.c
@@ -207,8 +207,8 @@ abe_lookup_cb (void *cls,
(void**)&new_record.data);
new_record.data_size = size;
new_record.record_type = GNUNET_GNSRECORD_TYPE_ABE_MASTER;
- new_record.expiration_time = GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us;
- new_record.flags = GNUNET_GNSRECORD_RF_PRIVATE;
+ new_record.expiration_time = GNUNET_TIME_UNIT_DAYS.rel_value_us;
+ new_record.flags = GNUNET_GNSRECORD_RF_PRIVATE |
GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION;
ns_qe = GNUNET_NAMESTORE_records_store (namestore_handle,
zone,
"+",
@@ -243,7 +243,7 @@ abe_lookup_cb (void *cls,
new_record.data_size = size;
new_record.record_type = GNUNET_GNSRECORD_TYPE_ID_ATTR;
new_record.expiration_time = GNUNET_TIME_UNIT_HOURS.rel_value_us;
- new_record.flags = GNUNET_GNSRECORD_RF_NONE;
+ new_record.flags = GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION;
ns_qe = GNUNET_NAMESTORE_records_store (namestore_handle,
zone,
diff --git a/src/identity-provider/gnunet-service-identity-provider.c
b/src/identity-provider/gnunet-service-identity-provider.c
index 1a6619227..8746e39f7 100644
--- a/src/identity-provider/gnunet-service-identity-provider.c
+++ b/src/identity-provider/gnunet-service-identity-provider.c
@@ -206,6 +206,8 @@ struct ParallelLookup
struct GNUNET_GNS_LookupRequest *lookup_request;
struct ExchangeHandle *handle;
+
+ char *label;
};
struct IssueHandle
@@ -567,7 +569,7 @@ serialize_abe_keyinfo (const struct IssueHandle *handle,
enc_keyinfo,
enc_size);
GNUNET_free (enc_keyinfo);
- return GNUNET_OK;
+ return sizeof (struct GNUNET_CRYPTO_EcdhePublicKey)+enc_size;
}
static void
@@ -901,8 +903,8 @@ static void
process_parallel_lookup (void *cls, uint32_t rd_count,
const struct GNUNET_GNSRECORD_Data *rd)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Parallel lookup finished\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+ "Parallel lookup finished (count=%u)\n", rd_count);
struct ParallelLookup *parallel_lookup = cls;
struct ExchangeHandle *handle = parallel_lookup->handle;
char *data;
@@ -920,9 +922,9 @@ process_parallel_lookup (void *cls, uint32_t rd_count,
rd->data_size,
handle->key,
(void**)&data);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Adding value: %s\n", data);
+ GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, "Adding value: %s\n", data);
token_add_attr (handle->token,
- label,
+ parallel_lookup->label,
data);
GNUNET_free (data);
}
@@ -930,13 +932,13 @@ process_parallel_lookup (void *cls, uint32_t rd_count,
i = 0;
for (; i < rd_count; i++)
{
- if (rd->record_type == GNUNET_GNSRECORD_TYPE_ID_ATTR)
+ if (rd[i].record_type == GNUNET_GNSRECORD_TYPE_ID_ATTR)
{
data = GNUNET_GNSRECORD_value_to_string (rd[i].record_type,
rd[i].data,
rd[i].data_size);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Adding value: %s\n", data);
- token_add_attr (handle->token, label, data);
+ GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, "Adding value: %s\n", data);
+ token_add_attr (handle->token, parallel_lookup->label, data);
GNUNET_free (data);
}
}
@@ -958,6 +960,7 @@ abort_parallel_lookups (void *cls)
for (lu = handle->parallel_lookups_head;
NULL != lu;) {
GNUNET_GNS_lookup_cancel (lu->lookup_request);
+ GNUNET_free (lu->label);
tmp = lu->next;
GNUNET_CONTAINER_DLL_remove (handle->parallel_lookups_head,
handle->parallel_lookups_tail,
@@ -1019,7 +1022,8 @@ process_lookup_result (void *cls, uint32_t rd_count,
size, rd->data_size - sizeof (struct
GNUNET_CRYPTO_EcdhePublicKey));
scopes = GNUNET_strdup (buf);
-
+ GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+ "Scopes %s\n", scopes);
handle->key = GNUNET_CRYPTO_cpabe_deserialize_key ((void*)(buf + strlen
(scopes) + 1),
rd->data_size - sizeof (struct
GNUNET_CRYPTO_EcdhePublicKey)
- strlen (scopes) - 1);
@@ -1027,15 +1031,17 @@ process_lookup_result (void *cls, uint32_t rd_count,
for (scope = strtok (scopes, ","); NULL != scope; scope = strtok (NULL, ","))
{
GNUNET_asprintf (&lookup_query,
- "%s.%s.gnu",
- scope,
- GNUNET_CRYPTO_ecdsa_public_key_to_string
(&handle->ticket->payload->identity_key));
+ "%s.gnu",
+ scope);
+ GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+ "Looking up %s\n", lookup_query);
parallel_lookup = GNUNET_new (struct ParallelLookup);
parallel_lookup->handle = handle;
+ parallel_lookup->label = GNUNET_strdup (scope);
parallel_lookup->lookup_request
= GNUNET_GNS_lookup (gns_handle,
lookup_query,
- &handle->ticket->aud_key,
+ &handle->ticket->payload->identity_key,
GNUNET_GNSRECORD_TYPE_ID_ATTR,
GNUNET_GNS_LO_LOCAL_MASTER,
&process_parallel_lookup,
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnunet] 103/171: Merge branch 'abe' into identity_abe, (continued)
- [GNUnet-SVN] [gnunet] 103/171: Merge branch 'abe' into identity_abe, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 112/171: Merge remote-tracking branch 'origin/master' into identity_abe, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 99/171: -add free ABE functions, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 90/171: -fix, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 125/171: -do not persist sensitive data, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 95/171: -fix, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 106/171: -fixes, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 114/171: -move idp gns record handling to identity-provider, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 75/171: -add policy record type, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 102/171: -fix leaks, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 108/171: -fixes,
gnunet <=
- [GNUnet-SVN] [gnunet] 111/171: Merge remote-tracking branch 'origin/master' into identity_abe, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 97/171: -add attr list, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 85/171: -add ABE crypto module, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 123/171: -fix bugs, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 138/171: -add new jwt handling, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 88/171: -add serialization, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 131/171: -more revocation, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 98/171: -add cli, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 92/171: Merge branch 'abe' into identity_abe, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 130/171: -towards ticket revocation, gnunet, 2018/01/04