diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2020-10-14 19:47:32 +0200 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2020-10-15 12:11:18 +0200 |
commit | 96c802b46be51e5c45f34e2de823f787d26c2929 (patch) | |
tree | 457ccfd8f9a61563af86318739c4a8f964a57025 /src/gns/gnunet-service-gns_resolver.c | |
parent | c14e3a2769ff0f15fdbb32797e37e43ce2344fa3 (diff) | |
download | gnunet-96c802b46be51e5c45f34e2de823f787d26c2929.tar.gz gnunet-96c802b46be51e5c45f34e2de823f787d26c2929.zip |
- towards crypto agility; wip
Diffstat (limited to 'src/gns/gnunet-service-gns_resolver.c')
-rw-r--r-- | src/gns/gnunet-service-gns_resolver.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c index cb75b23c7..b34402f81 100644 --- a/src/gns/gnunet-service-gns_resolver.c +++ b/src/gns/gnunet-service-gns_resolver.c | |||
@@ -173,7 +173,7 @@ struct AuthorityChain | |||
173 | /** | 173 | /** |
174 | * The zone of the GNS authority | 174 | * The zone of the GNS authority |
175 | */ | 175 | */ |
176 | struct GNUNET_CRYPTO_EcdsaPublicKey gns_authority; | 176 | struct GNUNET_IDENTITY_PublicKey gns_authority; |
177 | 177 | ||
178 | struct | 178 | struct |
179 | { | 179 | { |
@@ -305,7 +305,7 @@ struct GNS_ResolverHandle | |||
305 | /** | 305 | /** |
306 | * The top-level GNS authoritative zone to query | 306 | * The top-level GNS authoritative zone to query |
307 | */ | 307 | */ |
308 | struct GNUNET_CRYPTO_EcdsaPublicKey authority_zone; | 308 | struct GNUNET_IDENTITY_PublicKey authority_zone; |
309 | 309 | ||
310 | /** | 310 | /** |
311 | * called when resolution phase finishes | 311 | * called when resolution phase finishes |
@@ -1251,7 +1251,7 @@ handle_gns_cname_result (struct GNS_ResolverHandle *rh, | |||
1251 | const char *tld; | 1251 | const char *tld; |
1252 | struct AuthorityChain *ac; | 1252 | struct AuthorityChain *ac; |
1253 | int af; | 1253 | int af; |
1254 | struct GNUNET_CRYPTO_EcdsaPublicKey zone; | 1254 | struct GNUNET_IDENTITY_PublicKey zone; |
1255 | 1255 | ||
1256 | nlen = strlen (cname); | 1256 | nlen = strlen (cname); |
1257 | tld = GNS_get_tld (cname); | 1257 | tld = GNS_get_tld (cname); |
@@ -1698,7 +1698,7 @@ recursive_pkey_resolution (struct GNS_ResolverHandle *rh, | |||
1698 | struct AuthorityChain *ac; | 1698 | struct AuthorityChain *ac; |
1699 | 1699 | ||
1700 | /* delegation to another zone */ | 1700 | /* delegation to another zone */ |
1701 | if (sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey) != | 1701 | if (sizeof(struct GNUNET_IDENTITY_PublicKey) != |
1702 | rd->data_size) | 1702 | rd->data_size) |
1703 | { | 1703 | { |
1704 | GNUNET_break_op (0); | 1704 | GNUNET_break_op (0); |
@@ -1711,7 +1711,7 @@ recursive_pkey_resolution (struct GNS_ResolverHandle *rh, | |||
1711 | ac->gns_authority = GNUNET_YES; | 1711 | ac->gns_authority = GNUNET_YES; |
1712 | GNUNET_memcpy (&ac->authority_info.gns_authority, | 1712 | GNUNET_memcpy (&ac->authority_info.gns_authority, |
1713 | rd->data, | 1713 | rd->data, |
1714 | sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey)); | 1714 | sizeof(struct GNUNET_IDENTITY_PublicKey)); |
1715 | ac->label = resolver_lookup_get_next_label (rh); | 1715 | ac->label = resolver_lookup_get_next_label (rh); |
1716 | /* add AC to tail */ | 1716 | /* add AC to tail */ |
1717 | GNUNET_CONTAINER_DLL_insert_tail (rh->ac_head, | 1717 | GNUNET_CONTAINER_DLL_insert_tail (rh->ac_head, |
@@ -1754,7 +1754,7 @@ recursive_gns2dns_resolution (struct GNS_ResolverHandle *rh, | |||
1754 | char *n; | 1754 | char *n; |
1755 | size_t off; | 1755 | size_t off; |
1756 | struct Gns2DnsPending *gp; | 1756 | struct Gns2DnsPending *gp; |
1757 | struct GNUNET_CRYPTO_EcdsaPublicKey zone; | 1757 | struct GNUNET_IDENTITY_PublicKey zone; |
1758 | struct sockaddr_in v4; | 1758 | struct sockaddr_in v4; |
1759 | struct sockaddr_in6 v6; | 1759 | struct sockaddr_in6 v6; |
1760 | 1760 | ||
@@ -2258,9 +2258,9 @@ handle_gns_resolution_result (void *cls, | |||
2258 | 2258 | ||
2259 | case GNUNET_GNSRECORD_TYPE_PKEY: | 2259 | case GNUNET_GNSRECORD_TYPE_PKEY: |
2260 | { | 2260 | { |
2261 | struct GNUNET_CRYPTO_EcdsaPublicKey pub; | 2261 | struct GNUNET_IDENTITY_PublicKey pub; |
2262 | 2262 | ||
2263 | if (rd[i].data_size != sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey)) | 2263 | if (rd[i].data_size != sizeof(struct GNUNET_IDENTITY_PublicKey)) |
2264 | { | 2264 | { |
2265 | GNUNET_break_op (0); | 2265 | GNUNET_break_op (0); |
2266 | break; | 2266 | break; |
@@ -2471,7 +2471,7 @@ handle_dht_response (void *cls, | |||
2471 | block = data; | 2471 | block = data; |
2472 | if (size != | 2472 | if (size != |
2473 | ntohl (block->purpose.size) | 2473 | ntohl (block->purpose.size) |
2474 | + sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey) | 2474 | + sizeof(struct GNUNET_IDENTITY_PublicKey) |
2475 | + sizeof(struct GNUNET_CRYPTO_EcdsaSignature)) | 2475 | + sizeof(struct GNUNET_CRYPTO_EcdsaSignature)) |
2476 | { | 2476 | { |
2477 | /* how did this pass DHT block validation!? */ | 2477 | /* how did this pass DHT block validation!? */ |
@@ -2594,7 +2594,7 @@ handle_namecache_block_response (void *cls, | |||
2594 | struct GNS_ResolverHandle *rh = cls; | 2594 | struct GNS_ResolverHandle *rh = cls; |
2595 | struct AuthorityChain *ac = rh->ac_tail; | 2595 | struct AuthorityChain *ac = rh->ac_tail; |
2596 | const char *label = ac->label; | 2596 | const char *label = ac->label; |
2597 | const struct GNUNET_CRYPTO_EcdsaPublicKey *auth = | 2597 | const struct GNUNET_IDENTITY_PublicKey *auth = |
2598 | &ac->authority_info.gns_authority; | 2598 | &ac->authority_info.gns_authority; |
2599 | struct GNUNET_HashCode query; | 2599 | struct GNUNET_HashCode query; |
2600 | 2600 | ||
@@ -2857,7 +2857,7 @@ start_resolver_lookup (void *cls) | |||
2857 | * @return handle to cancel operation | 2857 | * @return handle to cancel operation |
2858 | */ | 2858 | */ |
2859 | struct GNS_ResolverHandle * | 2859 | struct GNS_ResolverHandle * |
2860 | GNS_resolver_lookup (const struct GNUNET_CRYPTO_EcdsaPublicKey *zone, | 2860 | GNS_resolver_lookup (const struct GNUNET_IDENTITY_PublicKey *zone, |
2861 | uint32_t record_type, | 2861 | uint32_t record_type, |
2862 | const char *name, | 2862 | const char *name, |
2863 | enum GNUNET_GNS_LocalOptions options, | 2863 | enum GNUNET_GNS_LocalOptions options, |