diff options
Diffstat (limited to 'src/gns/gnunet-service-gns_resolver.c')
-rw-r--r-- | src/gns/gnunet-service-gns_resolver.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c index b6a81b3a1..aa0189b15 100644 --- a/src/gns/gnunet-service-gns_resolver.c +++ b/src/gns/gnunet-service-gns_resolver.c | |||
@@ -164,7 +164,7 @@ struct AuthorityChain | |||
164 | /** | 164 | /** |
165 | * The zone of the GNS authority | 165 | * The zone of the GNS authority |
166 | */ | 166 | */ |
167 | struct GNUNET_IDENTITY_PublicKey gns_authority; | 167 | struct GNUNET_CRYPTO_PublicKey gns_authority; |
168 | 168 | ||
169 | struct | 169 | struct |
170 | { | 170 | { |
@@ -264,7 +264,7 @@ struct GNS_ResolverHandle | |||
264 | /** | 264 | /** |
265 | * The top-level GNS authoritative zone to query | 265 | * The top-level GNS authoritative zone to query |
266 | */ | 266 | */ |
267 | struct GNUNET_IDENTITY_PublicKey authority_zone; | 267 | struct GNUNET_CRYPTO_PublicKey authority_zone; |
268 | 268 | ||
269 | /** | 269 | /** |
270 | * called when resolution phase finishes | 270 | * called when resolution phase finishes |
@@ -1213,7 +1213,7 @@ handle_gns_redirect_result (struct GNS_ResolverHandle *rh, | |||
1213 | const char *tld; | 1213 | const char *tld; |
1214 | struct AuthorityChain *ac; | 1214 | struct AuthorityChain *ac; |
1215 | int af; | 1215 | int af; |
1216 | struct GNUNET_IDENTITY_PublicKey zone; | 1216 | struct GNUNET_CRYPTO_PublicKey zone; |
1217 | 1217 | ||
1218 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1218 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1219 | "Handling GNS REDIRECT result `%s'\n", | 1219 | "Handling GNS REDIRECT result `%s'\n", |
@@ -1644,7 +1644,7 @@ recursive_pkey_resolution (struct GNS_ResolverHandle *rh, | |||
1644 | const struct GNUNET_GNSRECORD_Data *rd) | 1644 | const struct GNUNET_GNSRECORD_Data *rd) |
1645 | { | 1645 | { |
1646 | struct AuthorityChain *ac; | 1646 | struct AuthorityChain *ac; |
1647 | struct GNUNET_IDENTITY_PublicKey auth; | 1647 | struct GNUNET_CRYPTO_PublicKey auth; |
1648 | 1648 | ||
1649 | /* delegation to another zone */ | 1649 | /* delegation to another zone */ |
1650 | if (GNUNET_OK != GNUNET_GNSRECORD_identity_from_data (rd->data, | 1650 | if (GNUNET_OK != GNUNET_GNSRECORD_identity_from_data (rd->data, |
@@ -1703,7 +1703,7 @@ recursive_gns2dns_resolution (struct GNS_ResolverHandle *rh, | |||
1703 | char *n; | 1703 | char *n; |
1704 | size_t off; | 1704 | size_t off; |
1705 | struct Gns2DnsPending *gp; | 1705 | struct Gns2DnsPending *gp; |
1706 | struct GNUNET_IDENTITY_PublicKey zone; | 1706 | struct GNUNET_CRYPTO_PublicKey zone; |
1707 | struct sockaddr_in v4; | 1707 | struct sockaddr_in v4; |
1708 | struct sockaddr_in6 v6; | 1708 | struct sockaddr_in6 v6; |
1709 | 1709 | ||
@@ -2173,7 +2173,7 @@ handle_gns_resolution_result (void *cls, | |||
2173 | case GNUNET_GNSRECORD_TYPE_PKEY: | 2173 | case GNUNET_GNSRECORD_TYPE_PKEY: |
2174 | case GNUNET_GNSRECORD_TYPE_EDKEY: | 2174 | case GNUNET_GNSRECORD_TYPE_EDKEY: |
2175 | { | 2175 | { |
2176 | struct GNUNET_IDENTITY_PublicKey pubkey; | 2176 | struct GNUNET_CRYPTO_PublicKey pubkey; |
2177 | if (rd[i].data_size < sizeof(uint32_t)) | 2177 | if (rd[i].data_size < sizeof(uint32_t)) |
2178 | { | 2178 | { |
2179 | GNUNET_break_op (0); | 2179 | GNUNET_break_op (0); |
@@ -2530,7 +2530,7 @@ handle_namecache_block_response (void *cls, | |||
2530 | struct GNS_ResolverHandle *rh = cls; | 2530 | struct GNS_ResolverHandle *rh = cls; |
2531 | struct AuthorityChain *ac = rh->ac_tail; | 2531 | struct AuthorityChain *ac = rh->ac_tail; |
2532 | const char *label = ac->label; | 2532 | const char *label = ac->label; |
2533 | const struct GNUNET_IDENTITY_PublicKey *auth = | 2533 | const struct GNUNET_CRYPTO_PublicKey *auth = |
2534 | &ac->authority_info.gns_authority; | 2534 | &ac->authority_info.gns_authority; |
2535 | struct GNUNET_HashCode query; | 2535 | struct GNUNET_HashCode query; |
2536 | 2536 | ||
@@ -2790,7 +2790,7 @@ start_resolver_lookup (void *cls) | |||
2790 | * @return handle to cancel operation | 2790 | * @return handle to cancel operation |
2791 | */ | 2791 | */ |
2792 | struct GNS_ResolverHandle * | 2792 | struct GNS_ResolverHandle * |
2793 | GNS_resolver_lookup (const struct GNUNET_IDENTITY_PublicKey *zone, | 2793 | GNS_resolver_lookup (const struct GNUNET_CRYPTO_PublicKey *zone, |
2794 | uint32_t record_type, | 2794 | uint32_t record_type, |
2795 | const char *name, | 2795 | const char *name, |
2796 | enum GNUNET_GNS_LocalOptions options, | 2796 | enum GNUNET_GNS_LocalOptions options, |