diff options
Diffstat (limited to 'src/gns/gnunet-service-gns_resolver.c')
-rw-r--r-- | src/gns/gnunet-service-gns_resolver.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c index 676efafe5..a857be559 100644 --- a/src/gns/gnunet-service-gns_resolver.c +++ b/src/gns/gnunet-service-gns_resolver.c | |||
@@ -112,7 +112,7 @@ struct AuthorityChain | |||
112 | /** | 112 | /** |
113 | * The zone of the GNS authority | 113 | * The zone of the GNS authority |
114 | */ | 114 | */ |
115 | struct GNUNET_CRYPTO_EccPublicKey gns_authority; | 115 | struct GNUNET_CRYPTO_EccPublicSignKey gns_authority; |
116 | 116 | ||
117 | struct | 117 | struct |
118 | { | 118 | { |
@@ -230,7 +230,7 @@ struct GNS_ResolverHandle | |||
230 | /** | 230 | /** |
231 | * The top-level GNS authoritative zone to query | 231 | * The top-level GNS authoritative zone to query |
232 | */ | 232 | */ |
233 | struct GNUNET_CRYPTO_EccPublicKey authority_zone; | 233 | struct GNUNET_CRYPTO_EccPublicSignKey authority_zone; |
234 | 234 | ||
235 | /** | 235 | /** |
236 | * called when resolution phase finishes | 236 | * called when resolution phase finishes |
@@ -1317,9 +1317,9 @@ handle_gns_resolution_result (void *cls, | |||
1317 | /* tigger shortening */ | 1317 | /* tigger shortening */ |
1318 | if (NULL != rh->shorten_key) | 1318 | if (NULL != rh->shorten_key) |
1319 | { | 1319 | { |
1320 | struct GNUNET_CRYPTO_EccPublicKey pub; | 1320 | struct GNUNET_CRYPTO_EccPublicSignKey pub; |
1321 | 1321 | ||
1322 | if (rd[i].data_size != sizeof (struct GNUNET_CRYPTO_EccPublicKey)) | 1322 | if (rd[i].data_size != sizeof (struct GNUNET_CRYPTO_EccPublicSignKey)) |
1323 | { | 1323 | { |
1324 | GNUNET_break_op (0); | 1324 | GNUNET_break_op (0); |
1325 | break; | 1325 | break; |
@@ -1346,7 +1346,7 @@ handle_gns_resolution_result (void *cls, | |||
1346 | { | 1346 | { |
1347 | case GNUNET_NAMESTORE_TYPE_PKEY: | 1347 | case GNUNET_NAMESTORE_TYPE_PKEY: |
1348 | /* delegation to another zone */ | 1348 | /* delegation to another zone */ |
1349 | if (sizeof (struct GNUNET_CRYPTO_EccPublicKey) != | 1349 | if (sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) != |
1350 | rd[i].data_size) | 1350 | rd[i].data_size) |
1351 | { | 1351 | { |
1352 | GNUNET_break_op (0); | 1352 | GNUNET_break_op (0); |
@@ -1360,7 +1360,7 @@ handle_gns_resolution_result (void *cls, | |||
1360 | ac->gns_authority = GNUNET_YES; | 1360 | ac->gns_authority = GNUNET_YES; |
1361 | memcpy (&ac->authority_info.gns_authority, | 1361 | memcpy (&ac->authority_info.gns_authority, |
1362 | rd[i].data, | 1362 | rd[i].data, |
1363 | sizeof (struct GNUNET_CRYPTO_EccPublicKey)); | 1363 | sizeof (struct GNUNET_CRYPTO_EccPublicSignKey)); |
1364 | ac->label = resolver_lookup_get_next_label (rh); | 1364 | ac->label = resolver_lookup_get_next_label (rh); |
1365 | /* tigger shortening */ | 1365 | /* tigger shortening */ |
1366 | if (NULL != rh->shorten_key) | 1366 | if (NULL != rh->shorten_key) |
@@ -1572,7 +1572,7 @@ handle_dht_response (void *cls, | |||
1572 | block = data; | 1572 | block = data; |
1573 | if (size != | 1573 | if (size != |
1574 | ntohs (block->purpose.size) + | 1574 | ntohs (block->purpose.size) + |
1575 | sizeof (struct GNUNET_CRYPTO_EccPublicKey) + | 1575 | sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) + |
1576 | sizeof (struct GNUNET_CRYPTO_EccSignature)) | 1576 | sizeof (struct GNUNET_CRYPTO_EccSignature)) |
1577 | { | 1577 | { |
1578 | /* how did this pass DHT block validation!? */ | 1578 | /* how did this pass DHT block validation!? */ |
@@ -1615,7 +1615,7 @@ handle_namestore_block_response (void *cls, | |||
1615 | struct GNS_ResolverHandle *rx; | 1615 | struct GNS_ResolverHandle *rx; |
1616 | struct AuthorityChain *ac = rh->ac_tail; | 1616 | struct AuthorityChain *ac = rh->ac_tail; |
1617 | const char *label = ac->label; | 1617 | const char *label = ac->label; |
1618 | const struct GNUNET_CRYPTO_EccPublicKey *auth = &ac->authority_info.gns_authority; | 1618 | const struct GNUNET_CRYPTO_EccPublicSignKey *auth = &ac->authority_info.gns_authority; |
1619 | struct GNUNET_HashCode query; | 1619 | struct GNUNET_HashCode query; |
1620 | 1620 | ||
1621 | GNUNET_NAMESTORE_query_from_public_key (auth, | 1621 | GNUNET_NAMESTORE_query_from_public_key (auth, |
@@ -1774,7 +1774,7 @@ start_resolver_lookup (struct GNS_ResolverHandle *rh) | |||
1774 | if ( (NULL == x) || | 1774 | if ( (NULL == x) || |
1775 | (NULL == y) || | 1775 | (NULL == y) || |
1776 | (GNUNET_OK != | 1776 | (GNUNET_OK != |
1777 | GNUNET_CRYPTO_ecc_public_key_from_string (pkey, | 1777 | GNUNET_CRYPTO_ecc_public_sign_key_from_string (pkey, |
1778 | strlen (pkey), | 1778 | strlen (pkey), |
1779 | &rh->authority_zone)) ) | 1779 | &rh->authority_zone)) ) |
1780 | { | 1780 | { |
@@ -1822,7 +1822,7 @@ start_resolver_lookup (struct GNS_ResolverHandle *rh) | |||
1822 | * @return handle to cancel operation | 1822 | * @return handle to cancel operation |
1823 | */ | 1823 | */ |
1824 | struct GNS_ResolverHandle * | 1824 | struct GNS_ResolverHandle * |
1825 | GNS_resolver_lookup (const struct GNUNET_CRYPTO_EccPublicKey *zone, | 1825 | GNS_resolver_lookup (const struct GNUNET_CRYPTO_EccPublicSignKey *zone, |
1826 | uint32_t record_type, | 1826 | uint32_t record_type, |
1827 | const char *name, | 1827 | const char *name, |
1828 | const struct GNUNET_CRYPTO_EccPrivateKey *shorten_key, | 1828 | const struct GNUNET_CRYPTO_EccPrivateKey *shorten_key, |