diff options
Diffstat (limited to 'src/gns/gnunet-service-gns_shorten.c')
-rw-r--r-- | src/gns/gnunet-service-gns_shorten.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gns/gnunet-service-gns_shorten.c b/src/gns/gnunet-service-gns_shorten.c index b0a1b6fbc..49089f542 100644 --- a/src/gns/gnunet-service-gns_shorten.c +++ b/src/gns/gnunet-service-gns_shorten.c | |||
@@ -80,7 +80,7 @@ struct GetPseuAuthorityHandle | |||
80 | /** | 80 | /** |
81 | * The zone for which we are trying to find the PSEU record. | 81 | * The zone for which we are trying to find the PSEU record. |
82 | */ | 82 | */ |
83 | struct GNUNET_CRYPTO_EccPublicKey target_zone; | 83 | struct GNUNET_CRYPTO_EccPublicSignKey target_zone; |
84 | 84 | ||
85 | /** | 85 | /** |
86 | * Handle for DHT lookups. Should be NULL if no lookups are in progress | 86 | * Handle for DHT lookups. Should be NULL if no lookups are in progress |
@@ -195,7 +195,7 @@ process_pseu_block_ns (void *cls, | |||
195 | const struct GNUNET_NAMESTORE_Block *block) | 195 | const struct GNUNET_NAMESTORE_Block *block) |
196 | { | 196 | { |
197 | struct GetPseuAuthorityHandle *gph = cls; | 197 | struct GetPseuAuthorityHandle *gph = cls; |
198 | struct GNUNET_CRYPTO_EccPublicKey pub; | 198 | struct GNUNET_CRYPTO_EccPublicSignKey pub; |
199 | 199 | ||
200 | gph->namestore_task = NULL; | 200 | gph->namestore_task = NULL; |
201 | if (NULL == block) | 201 | if (NULL == block) |
@@ -203,7 +203,7 @@ process_pseu_block_ns (void *cls, | |||
203 | process_pseu_lookup_ns (gph, 0, NULL); | 203 | process_pseu_lookup_ns (gph, 0, NULL); |
204 | return; | 204 | return; |
205 | } | 205 | } |
206 | GNUNET_CRYPTO_ecc_key_get_public (&gph->shorten_zone_key, | 206 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (&gph->shorten_zone_key, |
207 | &pub); | 207 | &pub); |
208 | if (GNUNET_OK != | 208 | if (GNUNET_OK != |
209 | GNUNET_NAMESTORE_block_decrypt (block, | 209 | GNUNET_NAMESTORE_block_decrypt (block, |
@@ -229,10 +229,10 @@ static void | |||
229 | perform_pseu_lookup (struct GetPseuAuthorityHandle *gph, | 229 | perform_pseu_lookup (struct GetPseuAuthorityHandle *gph, |
230 | const char *label) | 230 | const char *label) |
231 | { | 231 | { |
232 | struct GNUNET_CRYPTO_EccPublicKey pub; | 232 | struct GNUNET_CRYPTO_EccPublicSignKey pub; |
233 | struct GNUNET_HashCode query; | 233 | struct GNUNET_HashCode query; |
234 | 234 | ||
235 | GNUNET_CRYPTO_ecc_key_get_public (&gph->shorten_zone_key, | 235 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (&gph->shorten_zone_key, |
236 | &pub); | 236 | &pub); |
237 | GNUNET_free_non_null (gph->current_label); | 237 | GNUNET_free_non_null (gph->current_label); |
238 | gph->current_label = GNUNET_strdup (label); | 238 | gph->current_label = GNUNET_strdup (label); |
@@ -287,7 +287,7 @@ process_pseu_lookup_ns (void *cls, | |||
287 | GNUNET_NAMESTORE_z2s (&gph->target_zone), | 287 | GNUNET_NAMESTORE_z2s (&gph->target_zone), |
288 | gph->current_label); | 288 | gph->current_label); |
289 | new_pkey.expiration_time = UINT64_MAX; | 289 | new_pkey.expiration_time = UINT64_MAX; |
290 | new_pkey.data_size = sizeof (struct GNUNET_CRYPTO_EccPublicKey); | 290 | new_pkey.data_size = sizeof (struct GNUNET_CRYPTO_EccPublicSignKey); |
291 | new_pkey.data = &gph->target_zone; | 291 | new_pkey.data = &gph->target_zone; |
292 | new_pkey.record_type = GNUNET_NAMESTORE_TYPE_PKEY; | 292 | new_pkey.record_type = GNUNET_NAMESTORE_TYPE_PKEY; |
293 | new_pkey.flags = GNUNET_NAMESTORE_RF_NONE | 293 | new_pkey.flags = GNUNET_NAMESTORE_RF_NONE |
@@ -431,7 +431,7 @@ process_auth_discovery_dht_result (void* cls, | |||
431 | block = data; | 431 | block = data; |
432 | if (size != | 432 | if (size != |
433 | ntohs (block->purpose.size) + | 433 | ntohs (block->purpose.size) + |
434 | sizeof (struct GNUNET_CRYPTO_EccPublicKey) + | 434 | sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) + |
435 | sizeof (struct GNUNET_CRYPTO_EccSignature)) | 435 | sizeof (struct GNUNET_CRYPTO_EccSignature)) |
436 | { | 436 | { |
437 | /* how did this pass DHT block validation!? */ | 437 | /* how did this pass DHT block validation!? */ |
@@ -513,7 +513,7 @@ process_zone_to_name_discover (void *cls, | |||
513 | */ | 513 | */ |
514 | void | 514 | void |
515 | GNS_shorten_start (const char *original_label, | 515 | GNS_shorten_start (const char *original_label, |
516 | const struct GNUNET_CRYPTO_EccPublicKey *pub, | 516 | const struct GNUNET_CRYPTO_EccPublicSignKey *pub, |
517 | const struct GNUNET_CRYPTO_EccPrivateKey *shorten_zone) | 517 | const struct GNUNET_CRYPTO_EccPrivateKey *shorten_zone) |
518 | { | 518 | { |
519 | struct GetPseuAuthorityHandle *gph; | 519 | struct GetPseuAuthorityHandle *gph; |