diff options
Diffstat (limited to 'src/gns')
27 files changed, 114 insertions, 114 deletions
diff --git a/src/gns/gns.h b/src/gns/gns.h index d72c1f03d..9e7a15575 100644 --- a/src/gns/gns.h +++ b/src/gns/gns.h | |||
@@ -63,7 +63,7 @@ struct GNUNET_GNS_ClientLookupMessage | |||
63 | /** | 63 | /** |
64 | * Zone that is to be used for lookup | 64 | * Zone that is to be used for lookup |
65 | */ | 65 | */ |
66 | struct GNUNET_CRYPTO_EccPublicKey zone; | 66 | struct GNUNET_CRYPTO_EccPublicSignKey zone; |
67 | 67 | ||
68 | /** | 68 | /** |
69 | * Only check cached results | 69 | * Only check cached results |
diff --git a/src/gns/gns_api.c b/src/gns/gns_api.c index 63d42ffee..de5c6062a 100644 --- a/src/gns/gns_api.c +++ b/src/gns/gns_api.c | |||
@@ -521,7 +521,7 @@ GNUNET_GNS_lookup_cancel (struct GNUNET_GNS_LookupRequest *lr) | |||
521 | struct GNUNET_GNS_LookupRequest* | 521 | struct GNUNET_GNS_LookupRequest* |
522 | GNUNET_GNS_lookup (struct GNUNET_GNS_Handle *handle, | 522 | GNUNET_GNS_lookup (struct GNUNET_GNS_Handle *handle, |
523 | const char *name, | 523 | const char *name, |
524 | const struct GNUNET_CRYPTO_EccPublicKey *zone, | 524 | const struct GNUNET_CRYPTO_EccPublicSignKey *zone, |
525 | int type, | 525 | int type, |
526 | int only_cached, | 526 | int only_cached, |
527 | const struct GNUNET_CRYPTO_EccPrivateKey *shorten_zone_key, | 527 | const struct GNUNET_CRYPTO_EccPrivateKey *shorten_zone_key, |
diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c index b65e45757..70c791de4 100644 --- a/src/gns/gnunet-dns2gns.c +++ b/src/gns/gnunet-dns2gns.c | |||
@@ -143,7 +143,7 @@ static unsigned int listen_port = 53; | |||
143 | /** | 143 | /** |
144 | * Which GNS zone do we translate incoming DNS requests to? | 144 | * Which GNS zone do we translate incoming DNS requests to? |
145 | */ | 145 | */ |
146 | static struct GNUNET_CRYPTO_EccPublicKey my_zone; | 146 | static struct GNUNET_CRYPTO_EccPublicSignKey my_zone; |
147 | 147 | ||
148 | /** | 148 | /** |
149 | * '-z' option with the main zone to use. | 149 | * '-z' option with the main zone to use. |
@@ -744,7 +744,7 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
744 | } | 744 | } |
745 | if ( (NULL == gns_zone_str) || | 745 | if ( (NULL == gns_zone_str) || |
746 | (GNUNET_OK != | 746 | (GNUNET_OK != |
747 | GNUNET_CRYPTO_ecc_public_key_from_string (gns_zone_str, | 747 | GNUNET_CRYPTO_ecc_public_sign_key_from_string (gns_zone_str, |
748 | strlen (gns_zone_str), | 748 | strlen (gns_zone_str), |
749 | &my_zone)) ) | 749 | &my_zone)) ) |
750 | { | 750 | { |
diff --git a/src/gns/gnunet-gns-helper-service-w32.c b/src/gns/gnunet-gns-helper-service-w32.c index 2c4f0e20a..4e5aeffc5 100644 --- a/src/gns/gnunet-gns-helper-service-w32.c +++ b/src/gns/gnunet-gns-helper-service-w32.c | |||
@@ -61,7 +61,7 @@ struct request | |||
61 | */ | 61 | */ |
62 | static struct GNUNET_GNS_Handle *gns; | 62 | static struct GNUNET_GNS_Handle *gns; |
63 | 63 | ||
64 | static struct GNUNET_CRYPTO_EccPublicKey *zone = NULL; | 64 | static struct GNUNET_CRYPTO_EccPublicSignKey *zone = NULL; |
65 | static struct GNUNET_HashCode user_zone; | 65 | static struct GNUNET_HashCode user_zone; |
66 | struct GNUNET_CRYPTO_EccPrivateKey *shorten_key = NULL; | 66 | struct GNUNET_CRYPTO_EccPrivateKey *shorten_key = NULL; |
67 | 67 | ||
@@ -663,7 +663,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
663 | 663 | ||
664 | char* keyfile; | 664 | char* keyfile; |
665 | struct GNUNET_CRYPTO_EccPrivateKey *key = NULL; | 665 | struct GNUNET_CRYPTO_EccPrivateKey *key = NULL; |
666 | struct GNUNET_CRYPTO_EccPublicKey pkey; | 666 | struct GNUNET_CRYPTO_EccPublicSignKey pkey; |
667 | struct GNUNET_CRYPTO_HashAsciiEncoded zonename; | 667 | struct GNUNET_CRYPTO_HashAsciiEncoded zonename; |
668 | 668 | ||
669 | if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns", | 669 | if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns", |
@@ -678,8 +678,8 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
678 | if (GNUNET_YES == GNUNET_DISK_file_test (keyfile)) | 678 | if (GNUNET_YES == GNUNET_DISK_file_test (keyfile)) |
679 | { | 679 | { |
680 | key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile); | 680 | key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile); |
681 | GNUNET_CRYPTO_ecc_key_get_public (key, &pkey); | 681 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (key, &pkey); |
682 | GNUNET_CRYPTO_hash (&pkey, sizeof(struct GNUNET_CRYPTO_EccPublicKey), | 682 | GNUNET_CRYPTO_hash (&pkey, sizeof(struct GNUNET_CRYPTO_EccPublicSignKey), |
683 | &user_zone); | 683 | &user_zone); |
684 | GNUNET_CRYPTO_hash_to_enc (&user_zone, &zonename); | 684 | GNUNET_CRYPTO_hash_to_enc (&user_zone, &zonename); |
685 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 685 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index 3a3678df1..7ccd14470 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c | |||
@@ -3189,7 +3189,7 @@ load_local_zone_key (const struct GNUNET_CONFIGURATION_Handle *cfg) | |||
3189 | { | 3189 | { |
3190 | char *keyfile; | 3190 | char *keyfile; |
3191 | struct GNUNET_CRYPTO_EccPrivateKey *key; | 3191 | struct GNUNET_CRYPTO_EccPrivateKey *key; |
3192 | struct GNUNET_CRYPTO_EccPublicKey pkey; | 3192 | struct GNUNET_CRYPTO_EccPublicSignKey pkey; |
3193 | struct GNUNET_CRYPTO_ShortHashCode *zone; | 3193 | struct GNUNET_CRYPTO_ShortHashCode *zone; |
3194 | struct GNUNET_CRYPTO_ShortHashAsciiEncoded zonename; | 3194 | struct GNUNET_CRYPTO_ShortHashAsciiEncoded zonename; |
3195 | 3195 | ||
@@ -3210,10 +3210,10 @@ load_local_zone_key (const struct GNUNET_CONFIGURATION_Handle *cfg) | |||
3210 | } | 3210 | } |
3211 | 3211 | ||
3212 | key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile); | 3212 | key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile); |
3213 | GNUNET_CRYPTO_ecc_key_get_public (key, &pkey); | 3213 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (key, &pkey); |
3214 | local_gns_zone = GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_ShortHashCode)); | 3214 | local_gns_zone = GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_ShortHashCode)); |
3215 | GNUNET_CRYPTO_short_hash (&pkey, | 3215 | GNUNET_CRYPTO_short_hash (&pkey, |
3216 | sizeof (struct GNUNET_CRYPTO_EccPublicKey), | 3216 | sizeof (struct GNUNET_CRYPTO_EccPublicSignKey), |
3217 | local_gns_zone); | 3217 | local_gns_zone); |
3218 | zone = local_gns_zone; | 3218 | zone = local_gns_zone; |
3219 | GNUNET_CRYPTO_short_hash_to_enc (zone, &zonename); | 3219 | GNUNET_CRYPTO_short_hash_to_enc (zone, &zonename); |
@@ -3239,10 +3239,10 @@ load_local_zone_key (const struct GNUNET_CONFIGURATION_Handle *cfg) | |||
3239 | else | 3239 | else |
3240 | { | 3240 | { |
3241 | key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile); | 3241 | key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile); |
3242 | GNUNET_CRYPTO_ecc_key_get_public (key, &pkey); | 3242 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (key, &pkey); |
3243 | local_private_zone = GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_ShortHashCode)); | 3243 | local_private_zone = GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_ShortHashCode)); |
3244 | GNUNET_CRYPTO_short_hash (&pkey, | 3244 | GNUNET_CRYPTO_short_hash (&pkey, |
3245 | sizeof (struct GNUNET_CRYPTO_EccPublicKey), | 3245 | sizeof (struct GNUNET_CRYPTO_EccPublicSignKey), |
3246 | local_private_zone); | 3246 | local_private_zone); |
3247 | GNUNET_CRYPTO_short_hash_to_enc (zone, &zonename); | 3247 | GNUNET_CRYPTO_short_hash_to_enc (zone, &zonename); |
3248 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 3248 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
@@ -3268,10 +3268,10 @@ load_local_zone_key (const struct GNUNET_CONFIGURATION_Handle *cfg) | |||
3268 | else | 3268 | else |
3269 | { | 3269 | { |
3270 | key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile); | 3270 | key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile); |
3271 | GNUNET_CRYPTO_ecc_key_get_public (key, &pkey); | 3271 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (key, &pkey); |
3272 | local_shorten_zone = GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_ShortHashCode)); | 3272 | local_shorten_zone = GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_ShortHashCode)); |
3273 | GNUNET_CRYPTO_short_hash (&pkey, | 3273 | GNUNET_CRYPTO_short_hash (&pkey, |
3274 | sizeof(struct GNUNET_CRYPTO_EccPublicKey), | 3274 | sizeof(struct GNUNET_CRYPTO_EccPublicSignKey), |
3275 | local_shorten_zone); | 3275 | local_shorten_zone); |
3276 | GNUNET_CRYPTO_short_hash_to_enc (zone, &zonename); | 3276 | GNUNET_CRYPTO_short_hash_to_enc (zone, &zonename); |
3277 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 3277 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
diff --git a/src/gns/gnunet-gns.c b/src/gns/gnunet-gns.c index 4472c764e..0a6bcf66b 100644 --- a/src/gns/gnunet-gns.c +++ b/src/gns/gnunet-gns.c | |||
@@ -180,7 +180,7 @@ process_lookup_result (void *cls, uint32_t rd_count, | |||
180 | * @param shorten_key private key used for shortening, can be NULL | 180 | * @param shorten_key private key used for shortening, can be NULL |
181 | */ | 181 | */ |
182 | static void | 182 | static void |
183 | lookup_with_keys (const struct GNUNET_CRYPTO_EccPublicKey *pkey, | 183 | lookup_with_keys (const struct GNUNET_CRYPTO_EccPublicSignKey *pkey, |
184 | const struct GNUNET_CRYPTO_EccPrivateKey *shorten_key) | 184 | const struct GNUNET_CRYPTO_EccPrivateKey *shorten_key) |
185 | { | 185 | { |
186 | if (NULL != lookup_type) | 186 | if (NULL != lookup_type) |
@@ -227,7 +227,7 @@ identity_shorten_cb (void *cls, | |||
227 | void **ctx, | 227 | void **ctx, |
228 | const char *name) | 228 | const char *name) |
229 | { | 229 | { |
230 | struct GNUNET_CRYPTO_EccPublicKey *pkeym = cls; | 230 | struct GNUNET_CRYPTO_EccPublicSignKey *pkeym = cls; |
231 | 231 | ||
232 | id_op = NULL; | 232 | id_op = NULL; |
233 | if (NULL == ego) | 233 | if (NULL == ego) |
@@ -246,12 +246,12 @@ identity_shorten_cb (void *cls, | |||
246 | * @param pkey public key to use for the zone | 246 | * @param pkey public key to use for the zone |
247 | */ | 247 | */ |
248 | static void | 248 | static void |
249 | lookup_with_public_key (const struct GNUNET_CRYPTO_EccPublicKey *pkey) | 249 | lookup_with_public_key (const struct GNUNET_CRYPTO_EccPublicSignKey *pkey) |
250 | { | 250 | { |
251 | struct GNUNET_CRYPTO_EccPublicKey *pkeym; | 251 | struct GNUNET_CRYPTO_EccPublicSignKey *pkeym; |
252 | 252 | ||
253 | GNUNET_assert (NULL != pkey); | 253 | GNUNET_assert (NULL != pkey); |
254 | pkeym = GNUNET_new (struct GNUNET_CRYPTO_EccPublicKey); | 254 | pkeym = GNUNET_new (struct GNUNET_CRYPTO_EccPublicSignKey); |
255 | *pkeym = *pkey; | 255 | *pkeym = *pkey; |
256 | id_op = GNUNET_IDENTITY_get (identity, | 256 | id_op = GNUNET_IDENTITY_get (identity, |
257 | "shorten-zone", | 257 | "shorten-zone", |
@@ -276,7 +276,7 @@ static void | |||
276 | identity_zone_cb (void *cls, | 276 | identity_zone_cb (void *cls, |
277 | const struct GNUNET_IDENTITY_Ego *ego) | 277 | const struct GNUNET_IDENTITY_Ego *ego) |
278 | { | 278 | { |
279 | struct GNUNET_CRYPTO_EccPublicKey pkey; | 279 | struct GNUNET_CRYPTO_EccPublicSignKey pkey; |
280 | 280 | ||
281 | el = NULL; | 281 | el = NULL; |
282 | if (NULL == ego) | 282 | if (NULL == ego) |
@@ -314,7 +314,7 @@ identity_master_cb (void *cls, | |||
314 | void **ctx, | 314 | void **ctx, |
315 | const char *name) | 315 | const char *name) |
316 | { | 316 | { |
317 | struct GNUNET_CRYPTO_EccPublicKey pkey; | 317 | struct GNUNET_CRYPTO_EccPublicSignKey pkey; |
318 | 318 | ||
319 | id_op = NULL; | 319 | id_op = NULL; |
320 | if (NULL == ego) | 320 | if (NULL == ego) |
@@ -341,7 +341,7 @@ static void | |||
341 | run (void *cls, char *const *args, const char *cfgfile, | 341 | run (void *cls, char *const *args, const char *cfgfile, |
342 | const struct GNUNET_CONFIGURATION_Handle *c) | 342 | const struct GNUNET_CONFIGURATION_Handle *c) |
343 | { | 343 | { |
344 | struct GNUNET_CRYPTO_EccPublicKey pkey; | 344 | struct GNUNET_CRYPTO_EccPublicSignKey pkey; |
345 | 345 | ||
346 | cfg = c; | 346 | cfg = c; |
347 | gns = GNUNET_GNS_connect (cfg); | 347 | gns = GNUNET_GNS_connect (cfg); |
@@ -357,7 +357,7 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
357 | if (NULL != public_key) | 357 | if (NULL != public_key) |
358 | { | 358 | { |
359 | if (GNUNET_OK != | 359 | if (GNUNET_OK != |
360 | GNUNET_CRYPTO_ecc_public_key_from_string (public_key, | 360 | GNUNET_CRYPTO_ecc_public_sign_key_from_string (public_key, |
361 | strlen (public_key), | 361 | strlen (public_key), |
362 | &pkey)) | 362 | &pkey)) |
363 | { | 363 | { |
@@ -384,7 +384,7 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
384 | &lookup_name[strlen (lookup_name) - 4])) ) | 384 | &lookup_name[strlen (lookup_name) - 4])) ) |
385 | { | 385 | { |
386 | /* no zone required, use 'anonymous' zone */ | 386 | /* no zone required, use 'anonymous' zone */ |
387 | GNUNET_CRYPTO_ecc_key_get_public (GNUNET_CRYPTO_ecc_key_get_anonymous (), | 387 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (GNUNET_CRYPTO_ecc_key_get_anonymous (), |
388 | &pkey); | 388 | &pkey); |
389 | lookup_with_public_key (&pkey); | 389 | lookup_with_public_key (&pkey); |
390 | } | 390 | } |
diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c index 726a8c571..b7eb1f809 100644 --- a/src/gns/gnunet-service-gns.c +++ b/src/gns/gnunet-service-gns.c | |||
@@ -419,7 +419,7 @@ put_gns_record (void *cls, | |||
419 | rd_public_count); | 419 | rd_public_count); |
420 | block_size = ntohl (block->purpose.size) | 420 | block_size = ntohl (block->purpose.size) |
421 | + sizeof (struct GNUNET_CRYPTO_EccSignature) | 421 | + sizeof (struct GNUNET_CRYPTO_EccSignature) |
422 | + sizeof (struct GNUNET_CRYPTO_EccPublicKey); | 422 | + sizeof (struct GNUNET_CRYPTO_EccPublicSignKey); |
423 | GNUNET_NAMESTORE_query_from_private_key (key, | 423 | GNUNET_NAMESTORE_query_from_private_key (key, |
424 | name, | 424 | name, |
425 | &query); | 425 | &query); |
@@ -635,7 +635,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
635 | { &handle_lookup, NULL, GNUNET_MESSAGE_TYPE_GNS_LOOKUP, 0}, | 635 | { &handle_lookup, NULL, GNUNET_MESSAGE_TYPE_GNS_LOOKUP, 0}, |
636 | {NULL, NULL, 0, 0} | 636 | {NULL, NULL, 0, 0} |
637 | }; | 637 | }; |
638 | struct GNUNET_CRYPTO_EccPublicKey dns_root; | 638 | struct GNUNET_CRYPTO_EccPublicSignKey dns_root; |
639 | unsigned long long max_parallel_bg_queries = 0; | 639 | unsigned long long max_parallel_bg_queries = 0; |
640 | char *dns_root_name; | 640 | char *dns_root_name; |
641 | 641 | ||
@@ -699,7 +699,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
699 | &dns_root_name)) | 699 | &dns_root_name)) |
700 | { | 700 | { |
701 | if (GNUNET_OK != | 701 | if (GNUNET_OK != |
702 | GNUNET_CRYPTO_ecc_public_key_from_string (dns_root_name, | 702 | GNUNET_CRYPTO_ecc_public_sign_key_from_string (dns_root_name, |
703 | strlen (dns_root_name), | 703 | strlen (dns_root_name), |
704 | &dns_root)) | 704 | &dns_root)) |
705 | { | 705 | { |
diff --git a/src/gns/gnunet-service-gns_interceptor.c b/src/gns/gnunet-service-gns_interceptor.c index 2cb1030cd..33c05f743 100644 --- a/src/gns/gnunet-service-gns_interceptor.c +++ b/src/gns/gnunet-service-gns_interceptor.c | |||
@@ -75,7 +75,7 @@ static struct GNUNET_DNS_Handle *dns_handle; | |||
75 | /** | 75 | /** |
76 | * Key of the zone we start lookups in. | 76 | * Key of the zone we start lookups in. |
77 | */ | 77 | */ |
78 | static struct GNUNET_CRYPTO_EccPublicKey zone; | 78 | static struct GNUNET_CRYPTO_EccPublicSignKey zone; |
79 | 79 | ||
80 | /** | 80 | /** |
81 | * Head of the DLL. | 81 | * Head of the DLL. |
@@ -291,7 +291,7 @@ handle_dns_request (void *cls, | |||
291 | * @return GNUNET_OK on success | 291 | * @return GNUNET_OK on success |
292 | */ | 292 | */ |
293 | int | 293 | int |
294 | GNS_interceptor_init (const struct GNUNET_CRYPTO_EccPublicKey *gnu_zone, | 294 | GNS_interceptor_init (const struct GNUNET_CRYPTO_EccPublicSignKey *gnu_zone, |
295 | const struct GNUNET_CONFIGURATION_Handle *c) | 295 | const struct GNUNET_CONFIGURATION_Handle *c) |
296 | { | 296 | { |
297 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 297 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
diff --git a/src/gns/gnunet-service-gns_interceptor.h b/src/gns/gnunet-service-gns_interceptor.h index 92a154e2c..509875645 100644 --- a/src/gns/gnunet-service-gns_interceptor.h +++ b/src/gns/gnunet-service-gns_interceptor.h | |||
@@ -36,7 +36,7 @@ | |||
36 | * @return GNUNET_YES on success GNUNET_SYSERR on error | 36 | * @return GNUNET_YES on success GNUNET_SYSERR on error |
37 | */ | 37 | */ |
38 | int | 38 | int |
39 | GNS_interceptor_init (const struct GNUNET_CRYPTO_EccPublicKey *gnu_zone, | 39 | GNS_interceptor_init (const struct GNUNET_CRYPTO_EccPublicSignKey *gnu_zone, |
40 | const struct GNUNET_CONFIGURATION_Handle *c); | 40 | const struct GNUNET_CONFIGURATION_Handle *c); |
41 | 41 | ||
42 | /** | 42 | /** |
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, |
diff --git a/src/gns/gnunet-service-gns_resolver.h b/src/gns/gnunet-service-gns_resolver.h index 877c7ecd0..84d4c2bd7 100644 --- a/src/gns/gnunet-service-gns_resolver.h +++ b/src/gns/gnunet-service-gns_resolver.h | |||
@@ -83,7 +83,7 @@ typedef void (*GNS_ResultProcessor)(void *cls, | |||
83 | * @return handle to cancel operation | 83 | * @return handle to cancel operation |
84 | */ | 84 | */ |
85 | struct GNS_ResolverHandle * | 85 | struct GNS_ResolverHandle * |
86 | GNS_resolver_lookup (const struct GNUNET_CRYPTO_EccPublicKey *zone, | 86 | GNS_resolver_lookup (const struct GNUNET_CRYPTO_EccPublicSignKey *zone, |
87 | uint32_t record_type, | 87 | uint32_t record_type, |
88 | const char *name, | 88 | const char *name, |
89 | const struct GNUNET_CRYPTO_EccPrivateKey *shorten_key, | 89 | const struct GNUNET_CRYPTO_EccPrivateKey *shorten_key, |
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; |
diff --git a/src/gns/gnunet-service-gns_shorten.h b/src/gns/gnunet-service-gns_shorten.h index d71100a88..ed3bdf11f 100644 --- a/src/gns/gnunet-service-gns_shorten.h +++ b/src/gns/gnunet-service-gns_shorten.h | |||
@@ -59,7 +59,7 @@ GNS_shorten_done (void); | |||
59 | */ | 59 | */ |
60 | void | 60 | void |
61 | GNS_shorten_start (const char *original_label, | 61 | GNS_shorten_start (const char *original_label, |
62 | const struct GNUNET_CRYPTO_EccPublicKey *pub, | 62 | const struct GNUNET_CRYPTO_EccPublicSignKey *pub, |
63 | const struct GNUNET_CRYPTO_EccPrivateKey *shorten_zone); | 63 | const struct GNUNET_CRYPTO_EccPrivateKey *shorten_zone); |
64 | 64 | ||
65 | 65 | ||
diff --git a/src/gns/plugin_block_gns.c b/src/gns/plugin_block_gns.c index c6fcd3df3..ba2885028 100644 --- a/src/gns/plugin_block_gns.c +++ b/src/gns/plugin_block_gns.c | |||
@@ -85,7 +85,7 @@ block_plugin_gns_evaluate (void *cls, enum GNUNET_BLOCK_Type type, | |||
85 | return GNUNET_BLOCK_EVALUATION_RESULT_INVALID; | 85 | return GNUNET_BLOCK_EVALUATION_RESULT_INVALID; |
86 | } | 86 | } |
87 | block = reply_block; | 87 | block = reply_block; |
88 | if (ntohs (block->purpose.size) + sizeof (struct GNUNET_CRYPTO_EccSignature) + sizeof (struct GNUNET_CRYPTO_EccPublicKey) != | 88 | if (ntohs (block->purpose.size) + sizeof (struct GNUNET_CRYPTO_EccSignature) + sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) != |
89 | reply_block_size) | 89 | reply_block_size) |
90 | { | 90 | { |
91 | GNUNET_break_op (0); | 91 | GNUNET_break_op (0); |
diff --git a/src/gns/test_gns_cname_lookup.c b/src/gns/test_gns_cname_lookup.c index e49a17f22..ee51d4aa5 100644 --- a/src/gns/test_gns_cname_lookup.c +++ b/src/gns/test_gns_cname_lookup.c | |||
@@ -334,7 +334,7 @@ do_check (void *cls, | |||
334 | const struct GNUNET_CONFIGURATION_Handle *ccfg, | 334 | const struct GNUNET_CONFIGURATION_Handle *ccfg, |
335 | struct GNUNET_TESTING_Peer *peer) | 335 | struct GNUNET_TESTING_Peer *peer) |
336 | { | 336 | { |
337 | struct GNUNET_CRYPTO_EccPublicKey alice_pkey; | 337 | struct GNUNET_CRYPTO_EccPublicSignKey alice_pkey; |
338 | struct GNUNET_CRYPTO_EccPrivateKey *alice_key; | 338 | struct GNUNET_CRYPTO_EccPrivateKey *alice_key; |
339 | struct GNUNET_CRYPTO_EccPrivateKey *bob_key; | 339 | struct GNUNET_CRYPTO_EccPrivateKey *bob_key; |
340 | char* alice_keyfile; | 340 | char* alice_keyfile; |
@@ -366,7 +366,7 @@ do_check (void *cls, | |||
366 | } | 366 | } |
367 | 367 | ||
368 | alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (alice_keyfile); | 368 | alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (alice_keyfile); |
369 | GNUNET_CRYPTO_ecc_key_get_public (alice_key, &alice_pkey); | 369 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (alice_key, &alice_pkey); |
370 | GNUNET_free(alice_keyfile); | 370 | GNUNET_free(alice_keyfile); |
371 | 371 | ||
372 | bob_key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE_BOB); | 372 | bob_key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE_BOB); |
diff --git a/src/gns/test_gns_dht_delegated_lookup.c b/src/gns/test_gns_dht_delegated_lookup.c index 7379a8f20..2950f896a 100644 --- a/src/gns/test_gns_dht_delegated_lookup.c +++ b/src/gns/test_gns_dht_delegated_lookup.c | |||
@@ -65,8 +65,8 @@ static struct GNUNET_DHT_Handle *dht_handle; | |||
65 | 65 | ||
66 | static const struct GNUNET_CONFIGURATION_Handle *cfg; | 66 | static const struct GNUNET_CONFIGURATION_Handle *cfg; |
67 | 67 | ||
68 | static struct GNUNET_CRYPTO_EccPublicKey alice_pkey; | 68 | static struct GNUNET_CRYPTO_EccPublicSignKey alice_pkey; |
69 | static struct GNUNET_CRYPTO_EccPublicKey bob_pkey; | 69 | static struct GNUNET_CRYPTO_EccPublicSignKey bob_pkey; |
70 | static struct GNUNET_CRYPTO_EccPrivateKey *alice_key; | 70 | static struct GNUNET_CRYPTO_EccPrivateKey *alice_key; |
71 | static struct GNUNET_CRYPTO_EccPrivateKey *bob_key; | 71 | static struct GNUNET_CRYPTO_EccPrivateKey *bob_key; |
72 | 72 | ||
@@ -262,7 +262,7 @@ put_dht(void *cls, int32_t success, const char *emsg) | |||
262 | } | 262 | } |
263 | GNUNET_CRYPTO_short_hash(TEST_RECORD_NAME, strlen(TEST_RECORD_NAME), &name_hash); | 263 | GNUNET_CRYPTO_short_hash(TEST_RECORD_NAME, strlen(TEST_RECORD_NAME), &name_hash); |
264 | GNUNET_CRYPTO_short_hash(&bob_pkey, | 264 | GNUNET_CRYPTO_short_hash(&bob_pkey, |
265 | sizeof(struct GNUNET_CRYPTO_EccPublicKey), | 265 | sizeof(struct GNUNET_CRYPTO_EccPublicSignKey), |
266 | &zone_hash); | 266 | &zone_hash); |
267 | GNUNET_CRYPTO_short_hash_double(&zone_hash, &zone_hash_double); | 267 | GNUNET_CRYPTO_short_hash_double(&zone_hash, &zone_hash_double); |
268 | GNUNET_CRYPTO_short_hash_double(&name_hash, &name_hash_double); | 268 | GNUNET_CRYPTO_short_hash_double(&name_hash, &name_hash_double); |
@@ -335,8 +335,8 @@ do_check (void *cls, | |||
335 | 335 | ||
336 | GNUNET_free(alice_keyfile); | 336 | GNUNET_free(alice_keyfile); |
337 | 337 | ||
338 | GNUNET_CRYPTO_ecc_key_get_public (alice_key, &alice_pkey); | 338 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (alice_key, &alice_pkey); |
339 | GNUNET_CRYPTO_ecc_key_get_public (bob_key, &bob_pkey); | 339 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (bob_key, &bob_pkey); |
340 | GNUNET_CRYPTO_short_hash(&bob_pkey, sizeof(bob_pkey), &bob_hash); | 340 | GNUNET_CRYPTO_short_hash(&bob_pkey, sizeof(bob_pkey), &bob_hash); |
341 | 341 | ||
342 | struct GNUNET_NAMESTORE_RecordData rd; | 342 | struct GNUNET_NAMESTORE_RecordData rd; |
diff --git a/src/gns/test_gns_dht_three_peers.c b/src/gns/test_gns_dht_three_peers.c index dd83d52f6..688e355ed 100644 --- a/src/gns/test_gns_dht_three_peers.c +++ b/src/gns/test_gns_dht_three_peers.c | |||
@@ -312,7 +312,7 @@ setup_dave (const struct GNUNET_CONFIGURATION_Handle * cfg) | |||
312 | { | 312 | { |
313 | char* keyfile; | 313 | char* keyfile; |
314 | struct GNUNET_CRYPTO_EccPrivateKey *key; | 314 | struct GNUNET_CRYPTO_EccPrivateKey *key; |
315 | struct GNUNET_CRYPTO_EccPublicKey pkey; | 315 | struct GNUNET_CRYPTO_EccPublicSignKey pkey; |
316 | struct in_addr *web; | 316 | struct in_addr *web; |
317 | struct GNUNET_NAMESTORE_RecordData rd; | 317 | struct GNUNET_NAMESTORE_RecordData rd; |
318 | 318 | ||
@@ -344,7 +344,7 @@ setup_dave (const struct GNUNET_CONFIGURATION_Handle * cfg) | |||
344 | return GNUNET_SYSERR; | 344 | return GNUNET_SYSERR; |
345 | } | 345 | } |
346 | 346 | ||
347 | GNUNET_CRYPTO_ecc_key_get_public (key, &pkey); | 347 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (key, &pkey); |
348 | GNUNET_CRYPTO_short_hash(&pkey, sizeof(pkey), &dave_hash); | 348 | GNUNET_CRYPTO_short_hash(&pkey, sizeof(pkey), &dave_hash); |
349 | 349 | ||
350 | rd.expiration_time = UINT64_MAX; | 350 | rd.expiration_time = UINT64_MAX; |
@@ -383,7 +383,7 @@ setup_bob (const struct GNUNET_CONFIGURATION_Handle * cfg) | |||
383 | { | 383 | { |
384 | char* keyfile; | 384 | char* keyfile; |
385 | struct GNUNET_CRYPTO_EccPrivateKey *key; | 385 | struct GNUNET_CRYPTO_EccPrivateKey *key; |
386 | struct GNUNET_CRYPTO_EccPublicKey pkey; | 386 | struct GNUNET_CRYPTO_EccPublicSignKey pkey; |
387 | struct GNUNET_NAMESTORE_RecordData rd; | 387 | struct GNUNET_NAMESTORE_RecordData rd; |
388 | 388 | ||
389 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up bob\n"); | 389 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up bob\n"); |
@@ -415,7 +415,7 @@ setup_bob (const struct GNUNET_CONFIGURATION_Handle * cfg) | |||
415 | return GNUNET_SYSERR; | 415 | return GNUNET_SYSERR; |
416 | } | 416 | } |
417 | 417 | ||
418 | GNUNET_CRYPTO_ecc_key_get_public (key, &pkey); | 418 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (key, &pkey); |
419 | GNUNET_CRYPTO_short_hash(&pkey, sizeof(pkey), &bob_hash); | 419 | GNUNET_CRYPTO_short_hash(&pkey, sizeof(pkey), &bob_hash); |
420 | 420 | ||
421 | rd.expiration_time = UINT64_MAX; | 421 | rd.expiration_time = UINT64_MAX; |
diff --git a/src/gns/test_gns_max_queries.c b/src/gns/test_gns_max_queries.c index 5df715b78..304066017 100644 --- a/src/gns/test_gns_max_queries.c +++ b/src/gns/test_gns_max_queries.c | |||
@@ -252,8 +252,8 @@ do_check (void *cls, | |||
252 | const struct GNUNET_CONFIGURATION_Handle *ccfg, | 252 | const struct GNUNET_CONFIGURATION_Handle *ccfg, |
253 | struct GNUNET_TESTING_Peer *peer) | 253 | struct GNUNET_TESTING_Peer *peer) |
254 | { | 254 | { |
255 | struct GNUNET_CRYPTO_EccPublicKey alice_pkey; | 255 | struct GNUNET_CRYPTO_EccPublicSignKey alice_pkey; |
256 | struct GNUNET_CRYPTO_EccPublicKey bob_pkey; | 256 | struct GNUNET_CRYPTO_EccPublicSignKey bob_pkey; |
257 | struct GNUNET_CRYPTO_EccPrivateKey *alice_key; | 257 | struct GNUNET_CRYPTO_EccPrivateKey *alice_key; |
258 | struct GNUNET_CRYPTO_EccPrivateKey *bob_key; | 258 | struct GNUNET_CRYPTO_EccPrivateKey *bob_key; |
259 | char* alice_keyfile; | 259 | char* alice_keyfile; |
@@ -295,8 +295,8 @@ do_check (void *cls, | |||
295 | alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (alice_keyfile); | 295 | alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (alice_keyfile); |
296 | bob_key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE_BOB); | 296 | bob_key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE_BOB); |
297 | 297 | ||
298 | GNUNET_CRYPTO_ecc_key_get_public (alice_key, &alice_pkey); | 298 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (alice_key, &alice_pkey); |
299 | GNUNET_CRYPTO_ecc_key_get_public (bob_key, &bob_pkey); | 299 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (bob_key, &bob_pkey); |
300 | 300 | ||
301 | GNUNET_free(alice_keyfile); | 301 | GNUNET_free(alice_keyfile); |
302 | 302 | ||
diff --git a/src/gns/test_gns_ns_lookup.c b/src/gns/test_gns_ns_lookup.c index 3bdfd24a2..dbeef3f65 100644 --- a/src/gns/test_gns_ns_lookup.c +++ b/src/gns/test_gns_ns_lookup.c | |||
@@ -563,7 +563,7 @@ do_check (void *cls, | |||
563 | const struct GNUNET_CONFIGURATION_Handle *ccfg, | 563 | const struct GNUNET_CONFIGURATION_Handle *ccfg, |
564 | struct GNUNET_TESTING_Peer *peer) | 564 | struct GNUNET_TESTING_Peer *peer) |
565 | { | 565 | { |
566 | struct GNUNET_CRYPTO_EccPublicKey alice_pkey; | 566 | struct GNUNET_CRYPTO_EccPublicSignKey alice_pkey; |
567 | char* alice_keyfile; | 567 | char* alice_keyfile; |
568 | struct GNUNET_NAMESTORE_RecordData rd[2]; | 568 | struct GNUNET_NAMESTORE_RecordData rd[2]; |
569 | struct in_addr ns; | 569 | struct in_addr ns; |
@@ -593,7 +593,7 @@ do_check (void *cls, | |||
593 | } | 593 | } |
594 | 594 | ||
595 | alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (alice_keyfile); | 595 | alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (alice_keyfile); |
596 | GNUNET_CRYPTO_ecc_key_get_public (alice_key, &alice_pkey); | 596 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (alice_key, &alice_pkey); |
597 | GNUNET_free (alice_keyfile); | 597 | GNUNET_free (alice_keyfile); |
598 | 598 | ||
599 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 599 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
diff --git a/src/gns/test_gns_pseu_shorten.c b/src/gns/test_gns_pseu_shorten.c index 518edac6b..8610179b2 100644 --- a/src/gns/test_gns_pseu_shorten.c +++ b/src/gns/test_gns_pseu_shorten.c | |||
@@ -69,11 +69,11 @@ static struct GNUNET_DHT_Handle *dht_handle; | |||
69 | 69 | ||
70 | static const struct GNUNET_CONFIGURATION_Handle *cfg; | 70 | static const struct GNUNET_CONFIGURATION_Handle *cfg; |
71 | 71 | ||
72 | static struct GNUNET_CRYPTO_EccPublicKey alice_pkey; | 72 | static struct GNUNET_CRYPTO_EccPublicSignKey alice_pkey; |
73 | static struct GNUNET_CRYPTO_EccPublicKey bob_pkey; | 73 | static struct GNUNET_CRYPTO_EccPublicSignKey bob_pkey; |
74 | static struct GNUNET_CRYPTO_EccPublicKey our_pkey; | 74 | static struct GNUNET_CRYPTO_EccPublicSignKey our_pkey; |
75 | static struct GNUNET_CRYPTO_EccPublicKey priv_pkey; | 75 | static struct GNUNET_CRYPTO_EccPublicSignKey priv_pkey; |
76 | static struct GNUNET_CRYPTO_EccPublicKey short_pkey; | 76 | static struct GNUNET_CRYPTO_EccPublicSignKey short_pkey; |
77 | static struct GNUNET_CRYPTO_EccPrivateKey *alice_key; | 77 | static struct GNUNET_CRYPTO_EccPrivateKey *alice_key; |
78 | static struct GNUNET_CRYPTO_EccPrivateKey *bob_key; | 78 | static struct GNUNET_CRYPTO_EccPrivateKey *bob_key; |
79 | static struct GNUNET_CRYPTO_EccPrivateKey *our_key; | 79 | static struct GNUNET_CRYPTO_EccPrivateKey *our_key; |
@@ -316,7 +316,7 @@ put_pseu_dht (void *cls, int success) | |||
316 | } | 316 | } |
317 | GNUNET_CRYPTO_short_hash(GNUNET_GNS_MASTERZONE_STR, strlen(GNUNET_GNS_MASTERZONE_STR), &name_hash); | 317 | GNUNET_CRYPTO_short_hash(GNUNET_GNS_MASTERZONE_STR, strlen(GNUNET_GNS_MASTERZONE_STR), &name_hash); |
318 | GNUNET_CRYPTO_short_hash(&alice_pkey, | 318 | GNUNET_CRYPTO_short_hash(&alice_pkey, |
319 | sizeof(struct GNUNET_CRYPTO_EccPublicKey), | 319 | sizeof(struct GNUNET_CRYPTO_EccPublicSignKey), |
320 | &zone_hash); | 320 | &zone_hash); |
321 | 321 | ||
322 | GNUNET_CRYPTO_short_hash_double(&name_hash, &name_hash_double); | 322 | GNUNET_CRYPTO_short_hash_double(&name_hash, &name_hash_double); |
@@ -405,7 +405,7 @@ put_www_dht (void *cls, int success) | |||
405 | } | 405 | } |
406 | GNUNET_CRYPTO_short_hash(TEST_RECORD_NAME, strlen(TEST_RECORD_NAME), &name_hash); | 406 | GNUNET_CRYPTO_short_hash(TEST_RECORD_NAME, strlen(TEST_RECORD_NAME), &name_hash); |
407 | GNUNET_CRYPTO_short_hash(&alice_pkey, | 407 | GNUNET_CRYPTO_short_hash(&alice_pkey, |
408 | sizeof(struct GNUNET_CRYPTO_EccPublicKey), | 408 | sizeof(struct GNUNET_CRYPTO_EccPublicSignKey), |
409 | &zone_hash); | 409 | &zone_hash); |
410 | GNUNET_CRYPTO_short_hash_double(&zone_hash, &zone_hash_double); | 410 | GNUNET_CRYPTO_short_hash_double(&zone_hash, &zone_hash_double); |
411 | GNUNET_CRYPTO_short_hash_double(&name_hash, &name_hash_double); | 411 | GNUNET_CRYPTO_short_hash_double(&name_hash, &name_hash_double); |
@@ -488,7 +488,7 @@ put_pkey_dht (void *cls, int32_t success, const char *emsg) | |||
488 | GNUNET_CRYPTO_short_hash (TEST_AUTHORITY_ALICE, | 488 | GNUNET_CRYPTO_short_hash (TEST_AUTHORITY_ALICE, |
489 | strlen (TEST_AUTHORITY_ALICE), &name_hash); | 489 | strlen (TEST_AUTHORITY_ALICE), &name_hash); |
490 | GNUNET_CRYPTO_short_hash (&bob_pkey, | 490 | GNUNET_CRYPTO_short_hash (&bob_pkey, |
491 | sizeof(struct GNUNET_CRYPTO_EccPublicKey), | 491 | sizeof(struct GNUNET_CRYPTO_EccPublicSignKey), |
492 | &zone_hash); | 492 | &zone_hash); |
493 | GNUNET_CRYPTO_short_hash_double(&zone_hash, &zone_hash_double); | 493 | GNUNET_CRYPTO_short_hash_double(&zone_hash, &zone_hash_double); |
494 | GNUNET_CRYPTO_short_hash_double(&name_hash, &name_hash_double); | 494 | GNUNET_CRYPTO_short_hash_double(&name_hash, &name_hash_double); |
@@ -626,11 +626,11 @@ do_check (void *cls, | |||
626 | GNUNET_free (shorten_keyfile); | 626 | GNUNET_free (shorten_keyfile); |
627 | GNUNET_free (private_keyfile); | 627 | GNUNET_free (private_keyfile); |
628 | 628 | ||
629 | GNUNET_CRYPTO_ecc_key_get_public (our_key, &our_pkey); | 629 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (our_key, &our_pkey); |
630 | GNUNET_CRYPTO_ecc_key_get_public (priv_key, &priv_pkey); | 630 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (priv_key, &priv_pkey); |
631 | GNUNET_CRYPTO_ecc_key_get_public (short_key, &short_pkey); | 631 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (short_key, &short_pkey); |
632 | GNUNET_CRYPTO_ecc_key_get_public (bob_key, &bob_pkey); | 632 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (bob_key, &bob_pkey); |
633 | GNUNET_CRYPTO_ecc_key_get_public (alice_key, &alice_pkey); | 633 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (alice_key, &alice_pkey); |
634 | GNUNET_CRYPTO_short_hash (&bob_pkey, sizeof(bob_pkey), &bob_hash); | 634 | GNUNET_CRYPTO_short_hash (&bob_pkey, sizeof(bob_pkey), &bob_hash); |
635 | GNUNET_CRYPTO_short_hash (&alice_pkey, sizeof(alice_pkey), &alice_hash); | 635 | GNUNET_CRYPTO_short_hash (&alice_pkey, sizeof(alice_pkey), &alice_hash); |
636 | GNUNET_CRYPTO_short_hash (&our_pkey, sizeof(our_pkey), &our_zone); | 636 | GNUNET_CRYPTO_short_hash (&our_pkey, sizeof(our_pkey), &our_zone); |
diff --git a/src/gns/test_gns_revocation.c b/src/gns/test_gns_revocation.c index 9e630740d..459a40c97 100644 --- a/src/gns/test_gns_revocation.c +++ b/src/gns/test_gns_revocation.c | |||
@@ -181,8 +181,8 @@ do_check (void *cls, | |||
181 | const struct GNUNET_CONFIGURATION_Handle *ccfg, | 181 | const struct GNUNET_CONFIGURATION_Handle *ccfg, |
182 | struct GNUNET_TESTING_Peer *peer) | 182 | struct GNUNET_TESTING_Peer *peer) |
183 | { | 183 | { |
184 | struct GNUNET_CRYPTO_EccPublicKey alice_pkey; | 184 | struct GNUNET_CRYPTO_EccPublicSignKey alice_pkey; |
185 | struct GNUNET_CRYPTO_EccPublicKey bob_pkey; | 185 | struct GNUNET_CRYPTO_EccPublicSignKey bob_pkey; |
186 | struct GNUNET_CRYPTO_EccPrivateKey *alice_key; | 186 | struct GNUNET_CRYPTO_EccPrivateKey *alice_key; |
187 | struct GNUNET_CRYPTO_EccPrivateKey *bob_key; | 187 | struct GNUNET_CRYPTO_EccPrivateKey *bob_key; |
188 | struct GNUNET_CRYPTO_ShortHashCode bob_hash; | 188 | struct GNUNET_CRYPTO_ShortHashCode bob_hash; |
@@ -213,8 +213,8 @@ do_check (void *cls, | |||
213 | alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (alice_keyfile); | 213 | alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (alice_keyfile); |
214 | bob_key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE_BOB); | 214 | bob_key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE_BOB); |
215 | 215 | ||
216 | GNUNET_CRYPTO_ecc_key_get_public (alice_key, &alice_pkey); | 216 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (alice_key, &alice_pkey); |
217 | GNUNET_CRYPTO_ecc_key_get_public (bob_key, &bob_pkey); | 217 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (bob_key, &bob_pkey); |
218 | 218 | ||
219 | struct GNUNET_NAMESTORE_RecordData rd; | 219 | struct GNUNET_NAMESTORE_RecordData rd; |
220 | char* ip = TEST_IP; | 220 | char* ip = TEST_IP; |
diff --git a/src/gns/test_gns_simple_delegated_lookup.c b/src/gns/test_gns_simple_delegated_lookup.c index ebbc09740..937049dbe 100644 --- a/src/gns/test_gns_simple_delegated_lookup.c +++ b/src/gns/test_gns_simple_delegated_lookup.c | |||
@@ -189,8 +189,8 @@ do_check (void *cls, | |||
189 | const struct GNUNET_CONFIGURATION_Handle *ccfg, | 189 | const struct GNUNET_CONFIGURATION_Handle *ccfg, |
190 | struct GNUNET_TESTING_Peer *peer) | 190 | struct GNUNET_TESTING_Peer *peer) |
191 | { | 191 | { |
192 | struct GNUNET_CRYPTO_EccPublicKey alice_pkey; | 192 | struct GNUNET_CRYPTO_EccPublicSignKey alice_pkey; |
193 | struct GNUNET_CRYPTO_EccPublicKey bob_pkey; | 193 | struct GNUNET_CRYPTO_EccPublicSignKey bob_pkey; |
194 | struct GNUNET_CRYPTO_EccPrivateKey *alice_key; | 194 | struct GNUNET_CRYPTO_EccPrivateKey *alice_key; |
195 | struct GNUNET_CRYPTO_EccPrivateKey *bob_key; | 195 | struct GNUNET_CRYPTO_EccPrivateKey *bob_key; |
196 | struct GNUNET_CRYPTO_ShortHashCode bob_hash; | 196 | struct GNUNET_CRYPTO_ShortHashCode bob_hash; |
@@ -225,8 +225,8 @@ do_check (void *cls, | |||
225 | } | 225 | } |
226 | alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (alice_keyfile); | 226 | alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (alice_keyfile); |
227 | bob_key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE_BOB); | 227 | bob_key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE_BOB); |
228 | GNUNET_CRYPTO_ecc_key_get_public (alice_key, &alice_pkey); | 228 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (alice_key, &alice_pkey); |
229 | GNUNET_CRYPTO_ecc_key_get_public (bob_key, &bob_pkey); | 229 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (bob_key, &bob_pkey); |
230 | rd.expiration_time = UINT64_MAX; | 230 | rd.expiration_time = UINT64_MAX; |
231 | GNUNET_assert (1 == inet_pton (AF_INET, ip, &web)); | 231 | GNUNET_assert (1 == inet_pton (AF_INET, ip, &web)); |
232 | GNUNET_CRYPTO_short_hash (&bob_pkey, sizeof(bob_pkey), &bob_hash); | 232 | GNUNET_CRYPTO_short_hash (&bob_pkey, sizeof(bob_pkey), &bob_hash); |
diff --git a/src/gns/test_gns_simple_lookup.c b/src/gns/test_gns_simple_lookup.c index 73e479464..cc2abeff7 100644 --- a/src/gns/test_gns_simple_lookup.c +++ b/src/gns/test_gns_simple_lookup.c | |||
@@ -221,7 +221,7 @@ do_check (void *cls, | |||
221 | const struct GNUNET_CONFIGURATION_Handle *ccfg, | 221 | const struct GNUNET_CONFIGURATION_Handle *ccfg, |
222 | struct GNUNET_TESTING_Peer *peer) | 222 | struct GNUNET_TESTING_Peer *peer) |
223 | { | 223 | { |
224 | struct GNUNET_CRYPTO_EccPublicKey alice_pkey; | 224 | struct GNUNET_CRYPTO_EccPublicSignKey alice_pkey; |
225 | struct GNUNET_CRYPTO_EccPrivateKey *alice_key; | 225 | struct GNUNET_CRYPTO_EccPrivateKey *alice_key; |
226 | struct GNUNET_NAMESTORE_RecordData rd; | 226 | struct GNUNET_NAMESTORE_RecordData rd; |
227 | char* alice_keyfile; | 227 | char* alice_keyfile; |
@@ -252,7 +252,7 @@ do_check (void *cls, | |||
252 | } | 252 | } |
253 | 253 | ||
254 | alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (alice_keyfile); | 254 | alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (alice_keyfile); |
255 | GNUNET_CRYPTO_ecc_key_get_public (alice_key, &alice_pkey); | 255 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (alice_key, &alice_pkey); |
256 | GNUNET_free (alice_keyfile); | 256 | GNUNET_free (alice_keyfile); |
257 | rd.expiration_time = UINT64_MAX; | 257 | rd.expiration_time = UINT64_MAX; |
258 | GNUNET_assert (1 == inet_pton (AF_INET, ip, &web)); | 258 | GNUNET_assert (1 == inet_pton (AF_INET, ip, &web)); |
diff --git a/src/gns/test_gns_simple_mx_lookup.c b/src/gns/test_gns_simple_mx_lookup.c index 2fb05503e..a7eec0a64 100644 --- a/src/gns/test_gns_simple_mx_lookup.c +++ b/src/gns/test_gns_simple_mx_lookup.c | |||
@@ -180,8 +180,8 @@ do_check (void *cls, | |||
180 | const struct GNUNET_CONFIGURATION_Handle *ccfg, | 180 | const struct GNUNET_CONFIGURATION_Handle *ccfg, |
181 | struct GNUNET_TESTING_Peer *peer) | 181 | struct GNUNET_TESTING_Peer *peer) |
182 | { | 182 | { |
183 | struct GNUNET_CRYPTO_EccPublicKey alice_pkey; | 183 | struct GNUNET_CRYPTO_EccPublicSignKey alice_pkey; |
184 | struct GNUNET_CRYPTO_EccPublicKey bob_pkey; | 184 | struct GNUNET_CRYPTO_EccPublicSignKey bob_pkey; |
185 | struct GNUNET_CRYPTO_EccPrivateKey *alice_key; | 185 | struct GNUNET_CRYPTO_EccPrivateKey *alice_key; |
186 | struct GNUNET_CRYPTO_EccPrivateKey *bob_key; | 186 | struct GNUNET_CRYPTO_EccPrivateKey *bob_key; |
187 | struct GNUNET_CRYPTO_ShortHashCode bob_hash; | 187 | struct GNUNET_CRYPTO_ShortHashCode bob_hash; |
@@ -213,8 +213,8 @@ do_check (void *cls, | |||
213 | alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (alice_keyfile); | 213 | alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (alice_keyfile); |
214 | bob_key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE_BOB); | 214 | bob_key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE_BOB); |
215 | 215 | ||
216 | GNUNET_CRYPTO_ecc_key_get_public (alice_key, &alice_pkey); | 216 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (alice_key, &alice_pkey); |
217 | GNUNET_CRYPTO_ecc_key_get_public (bob_key, &bob_pkey); | 217 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (bob_key, &bob_pkey); |
218 | 218 | ||
219 | struct GNUNET_NAMESTORE_RecordData rd; | 219 | struct GNUNET_NAMESTORE_RecordData rd; |
220 | char* ip = TEST_IP; | 220 | char* ip = TEST_IP; |
diff --git a/src/gns/test_gns_simple_shorten.c b/src/gns/test_gns_simple_shorten.c index 3a684dbaa..8cab0dbb2 100644 --- a/src/gns/test_gns_simple_shorten.c +++ b/src/gns/test_gns_simple_shorten.c | |||
@@ -61,8 +61,8 @@ static struct GNUNET_GNS_Handle *gns_handle; | |||
61 | 61 | ||
62 | const struct GNUNET_CONFIGURATION_Handle *cfg; | 62 | const struct GNUNET_CONFIGURATION_Handle *cfg; |
63 | 63 | ||
64 | struct GNUNET_CRYPTO_EccPublicKey priv_pkey; | 64 | struct GNUNET_CRYPTO_EccPublicSignKey priv_pkey; |
65 | struct GNUNET_CRYPTO_EccPublicKey short_pkey; | 65 | struct GNUNET_CRYPTO_EccPublicSignKey short_pkey; |
66 | struct GNUNET_CRYPTO_EccPrivateKey *priv_key; | 66 | struct GNUNET_CRYPTO_EccPrivateKey *priv_key; |
67 | struct GNUNET_CRYPTO_EccPrivateKey *short_key; | 67 | struct GNUNET_CRYPTO_EccPrivateKey *short_key; |
68 | 68 | ||
@@ -170,9 +170,9 @@ void do_check (void *cls, | |||
170 | const struct GNUNET_CONFIGURATION_Handle *ccfg, | 170 | const struct GNUNET_CONFIGURATION_Handle *ccfg, |
171 | struct GNUNET_TESTING_Peer *peer) | 171 | struct GNUNET_TESTING_Peer *peer) |
172 | { | 172 | { |
173 | struct GNUNET_CRYPTO_EccPublicKey our_pkey; | 173 | struct GNUNET_CRYPTO_EccPublicSignKey our_pkey; |
174 | struct GNUNET_CRYPTO_EccPublicKey alice_pkey; | 174 | struct GNUNET_CRYPTO_EccPublicSignKey alice_pkey; |
175 | struct GNUNET_CRYPTO_EccPublicKey bob_pkey; | 175 | struct GNUNET_CRYPTO_EccPublicSignKey bob_pkey; |
176 | struct GNUNET_CRYPTO_EccPrivateKey *our_key; | 176 | struct GNUNET_CRYPTO_EccPrivateKey *our_key; |
177 | struct GNUNET_CRYPTO_EccPrivateKey *alice_key; | 177 | struct GNUNET_CRYPTO_EccPrivateKey *alice_key; |
178 | struct GNUNET_CRYPTO_EccPrivateKey *bob_key; | 178 | struct GNUNET_CRYPTO_EccPrivateKey *bob_key; |
@@ -237,11 +237,11 @@ void do_check (void *cls, | |||
237 | GNUNET_free(shorten_keyfile); | 237 | GNUNET_free(shorten_keyfile); |
238 | GNUNET_free(private_keyfile); | 238 | GNUNET_free(private_keyfile); |
239 | 239 | ||
240 | GNUNET_CRYPTO_ecc_key_get_public (our_key, &our_pkey); | 240 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (our_key, &our_pkey); |
241 | GNUNET_CRYPTO_ecc_key_get_public (alice_key, &alice_pkey); | 241 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (alice_key, &alice_pkey); |
242 | GNUNET_CRYPTO_ecc_key_get_public (bob_key, &bob_pkey); | 242 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (bob_key, &bob_pkey); |
243 | GNUNET_CRYPTO_ecc_key_get_public (priv_key, &priv_pkey); | 243 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (priv_key, &priv_pkey); |
244 | GNUNET_CRYPTO_ecc_key_get_public (short_key, &short_pkey); | 244 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (short_key, &short_pkey); |
245 | 245 | ||
246 | GNUNET_CRYPTO_short_hash(&priv_pkey, sizeof(priv_pkey), &priv_zone); | 246 | GNUNET_CRYPTO_short_hash(&priv_pkey, sizeof(priv_pkey), &priv_zone); |
247 | GNUNET_CRYPTO_short_hash(&short_pkey, sizeof(short_pkey), &short_zone); | 247 | GNUNET_CRYPTO_short_hash(&short_pkey, sizeof(short_pkey), &short_zone); |
diff --git a/src/gns/test_gns_simple_srv_lookup.c b/src/gns/test_gns_simple_srv_lookup.c index 9e0b89555..7efa57803 100644 --- a/src/gns/test_gns_simple_srv_lookup.c +++ b/src/gns/test_gns_simple_srv_lookup.c | |||
@@ -182,8 +182,8 @@ do_check (void *cls, | |||
182 | const struct GNUNET_CONFIGURATION_Handle *ccfg, | 182 | const struct GNUNET_CONFIGURATION_Handle *ccfg, |
183 | struct GNUNET_TESTING_Peer *peer) | 183 | struct GNUNET_TESTING_Peer *peer) |
184 | { | 184 | { |
185 | struct GNUNET_CRYPTO_EccPublicKey alice_pkey; | 185 | struct GNUNET_CRYPTO_EccPublicSignKey alice_pkey; |
186 | struct GNUNET_CRYPTO_EccPublicKey bob_pkey; | 186 | struct GNUNET_CRYPTO_EccPublicSignKey bob_pkey; |
187 | struct GNUNET_CRYPTO_EccPrivateKey *alice_key; | 187 | struct GNUNET_CRYPTO_EccPrivateKey *alice_key; |
188 | struct GNUNET_CRYPTO_EccPrivateKey *bob_key; | 188 | struct GNUNET_CRYPTO_EccPrivateKey *bob_key; |
189 | struct GNUNET_CRYPTO_ShortHashCode bob_hash; | 189 | struct GNUNET_CRYPTO_ShortHashCode bob_hash; |
@@ -216,8 +216,8 @@ do_check (void *cls, | |||
216 | alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (alice_keyfile); | 216 | alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (alice_keyfile); |
217 | bob_key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE_BOB); | 217 | bob_key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE_BOB); |
218 | 218 | ||
219 | GNUNET_CRYPTO_ecc_key_get_public (alice_key, &alice_pkey); | 219 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (alice_key, &alice_pkey); |
220 | GNUNET_CRYPTO_ecc_key_get_public (bob_key, &bob_pkey); | 220 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (bob_key, &bob_pkey); |
221 | 221 | ||
222 | struct GNUNET_NAMESTORE_RecordData rd; | 222 | struct GNUNET_NAMESTORE_RecordData rd; |
223 | char* ip = TEST_IP; | 223 | char* ip = TEST_IP; |
diff --git a/src/gns/test_gns_simple_zkey_lookup.c b/src/gns/test_gns_simple_zkey_lookup.c index 8a4a4a59c..798fa5b5d 100644 --- a/src/gns/test_gns_simple_zkey_lookup.c +++ b/src/gns/test_gns_simple_zkey_lookup.c | |||
@@ -199,8 +199,8 @@ do_check (void *cls, | |||
199 | const struct GNUNET_CONFIGURATION_Handle *ccfg, | 199 | const struct GNUNET_CONFIGURATION_Handle *ccfg, |
200 | struct GNUNET_TESTING_Peer *peer) | 200 | struct GNUNET_TESTING_Peer *peer) |
201 | { | 201 | { |
202 | struct GNUNET_CRYPTO_EccPublicKey alice_pkey; | 202 | struct GNUNET_CRYPTO_EccPublicSignKey alice_pkey; |
203 | struct GNUNET_CRYPTO_EccPublicKey bob_pkey; | 203 | struct GNUNET_CRYPTO_EccPublicSignKey bob_pkey; |
204 | struct GNUNET_CRYPTO_EccPrivateKey *alice_key; | 204 | struct GNUNET_CRYPTO_EccPrivateKey *alice_key; |
205 | struct GNUNET_CRYPTO_EccPrivateKey *bob_key; | 205 | struct GNUNET_CRYPTO_EccPrivateKey *bob_key; |
206 | struct GNUNET_CRYPTO_EccSignature *sig; | 206 | struct GNUNET_CRYPTO_EccSignature *sig; |
@@ -230,8 +230,8 @@ do_check (void *cls, | |||
230 | alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (alice_keyfile); | 230 | alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (alice_keyfile); |
231 | bob_key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE_BOB); | 231 | bob_key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE_BOB); |
232 | 232 | ||
233 | GNUNET_CRYPTO_ecc_key_get_public (alice_key, &alice_pkey); | 233 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (alice_key, &alice_pkey); |
234 | GNUNET_CRYPTO_ecc_key_get_public (bob_key, &bob_pkey); | 234 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (bob_key, &bob_pkey); |
235 | 235 | ||
236 | struct GNUNET_NAMESTORE_RecordData rd; | 236 | struct GNUNET_NAMESTORE_RecordData rd; |
237 | char* ip = TEST_IP; | 237 | char* ip = TEST_IP; |