diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-10-10 14:38:55 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-10-10 14:38:55 +0000 |
commit | 9351b1e9bdf2b067b6db06562c26ba658cff42b8 (patch) | |
tree | 68dc4ab447e7e8b6a20a706858cd36238c1c7c5f /src/gns | |
parent | 8beabcd96c0cf1e1873c0b5ff96e537f1beb0b34 (diff) | |
download | gnunet-9351b1e9bdf2b067b6db06562c26ba658cff42b8.tar.gz gnunet-9351b1e9bdf2b067b6db06562c26ba658cff42b8.zip |
separating ECC crypto into functions/structs for ECDHE, ECDSA and EDDSA
Diffstat (limited to 'src/gns')
-rw-r--r-- | src/gns/gns.h | 4 | ||||
-rw-r--r-- | src/gns/gns_api.c | 4 | ||||
-rw-r--r-- | src/gns/gnunet-dns2gns.c | 4 | ||||
-rw-r--r-- | src/gns/gnunet-gns-helper-service-w32.c | 16 | ||||
-rw-r--r-- | src/gns/gnunet-gns-proxy.c | 6 | ||||
-rw-r--r-- | src/gns/gnunet-gns.c | 22 | ||||
-rw-r--r-- | src/gns/gnunet-service-gns.c | 12 | ||||
-rw-r--r-- | src/gns/gnunet-service-gns_interceptor.c | 4 | ||||
-rw-r--r-- | src/gns/gnunet-service-gns_interceptor.h | 2 | ||||
-rw-r--r-- | src/gns/gnunet-service-gns_resolver.c | 28 | ||||
-rw-r--r-- | src/gns/gnunet-service-gns_resolver.h | 4 | ||||
-rw-r--r-- | src/gns/gnunet-service-gns_shorten.c | 24 | ||||
-rw-r--r-- | src/gns/gnunet-service-gns_shorten.h | 4 | ||||
-rw-r--r-- | src/gns/plugin_block_gns.c | 2 | ||||
-rw-r--r-- | src/gns/test_gns_proxy.c | 4 | ||||
-rw-r--r-- | src/gns/test_gns_pseu_shorten.c | 52 | ||||
-rw-r--r-- | src/gns/test_gns_revocation.c | 18 | ||||
-rw-r--r-- | src/gns/test_gns_simple_shorten.c | 42 | ||||
-rw-r--r-- | src/gns/test_gns_simple_srv_lookup.c | 18 | ||||
-rw-r--r-- | src/gns/test_gns_simple_zkey_lookup.c | 18 |
20 files changed, 144 insertions, 144 deletions
diff --git a/src/gns/gns.h b/src/gns/gns.h index 571b62dc7..17a7c7323 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_EccPublicSignKey zone; | 66 | struct GNUNET_CRYPTO_EcdsaPublicKey zone; |
67 | 67 | ||
68 | /** | 68 | /** |
69 | * Only check cached results | 69 | * Only check cached results |
@@ -83,7 +83,7 @@ struct GNUNET_GNS_ClientLookupMessage | |||
83 | /** | 83 | /** |
84 | * The key for shorten, if @e have_key is set | 84 | * The key for shorten, if @e have_key is set |
85 | */ | 85 | */ |
86 | struct GNUNET_CRYPTO_EccPrivateKey shorten_key; | 86 | struct GNUNET_CRYPTO_EcdsaPrivateKey shorten_key; |
87 | 87 | ||
88 | /* Followed by the name to look up */ | 88 | /* Followed by the name to look up */ |
89 | }; | 89 | }; |
diff --git a/src/gns/gns_api.c b/src/gns/gns_api.c index 75c2f9530..3d58922ad 100644 --- a/src/gns/gns_api.c +++ b/src/gns/gns_api.c | |||
@@ -527,10 +527,10 @@ GNUNET_GNS_lookup_cancel (struct GNUNET_GNS_LookupRequest *lr) | |||
527 | struct GNUNET_GNS_LookupRequest* | 527 | struct GNUNET_GNS_LookupRequest* |
528 | GNUNET_GNS_lookup (struct GNUNET_GNS_Handle *handle, | 528 | GNUNET_GNS_lookup (struct GNUNET_GNS_Handle *handle, |
529 | const char *name, | 529 | const char *name, |
530 | const struct GNUNET_CRYPTO_EccPublicSignKey *zone, | 530 | const struct GNUNET_CRYPTO_EcdsaPublicKey *zone, |
531 | int type, | 531 | int type, |
532 | int only_cached, | 532 | int only_cached, |
533 | const struct GNUNET_CRYPTO_EccPrivateKey *shorten_zone_key, | 533 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *shorten_zone_key, |
534 | GNUNET_GNS_LookupResultProcessor proc, | 534 | GNUNET_GNS_LookupResultProcessor proc, |
535 | void *proc_cls) | 535 | void *proc_cls) |
536 | { | 536 | { |
diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c index 42d5ef0e2..6b7afdb59 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_EccPublicSignKey my_zone; | 146 | static struct GNUNET_CRYPTO_EcdsaPublicKey my_zone; |
147 | 147 | ||
148 | /** | 148 | /** |
149 | * '-z' option with the main zone to use. | 149 | * '-z' option with the main zone to use. |
@@ -741,7 +741,7 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
741 | } | 741 | } |
742 | if ( (NULL == gns_zone_str) || | 742 | if ( (NULL == gns_zone_str) || |
743 | (GNUNET_OK != | 743 | (GNUNET_OK != |
744 | GNUNET_CRYPTO_ecc_public_sign_key_from_string (gns_zone_str, | 744 | GNUNET_CRYPTO_ecdsa_public_key_from_string (gns_zone_str, |
745 | strlen (gns_zone_str), | 745 | strlen (gns_zone_str), |
746 | &my_zone)) ) | 746 | &my_zone)) ) |
747 | { | 747 | { |
diff --git a/src/gns/gnunet-gns-helper-service-w32.c b/src/gns/gnunet-gns-helper-service-w32.c index 26a3f688a..78eb1e0a3 100644 --- a/src/gns/gnunet-gns-helper-service-w32.c +++ b/src/gns/gnunet-gns-helper-service-w32.c | |||
@@ -61,9 +61,9 @@ 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_EccPublicSignKey *zone = NULL; | 64 | static struct GNUNET_CRYPTO_EcdsaPublicKey *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_EcdsaPrivateKey *shorten_key = NULL; |
67 | 67 | ||
68 | 68 | ||
69 | /** | 69 | /** |
@@ -662,8 +662,8 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
662 | }; | 662 | }; |
663 | 663 | ||
664 | char* keyfile; | 664 | char* keyfile; |
665 | struct GNUNET_CRYPTO_EccPrivateKey *key = NULL; | 665 | struct GNUNET_CRYPTO_EcdsaPrivateKey *key = NULL; |
666 | struct GNUNET_CRYPTO_EccPublicSignKey pkey; | 666 | struct GNUNET_CRYPTO_EcdsaPublicKey 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", |
@@ -677,9 +677,9 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
677 | { | 677 | { |
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_ecdsa_key_create_from_file (keyfile); |
681 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (key, &pkey); | 681 | GNUNET_CRYPTO_ecdsa_key_get_public (key, &pkey); |
682 | GNUNET_CRYPTO_hash (&pkey, sizeof(struct GNUNET_CRYPTO_EccPublicSignKey), | 682 | GNUNET_CRYPTO_hash (&pkey, sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey), |
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, |
@@ -700,7 +700,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
700 | { | 700 | { |
701 | if (GNUNET_YES == GNUNET_DISK_file_test (keyfile)) | 701 | if (GNUNET_YES == GNUNET_DISK_file_test (keyfile)) |
702 | { | 702 | { |
703 | shorten_key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile); | 703 | shorten_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (keyfile); |
704 | } | 704 | } |
705 | GNUNET_free(keyfile); | 705 | GNUNET_free(keyfile); |
706 | } | 706 | } |
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index a67f7356e..276ea70b0 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c | |||
@@ -623,12 +623,12 @@ static struct Socks5Request *s5r_tail; | |||
623 | /** | 623 | /** |
624 | * The users local GNS master zone | 624 | * The users local GNS master zone |
625 | */ | 625 | */ |
626 | static struct GNUNET_CRYPTO_EccPublicSignKey local_gns_zone; | 626 | static struct GNUNET_CRYPTO_EcdsaPublicKey local_gns_zone; |
627 | 627 | ||
628 | /** | 628 | /** |
629 | * The users local shorten zone | 629 | * The users local shorten zone |
630 | */ | 630 | */ |
631 | static struct GNUNET_CRYPTO_EccPrivateKey local_shorten_zone; | 631 | static struct GNUNET_CRYPTO_EcdsaPrivateKey local_shorten_zone; |
632 | 632 | ||
633 | /** | 633 | /** |
634 | * Is shortening enabled? | 634 | * Is shortening enabled? |
@@ -2864,7 +2864,7 @@ main (int argc, char *const *argv) | |||
2864 | &run, NULL)) ? 0 : 1; | 2864 | &run, NULL)) ? 0 : 1; |
2865 | MHD_destroy_response (curl_failure_response); | 2865 | MHD_destroy_response (curl_failure_response); |
2866 | GNUNET_free_non_null ((char *) argv); | 2866 | GNUNET_free_non_null ((char *) argv); |
2867 | GNUNET_CRYPTO_ecc_key_clear (&local_shorten_zone); | 2867 | GNUNET_CRYPTO_ecdsa_key_clear (&local_shorten_zone); |
2868 | return ret; | 2868 | return ret; |
2869 | } | 2869 | } |
2870 | 2870 | ||
diff --git a/src/gns/gnunet-gns.c b/src/gns/gnunet-gns.c index 713f94b92..0a4275f0d 100644 --- a/src/gns/gnunet-gns.c +++ b/src/gns/gnunet-gns.c | |||
@@ -191,8 +191,8 @@ process_lookup_result (void *cls, uint32_t rd_count, | |||
191 | * @param shorten_key private key used for shortening, can be NULL | 191 | * @param shorten_key private key used for shortening, can be NULL |
192 | */ | 192 | */ |
193 | static void | 193 | static void |
194 | lookup_with_keys (const struct GNUNET_CRYPTO_EccPublicSignKey *pkey, | 194 | lookup_with_keys (const struct GNUNET_CRYPTO_EcdsaPublicKey *pkey, |
195 | const struct GNUNET_CRYPTO_EccPrivateKey *shorten_key) | 195 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *shorten_key) |
196 | { | 196 | { |
197 | if (NULL != lookup_type) | 197 | if (NULL != lookup_type) |
198 | rtype = GNUNET_NAMESTORE_typename_to_number (lookup_type); | 198 | rtype = GNUNET_NAMESTORE_typename_to_number (lookup_type); |
@@ -238,7 +238,7 @@ identity_shorten_cb (void *cls, | |||
238 | void **ctx, | 238 | void **ctx, |
239 | const char *name) | 239 | const char *name) |
240 | { | 240 | { |
241 | struct GNUNET_CRYPTO_EccPublicSignKey *pkeym = cls; | 241 | struct GNUNET_CRYPTO_EcdsaPublicKey *pkeym = cls; |
242 | 242 | ||
243 | id_op = NULL; | 243 | id_op = NULL; |
244 | if (NULL == ego) | 244 | if (NULL == ego) |
@@ -257,12 +257,12 @@ identity_shorten_cb (void *cls, | |||
257 | * @param pkey public key to use for the zone | 257 | * @param pkey public key to use for the zone |
258 | */ | 258 | */ |
259 | static void | 259 | static void |
260 | lookup_with_public_key (const struct GNUNET_CRYPTO_EccPublicSignKey *pkey) | 260 | lookup_with_public_key (const struct GNUNET_CRYPTO_EcdsaPublicKey *pkey) |
261 | { | 261 | { |
262 | struct GNUNET_CRYPTO_EccPublicSignKey *pkeym; | 262 | struct GNUNET_CRYPTO_EcdsaPublicKey *pkeym; |
263 | 263 | ||
264 | GNUNET_assert (NULL != pkey); | 264 | GNUNET_assert (NULL != pkey); |
265 | pkeym = GNUNET_new (struct GNUNET_CRYPTO_EccPublicSignKey); | 265 | pkeym = GNUNET_new (struct GNUNET_CRYPTO_EcdsaPublicKey); |
266 | *pkeym = *pkey; | 266 | *pkeym = *pkey; |
267 | id_op = GNUNET_IDENTITY_get (identity, | 267 | id_op = GNUNET_IDENTITY_get (identity, |
268 | "gns-short", | 268 | "gns-short", |
@@ -287,7 +287,7 @@ static void | |||
287 | identity_zone_cb (void *cls, | 287 | identity_zone_cb (void *cls, |
288 | const struct GNUNET_IDENTITY_Ego *ego) | 288 | const struct GNUNET_IDENTITY_Ego *ego) |
289 | { | 289 | { |
290 | struct GNUNET_CRYPTO_EccPublicSignKey pkey; | 290 | struct GNUNET_CRYPTO_EcdsaPublicKey pkey; |
291 | 291 | ||
292 | el = NULL; | 292 | el = NULL; |
293 | if (NULL == ego) | 293 | if (NULL == ego) |
@@ -325,7 +325,7 @@ identity_master_cb (void *cls, | |||
325 | void **ctx, | 325 | void **ctx, |
326 | const char *name) | 326 | const char *name) |
327 | { | 327 | { |
328 | struct GNUNET_CRYPTO_EccPublicSignKey pkey; | 328 | struct GNUNET_CRYPTO_EcdsaPublicKey pkey; |
329 | 329 | ||
330 | id_op = NULL; | 330 | id_op = NULL; |
331 | if (NULL == ego) | 331 | if (NULL == ego) |
@@ -352,7 +352,7 @@ static void | |||
352 | run (void *cls, char *const *args, const char *cfgfile, | 352 | run (void *cls, char *const *args, const char *cfgfile, |
353 | const struct GNUNET_CONFIGURATION_Handle *c) | 353 | const struct GNUNET_CONFIGURATION_Handle *c) |
354 | { | 354 | { |
355 | struct GNUNET_CRYPTO_EccPublicSignKey pkey; | 355 | struct GNUNET_CRYPTO_EcdsaPublicKey pkey; |
356 | 356 | ||
357 | cfg = c; | 357 | cfg = c; |
358 | gns = GNUNET_GNS_connect (cfg); | 358 | gns = GNUNET_GNS_connect (cfg); |
@@ -368,7 +368,7 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
368 | if (NULL != public_key) | 368 | if (NULL != public_key) |
369 | { | 369 | { |
370 | if (GNUNET_OK != | 370 | if (GNUNET_OK != |
371 | GNUNET_CRYPTO_ecc_public_sign_key_from_string (public_key, | 371 | GNUNET_CRYPTO_ecdsa_public_key_from_string (public_key, |
372 | strlen (public_key), | 372 | strlen (public_key), |
373 | &pkey)) | 373 | &pkey)) |
374 | { | 374 | { |
@@ -395,7 +395,7 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
395 | &lookup_name[strlen (lookup_name) - 4])) ) | 395 | &lookup_name[strlen (lookup_name) - 4])) ) |
396 | { | 396 | { |
397 | /* no zone required, use 'anonymous' zone */ | 397 | /* no zone required, use 'anonymous' zone */ |
398 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (GNUNET_CRYPTO_ecc_key_get_anonymous (), | 398 | GNUNET_CRYPTO_ecdsa_key_get_public (GNUNET_CRYPTO_ecdsa_key_get_anonymous (), |
399 | &pkey); | 399 | &pkey); |
400 | lookup_with_public_key (&pkey); | 400 | lookup_with_public_key (&pkey); |
401 | } | 401 | } |
diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c index 8fcd75e7c..d3728ee00 100644 --- a/src/gns/gnunet-service-gns.c +++ b/src/gns/gnunet-service-gns.c | |||
@@ -318,7 +318,7 @@ dht_put_continuation (void *cls, | |||
318 | */ | 318 | */ |
319 | static void | 319 | static void |
320 | put_gns_record (void *cls, | 320 | put_gns_record (void *cls, |
321 | const struct GNUNET_CRYPTO_EccPrivateKey *key, | 321 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *key, |
322 | const char *name, | 322 | const char *name, |
323 | unsigned int rd_count, | 323 | unsigned int rd_count, |
324 | const struct GNUNET_NAMESTORE_RecordData *rd) | 324 | const struct GNUNET_NAMESTORE_RecordData *rd) |
@@ -414,8 +414,8 @@ put_gns_record (void *cls, | |||
414 | rd_public, | 414 | rd_public, |
415 | rd_public_count); | 415 | rd_public_count); |
416 | block_size = ntohl (block->purpose.size) | 416 | block_size = ntohl (block->purpose.size) |
417 | + sizeof (struct GNUNET_CRYPTO_EccSignature) | 417 | + sizeof (struct GNUNET_CRYPTO_EcdsaSignature) |
418 | + sizeof (struct GNUNET_CRYPTO_EccPublicSignKey); | 418 | + sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey); |
419 | GNUNET_NAMESTORE_query_from_private_key (key, | 419 | GNUNET_NAMESTORE_query_from_private_key (key, |
420 | name, | 420 | name, |
421 | &query); | 421 | &query); |
@@ -528,7 +528,7 @@ handle_lookup (void *cls, | |||
528 | struct ClientLookupHandle *clh; | 528 | struct ClientLookupHandle *clh; |
529 | char *nameptr = name; | 529 | char *nameptr = name; |
530 | const char *utf_in; | 530 | const char *utf_in; |
531 | const struct GNUNET_CRYPTO_EccPrivateKey *key; | 531 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *key; |
532 | uint16_t msg_size; | 532 | uint16_t msg_size; |
533 | const struct GNUNET_GNS_ClientLookupMessage *sh_msg; | 533 | const struct GNUNET_GNS_ClientLookupMessage *sh_msg; |
534 | 534 | ||
@@ -630,7 +630,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
630 | { &handle_lookup, NULL, GNUNET_MESSAGE_TYPE_GNS_LOOKUP, 0}, | 630 | { &handle_lookup, NULL, GNUNET_MESSAGE_TYPE_GNS_LOOKUP, 0}, |
631 | {NULL, NULL, 0, 0} | 631 | {NULL, NULL, 0, 0} |
632 | }; | 632 | }; |
633 | struct GNUNET_CRYPTO_EccPublicSignKey dns_root; | 633 | struct GNUNET_CRYPTO_EcdsaPublicKey dns_root; |
634 | unsigned long long max_parallel_bg_queries = 0; | 634 | unsigned long long max_parallel_bg_queries = 0; |
635 | char *dns_root_name; | 635 | char *dns_root_name; |
636 | 636 | ||
@@ -683,7 +683,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
683 | &dns_root_name)) | 683 | &dns_root_name)) |
684 | { | 684 | { |
685 | if (GNUNET_OK != | 685 | if (GNUNET_OK != |
686 | GNUNET_CRYPTO_ecc_public_sign_key_from_string (dns_root_name, | 686 | GNUNET_CRYPTO_ecdsa_public_key_from_string (dns_root_name, |
687 | strlen (dns_root_name), | 687 | strlen (dns_root_name), |
688 | &dns_root)) | 688 | &dns_root)) |
689 | { | 689 | { |
diff --git a/src/gns/gnunet-service-gns_interceptor.c b/src/gns/gnunet-service-gns_interceptor.c index 8cb1951bf..61568c438 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_EccPublicSignKey zone; | 78 | static struct GNUNET_CRYPTO_EcdsaPublicKey zone; |
79 | 79 | ||
80 | /** | 80 | /** |
81 | * Head of the DLL. | 81 | * Head of the DLL. |
@@ -353,7 +353,7 @@ handle_dns_request (void *cls, | |||
353 | * @return #GNUNET_OK on success | 353 | * @return #GNUNET_OK on success |
354 | */ | 354 | */ |
355 | int | 355 | int |
356 | GNS_interceptor_init (const struct GNUNET_CRYPTO_EccPublicSignKey *gnu_zone, | 356 | GNS_interceptor_init (const struct GNUNET_CRYPTO_EcdsaPublicKey *gnu_zone, |
357 | const struct GNUNET_CONFIGURATION_Handle *c) | 357 | const struct GNUNET_CONFIGURATION_Handle *c) |
358 | { | 358 | { |
359 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 359 | 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 509875645..bfcc54017 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_EccPublicSignKey *gnu_zone, | 39 | GNS_interceptor_init (const struct GNUNET_CRYPTO_EcdsaPublicKey *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 43d50aed5..4b26803ff 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_EccPublicSignKey gns_authority; | 115 | struct GNUNET_CRYPTO_EcdsaPublicKey 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_EccPublicSignKey authority_zone; | 233 | struct GNUNET_CRYPTO_EcdsaPublicKey authority_zone; |
234 | 234 | ||
235 | /** | 235 | /** |
236 | * called when resolution phase finishes | 236 | * called when resolution phase finishes |
@@ -286,7 +286,7 @@ struct GNS_ResolverHandle | |||
286 | /** | 286 | /** |
287 | * Private key of the shorten zone, NULL to not shorten. | 287 | * Private key of the shorten zone, NULL to not shorten. |
288 | */ | 288 | */ |
289 | struct GNUNET_CRYPTO_EccPrivateKey *shorten_key; | 289 | struct GNUNET_CRYPTO_EcdsaPrivateKey *shorten_key; |
290 | 290 | ||
291 | /** | 291 | /** |
292 | * ID of a task associated with the resolution process. | 292 | * ID of a task associated with the resolution process. |
@@ -1421,9 +1421,9 @@ handle_gns_resolution_result (void *cls, | |||
1421 | /* tigger shortening */ | 1421 | /* tigger shortening */ |
1422 | if (NULL != rh->shorten_key) | 1422 | if (NULL != rh->shorten_key) |
1423 | { | 1423 | { |
1424 | struct GNUNET_CRYPTO_EccPublicSignKey pub; | 1424 | struct GNUNET_CRYPTO_EcdsaPublicKey pub; |
1425 | 1425 | ||
1426 | if (rd[i].data_size != sizeof (struct GNUNET_CRYPTO_EccPublicSignKey)) | 1426 | if (rd[i].data_size != sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey)) |
1427 | { | 1427 | { |
1428 | GNUNET_break_op (0); | 1428 | GNUNET_break_op (0); |
1429 | break; | 1429 | break; |
@@ -1454,7 +1454,7 @@ handle_gns_resolution_result (void *cls, | |||
1454 | { | 1454 | { |
1455 | case GNUNET_NAMESTORE_TYPE_PKEY: | 1455 | case GNUNET_NAMESTORE_TYPE_PKEY: |
1456 | /* delegation to another zone */ | 1456 | /* delegation to another zone */ |
1457 | if (sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) != | 1457 | if (sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) != |
1458 | rd[i].data_size) | 1458 | rd[i].data_size) |
1459 | { | 1459 | { |
1460 | GNUNET_break_op (0); | 1460 | GNUNET_break_op (0); |
@@ -1468,7 +1468,7 @@ handle_gns_resolution_result (void *cls, | |||
1468 | ac->gns_authority = GNUNET_YES; | 1468 | ac->gns_authority = GNUNET_YES; |
1469 | memcpy (&ac->authority_info.gns_authority, | 1469 | memcpy (&ac->authority_info.gns_authority, |
1470 | rd[i].data, | 1470 | rd[i].data, |
1471 | sizeof (struct GNUNET_CRYPTO_EccPublicSignKey)); | 1471 | sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey)); |
1472 | ac->label = resolver_lookup_get_next_label (rh); | 1472 | ac->label = resolver_lookup_get_next_label (rh); |
1473 | /* tigger shortening */ | 1473 | /* tigger shortening */ |
1474 | if (NULL != rh->shorten_key) | 1474 | if (NULL != rh->shorten_key) |
@@ -1719,8 +1719,8 @@ handle_dht_response (void *cls, | |||
1719 | block = data; | 1719 | block = data; |
1720 | if (size != | 1720 | if (size != |
1721 | ntohl (block->purpose.size) + | 1721 | ntohl (block->purpose.size) + |
1722 | sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) + | 1722 | sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) + |
1723 | sizeof (struct GNUNET_CRYPTO_EccSignature)) | 1723 | sizeof (struct GNUNET_CRYPTO_EcdsaSignature)) |
1724 | { | 1724 | { |
1725 | /* how did this pass DHT block validation!? */ | 1725 | /* how did this pass DHT block validation!? */ |
1726 | GNUNET_break (0); | 1726 | GNUNET_break (0); |
@@ -1768,7 +1768,7 @@ handle_namestore_block_response (void *cls, | |||
1768 | struct GNS_ResolverHandle *rx; | 1768 | struct GNS_ResolverHandle *rx; |
1769 | struct AuthorityChain *ac = rh->ac_tail; | 1769 | struct AuthorityChain *ac = rh->ac_tail; |
1770 | const char *label = ac->label; | 1770 | const char *label = ac->label; |
1771 | const struct GNUNET_CRYPTO_EccPublicSignKey *auth = &ac->authority_info.gns_authority; | 1771 | const struct GNUNET_CRYPTO_EcdsaPublicKey *auth = &ac->authority_info.gns_authority; |
1772 | struct GNUNET_HashCode query; | 1772 | struct GNUNET_HashCode query; |
1773 | 1773 | ||
1774 | GNUNET_NAMESTORE_query_from_public_key (auth, | 1774 | GNUNET_NAMESTORE_query_from_public_key (auth, |
@@ -1947,7 +1947,7 @@ start_resolver_lookup (struct GNS_ResolverHandle *rh) | |||
1947 | if ( (NULL == x) || | 1947 | if ( (NULL == x) || |
1948 | (NULL == y) || | 1948 | (NULL == y) || |
1949 | (GNUNET_OK != | 1949 | (GNUNET_OK != |
1950 | GNUNET_CRYPTO_ecc_public_sign_key_from_string (pkey, | 1950 | GNUNET_CRYPTO_ecdsa_public_key_from_string (pkey, |
1951 | strlen (pkey), | 1951 | strlen (pkey), |
1952 | &rh->authority_zone)) ) | 1952 | &rh->authority_zone)) ) |
1953 | { | 1953 | { |
@@ -1995,10 +1995,10 @@ start_resolver_lookup (struct GNS_ResolverHandle *rh) | |||
1995 | * @return handle to cancel operation | 1995 | * @return handle to cancel operation |
1996 | */ | 1996 | */ |
1997 | struct GNS_ResolverHandle * | 1997 | struct GNS_ResolverHandle * |
1998 | GNS_resolver_lookup (const struct GNUNET_CRYPTO_EccPublicSignKey *zone, | 1998 | GNS_resolver_lookup (const struct GNUNET_CRYPTO_EcdsaPublicKey *zone, |
1999 | uint32_t record_type, | 1999 | uint32_t record_type, |
2000 | const char *name, | 2000 | const char *name, |
2001 | const struct GNUNET_CRYPTO_EccPrivateKey *shorten_key, | 2001 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *shorten_key, |
2002 | int only_cached, | 2002 | int only_cached, |
2003 | GNS_ResultProcessor proc, void *proc_cls) | 2003 | GNS_ResultProcessor proc, void *proc_cls) |
2004 | { | 2004 | { |
@@ -2022,7 +2022,7 @@ GNS_resolver_lookup (const struct GNUNET_CRYPTO_EccPublicSignKey *zone, | |||
2022 | rh->name_resolution_pos = strlen (name); | 2022 | rh->name_resolution_pos = strlen (name); |
2023 | if (NULL != shorten_key) | 2023 | if (NULL != shorten_key) |
2024 | { | 2024 | { |
2025 | rh->shorten_key = GNUNET_new (struct GNUNET_CRYPTO_EccPrivateKey); | 2025 | rh->shorten_key = GNUNET_new (struct GNUNET_CRYPTO_EcdsaPrivateKey); |
2026 | *rh->shorten_key = *shorten_key; | 2026 | *rh->shorten_key = *shorten_key; |
2027 | } | 2027 | } |
2028 | start_resolver_lookup (rh); | 2028 | start_resolver_lookup (rh); |
diff --git a/src/gns/gnunet-service-gns_resolver.h b/src/gns/gnunet-service-gns_resolver.h index e9916c778..06273766a 100644 --- a/src/gns/gnunet-service-gns_resolver.h +++ b/src/gns/gnunet-service-gns_resolver.h | |||
@@ -83,10 +83,10 @@ 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_EccPublicSignKey *zone, | 86 | GNS_resolver_lookup (const struct GNUNET_CRYPTO_EcdsaPublicKey *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_EcdsaPrivateKey *shorten_key, |
90 | int only_cached, | 90 | int only_cached, |
91 | GNS_ResultProcessor proc, | 91 | GNS_ResultProcessor proc, |
92 | void *proc_cls); | 92 | void *proc_cls); |
diff --git a/src/gns/gnunet-service-gns_shorten.c b/src/gns/gnunet-service-gns_shorten.c index ff2cab097..f0c96716a 100644 --- a/src/gns/gnunet-service-gns_shorten.c +++ b/src/gns/gnunet-service-gns_shorten.c | |||
@@ -65,7 +65,7 @@ struct GetPseuAuthorityHandle | |||
65 | * Private key of the (shorten) zone to store the resulting | 65 | * Private key of the (shorten) zone to store the resulting |
66 | * pseudonym in. | 66 | * pseudonym in. |
67 | */ | 67 | */ |
68 | struct GNUNET_CRYPTO_EccPrivateKey shorten_zone_key; | 68 | struct GNUNET_CRYPTO_EcdsaPrivateKey shorten_zone_key; |
69 | 69 | ||
70 | /** | 70 | /** |
71 | * Original label (used if no PSEU record is found). | 71 | * Original label (used if no PSEU record is found). |
@@ -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_EccPublicSignKey target_zone; | 83 | struct GNUNET_CRYPTO_EcdsaPublicKey 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_EccPublicSignKey pub; | 198 | struct GNUNET_CRYPTO_EcdsaPublicKey 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_for_signature (&gph->shorten_zone_key, | 206 | GNUNET_CRYPTO_ecdsa_key_get_public (&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_EccPublicSignKey pub; | 232 | struct GNUNET_CRYPTO_EcdsaPublicKey pub; |
233 | struct GNUNET_HashCode query; | 233 | struct GNUNET_HashCode query; |
234 | 234 | ||
235 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (&gph->shorten_zone_key, | 235 | GNUNET_CRYPTO_ecdsa_key_get_public (&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_EccPublicSignKey); | 290 | new_pkey.data_size = sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey); |
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 |
@@ -437,8 +437,8 @@ process_auth_discovery_dht_result (void* cls, | |||
437 | block = data; | 437 | block = data; |
438 | if (size != | 438 | if (size != |
439 | ntohl (block->purpose.size) + | 439 | ntohl (block->purpose.size) + |
440 | sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) + | 440 | sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) + |
441 | sizeof (struct GNUNET_CRYPTO_EccSignature)) | 441 | sizeof (struct GNUNET_CRYPTO_EcdsaSignature)) |
442 | { | 442 | { |
443 | /* how did this pass DHT block validation!? */ | 443 | /* how did this pass DHT block validation!? */ |
444 | GNUNET_break (0); | 444 | GNUNET_break (0); |
@@ -472,7 +472,7 @@ process_auth_discovery_dht_result (void* cls, | |||
472 | */ | 472 | */ |
473 | static void | 473 | static void |
474 | process_zone_to_name_discover (void *cls, | 474 | process_zone_to_name_discover (void *cls, |
475 | const struct GNUNET_CRYPTO_EccPrivateKey *zone_key, | 475 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key, |
476 | const char *name, | 476 | const char *name, |
477 | unsigned int rd_len, | 477 | unsigned int rd_len, |
478 | const struct GNUNET_NAMESTORE_RecordData *rd) | 478 | const struct GNUNET_NAMESTORE_RecordData *rd) |
@@ -519,8 +519,8 @@ process_zone_to_name_discover (void *cls, | |||
519 | */ | 519 | */ |
520 | void | 520 | void |
521 | GNS_shorten_start (const char *original_label, | 521 | GNS_shorten_start (const char *original_label, |
522 | const struct GNUNET_CRYPTO_EccPublicSignKey *pub, | 522 | const struct GNUNET_CRYPTO_EcdsaPublicKey *pub, |
523 | const struct GNUNET_CRYPTO_EccPrivateKey *shorten_zone) | 523 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *shorten_zone) |
524 | { | 524 | { |
525 | struct GetPseuAuthorityHandle *gph; | 525 | struct GetPseuAuthorityHandle *gph; |
526 | 526 | ||
diff --git a/src/gns/gnunet-service-gns_shorten.h b/src/gns/gnunet-service-gns_shorten.h index ed3bdf11f..5f583eeb5 100644 --- a/src/gns/gnunet-service-gns_shorten.h +++ b/src/gns/gnunet-service-gns_shorten.h | |||
@@ -59,8 +59,8 @@ 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_EccPublicSignKey *pub, | 62 | const struct GNUNET_CRYPTO_EcdsaPublicKey *pub, |
63 | const struct GNUNET_CRYPTO_EccPrivateKey *shorten_zone); | 63 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *shorten_zone); |
64 | 64 | ||
65 | 65 | ||
66 | #endif | 66 | #endif |
diff --git a/src/gns/plugin_block_gns.c b/src/gns/plugin_block_gns.c index 932900910..ad2e6594e 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 (ntohl (block->purpose.size) + sizeof (struct GNUNET_CRYPTO_EccSignature) + sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) != | 88 | if (ntohl (block->purpose.size) + sizeof (struct GNUNET_CRYPTO_EcdsaSignature) + sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) != |
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_proxy.c b/src/gns/test_gns_proxy.c index 8563eda2f..66a2eb091 100644 --- a/src/gns/test_gns_proxy.c +++ b/src/gns/test_gns_proxy.c | |||
@@ -364,7 +364,7 @@ run (void *cls, | |||
364 | struct GNUNET_TESTING_Peer *peer) | 364 | struct GNUNET_TESTING_Peer *peer) |
365 | { | 365 | { |
366 | enum MHD_FLAG flags; | 366 | enum MHD_FLAG flags; |
367 | struct GNUNET_CRYPTO_EccPrivateKey *host_key; | 367 | struct GNUNET_CRYPTO_EcdsaPrivateKey *host_key; |
368 | struct GNUNET_NAMESTORE_RecordData rd; | 368 | struct GNUNET_NAMESTORE_RecordData rd; |
369 | char *zone_keyfile; | 369 | char *zone_keyfile; |
370 | 370 | ||
@@ -421,7 +421,7 @@ run (void *cls, | |||
421 | return; | 421 | return; |
422 | } | 422 | } |
423 | 423 | ||
424 | host_key = GNUNET_CRYPTO_ecc_key_create_from_file (zone_keyfile); | 424 | host_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (zone_keyfile); |
425 | rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us; | 425 | rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us; |
426 | GNUNET_assert (GNUNET_OK == GNUNET_NAMESTORE_string_to_value (GNUNET_DNSPARSER_TYPE_A, | 426 | GNUNET_assert (GNUNET_OK == GNUNET_NAMESTORE_string_to_value (GNUNET_DNSPARSER_TYPE_A, |
427 | "127.0.0.1", | 427 | "127.0.0.1", |
diff --git a/src/gns/test_gns_pseu_shorten.c b/src/gns/test_gns_pseu_shorten.c index a4c337067..f4c628cb0 100644 --- a/src/gns/test_gns_pseu_shorten.c +++ b/src/gns/test_gns_pseu_shorten.c | |||
@@ -69,16 +69,16 @@ 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_EccPublicSignKey alice_pkey; | 72 | static struct GNUNET_CRYPTO_EcdsaPublicKey alice_pkey; |
73 | static struct GNUNET_CRYPTO_EccPublicSignKey bob_pkey; | 73 | static struct GNUNET_CRYPTO_EcdsaPublicKey bob_pkey; |
74 | static struct GNUNET_CRYPTO_EccPublicSignKey our_pkey; | 74 | static struct GNUNET_CRYPTO_EcdsaPublicKey our_pkey; |
75 | static struct GNUNET_CRYPTO_EccPublicSignKey priv_pkey; | 75 | static struct GNUNET_CRYPTO_EcdsaPublicKey priv_pkey; |
76 | static struct GNUNET_CRYPTO_EccPublicSignKey short_pkey; | 76 | static struct GNUNET_CRYPTO_EcdsaPublicKey short_pkey; |
77 | static struct GNUNET_CRYPTO_EccPrivateKey *alice_key; | 77 | static struct GNUNET_CRYPTO_EcdsaPrivateKey *alice_key; |
78 | static struct GNUNET_CRYPTO_EccPrivateKey *bob_key; | 78 | static struct GNUNET_CRYPTO_EcdsaPrivateKey *bob_key; |
79 | static struct GNUNET_CRYPTO_EccPrivateKey *our_key; | 79 | static struct GNUNET_CRYPTO_EcdsaPrivateKey *our_key; |
80 | static struct GNUNET_CRYPTO_EccPrivateKey *priv_key; | 80 | static struct GNUNET_CRYPTO_EcdsaPrivateKey *priv_key; |
81 | static struct GNUNET_CRYPTO_EccPrivateKey *short_key; | 81 | static struct GNUNET_CRYPTO_EcdsaPrivateKey *short_key; |
82 | static struct GNUNET_CRYPTO_ShortHashCode alice_hash; | 82 | static struct GNUNET_CRYPTO_ShortHashCode alice_hash; |
83 | static struct GNUNET_CRYPTO_ShortHashCode bob_hash; | 83 | static struct GNUNET_CRYPTO_ShortHashCode bob_hash; |
84 | static struct GNUNET_CRYPTO_ShortHashCode our_zone; | 84 | static struct GNUNET_CRYPTO_ShortHashCode our_zone; |
@@ -265,7 +265,7 @@ put_pseu_dht (void *cls, int success) | |||
265 | struct GNUNET_HashCode zone_hash_double; | 265 | struct GNUNET_HashCode zone_hash_double; |
266 | uint32_t rd_payload_length; | 266 | uint32_t rd_payload_length; |
267 | char* nrb_data = NULL; | 267 | char* nrb_data = NULL; |
268 | struct GNUNET_CRYPTO_EccSignature *sig; | 268 | struct GNUNET_CRYPTO_EcdsaSignature *sig; |
269 | struct GNUNET_NAMESTORE_RecordData rd; | 269 | struct GNUNET_NAMESTORE_RecordData rd; |
270 | 270 | ||
271 | memset (&rd, 0, sizeof (struct GNUNET_NAMESTORE_RecordData)); | 271 | memset (&rd, 0, sizeof (struct GNUNET_NAMESTORE_RecordData)); |
@@ -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_EccPublicSignKey), | 319 | sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey), |
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); |
@@ -353,7 +353,7 @@ put_www_dht (void *cls, int success) | |||
353 | struct GNUNET_HashCode zone_hash_double; | 353 | struct GNUNET_HashCode zone_hash_double; |
354 | uint32_t rd_payload_length; | 354 | uint32_t rd_payload_length; |
355 | char* nrb_data = NULL; | 355 | char* nrb_data = NULL; |
356 | struct GNUNET_CRYPTO_EccSignature *sig; | 356 | struct GNUNET_CRYPTO_EcdsaSignature *sig; |
357 | struct GNUNET_NAMESTORE_RecordData rd; | 357 | struct GNUNET_NAMESTORE_RecordData rd; |
358 | char* ip = TEST_IP; | 358 | char* ip = TEST_IP; |
359 | struct in_addr *web = GNUNET_malloc(sizeof(struct in_addr)); | 359 | struct in_addr *web = GNUNET_malloc(sizeof(struct in_addr)); |
@@ -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_EccPublicSignKey), | 408 | sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey), |
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); |
@@ -441,7 +441,7 @@ put_pkey_dht (void *cls, int32_t success, const char *emsg) | |||
441 | struct GNUNET_HashCode zone_hash_double; | 441 | struct GNUNET_HashCode zone_hash_double; |
442 | uint32_t rd_payload_length; | 442 | uint32_t rd_payload_length; |
443 | char* nrb_data = NULL; | 443 | char* nrb_data = NULL; |
444 | struct GNUNET_CRYPTO_EccSignature *sig; | 444 | struct GNUNET_CRYPTO_EcdsaSignature *sig; |
445 | struct GNUNET_NAMESTORE_RecordData rd; | 445 | struct GNUNET_NAMESTORE_RecordData rd; |
446 | 446 | ||
447 | rd.expiration_time = UINT64_MAX; | 447 | rd.expiration_time = UINT64_MAX; |
@@ -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_EccPublicSignKey), | 491 | sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey), |
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); |
@@ -616,21 +616,21 @@ do_check (void *cls, | |||
616 | GNUNET_free (private_keyfile); | 616 | GNUNET_free (private_keyfile); |
617 | return; | 617 | return; |
618 | } | 618 | } |
619 | our_key = GNUNET_CRYPTO_ecc_key_create_from_file (our_keyfile); | 619 | our_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (our_keyfile); |
620 | priv_key = GNUNET_CRYPTO_ecc_key_create_from_file (private_keyfile); | 620 | priv_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (private_keyfile); |
621 | short_key = GNUNET_CRYPTO_ecc_key_create_from_file (shorten_keyfile); | 621 | short_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (shorten_keyfile); |
622 | bob_key = GNUNET_CRYPTO_ecc_key_create (); | 622 | bob_key = GNUNET_CRYPTO_ecdsa_key_create (); |
623 | alice_key = GNUNET_CRYPTO_ecc_key_create (); | 623 | alice_key = GNUNET_CRYPTO_ecdsa_key_create (); |
624 | 624 | ||
625 | GNUNET_free (our_keyfile); | 625 | GNUNET_free (our_keyfile); |
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_for_signature (our_key, &our_pkey); | 629 | GNUNET_CRYPTO_ecdsa_key_get_public (our_key, &our_pkey); |
630 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (priv_key, &priv_pkey); | 630 | GNUNET_CRYPTO_ecdsa_key_get_public (priv_key, &priv_pkey); |
631 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (short_key, &short_pkey); | 631 | GNUNET_CRYPTO_ecdsa_key_get_public (short_key, &short_pkey); |
632 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (bob_key, &bob_pkey); | 632 | GNUNET_CRYPTO_ecdsa_key_get_public (bob_key, &bob_pkey); |
633 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (alice_key, &alice_pkey); | 633 | GNUNET_CRYPTO_ecdsa_key_get_public (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 30fe5eb66..5be15759a 100644 --- a/src/gns/test_gns_revocation.c +++ b/src/gns/test_gns_revocation.c | |||
@@ -181,12 +181,12 @@ 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_EccPublicSignKey alice_pkey; | 184 | struct GNUNET_CRYPTO_EcdsaPublicKey alice_pkey; |
185 | struct GNUNET_CRYPTO_EccPublicSignKey bob_pkey; | 185 | struct GNUNET_CRYPTO_EcdsaPublicKey bob_pkey; |
186 | struct GNUNET_CRYPTO_EccPrivateKey *alice_key; | 186 | struct GNUNET_CRYPTO_EcdsaPrivateKey *alice_key; |
187 | struct GNUNET_CRYPTO_EccPrivateKey *bob_key; | 187 | struct GNUNET_CRYPTO_EcdsaPrivateKey *bob_key; |
188 | struct GNUNET_CRYPTO_ShortHashCode bob_hash; | 188 | struct GNUNET_CRYPTO_ShortHashCode bob_hash; |
189 | struct GNUNET_CRYPTO_EccSignature *sig; | 189 | struct GNUNET_CRYPTO_EcdsaSignature *sig; |
190 | char* alice_keyfile; | 190 | char* alice_keyfile; |
191 | 191 | ||
192 | cfg = ccfg; | 192 | cfg = ccfg; |
@@ -210,11 +210,11 @@ do_check (void *cls, | |||
210 | return; | 210 | return; |
211 | } | 211 | } |
212 | 212 | ||
213 | alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (alice_keyfile); | 213 | alice_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (alice_keyfile); |
214 | bob_key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE_BOB); | 214 | bob_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (KEYFILE_BOB); |
215 | 215 | ||
216 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (alice_key, &alice_pkey); | 216 | GNUNET_CRYPTO_ecdsa_key_get_public (alice_key, &alice_pkey); |
217 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (bob_key, &bob_pkey); | 217 | GNUNET_CRYPTO_ecdsa_key_get_public (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 1b383a0bd..a4cfa26dc 100644 --- a/src/gns/test_gns_simple_shorten.c +++ b/src/gns/test_gns_simple_shorten.c | |||
@@ -61,10 +61,10 @@ 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_EccPublicSignKey priv_pkey; | 64 | struct GNUNET_CRYPTO_EcdsaPublicKey priv_pkey; |
65 | struct GNUNET_CRYPTO_EccPublicSignKey short_pkey; | 65 | struct GNUNET_CRYPTO_EcdsaPublicKey short_pkey; |
66 | struct GNUNET_CRYPTO_EccPrivateKey *priv_key; | 66 | struct GNUNET_CRYPTO_EcdsaPrivateKey *priv_key; |
67 | struct GNUNET_CRYPTO_EccPrivateKey *short_key; | 67 | struct GNUNET_CRYPTO_EcdsaPrivateKey *short_key; |
68 | 68 | ||
69 | struct GNUNET_CRYPTO_ShortHashCode priv_zone; | 69 | struct GNUNET_CRYPTO_ShortHashCode priv_zone; |
70 | struct GNUNET_CRYPTO_ShortHashCode short_zone; | 70 | struct GNUNET_CRYPTO_ShortHashCode short_zone; |
@@ -170,15 +170,15 @@ 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_EccPublicSignKey our_pkey; | 173 | struct GNUNET_CRYPTO_EcdsaPublicKey our_pkey; |
174 | struct GNUNET_CRYPTO_EccPublicSignKey alice_pkey; | 174 | struct GNUNET_CRYPTO_EcdsaPublicKey alice_pkey; |
175 | struct GNUNET_CRYPTO_EccPublicSignKey bob_pkey; | 175 | struct GNUNET_CRYPTO_EcdsaPublicKey bob_pkey; |
176 | struct GNUNET_CRYPTO_EccPrivateKey *our_key; | 176 | struct GNUNET_CRYPTO_EcdsaPrivateKey *our_key; |
177 | struct GNUNET_CRYPTO_EccPrivateKey *alice_key; | 177 | struct GNUNET_CRYPTO_EcdsaPrivateKey *alice_key; |
178 | struct GNUNET_CRYPTO_EccPrivateKey *bob_key; | 178 | struct GNUNET_CRYPTO_EcdsaPrivateKey *bob_key; |
179 | struct GNUNET_CRYPTO_ShortHashCode bob_hash; | 179 | struct GNUNET_CRYPTO_ShortHashCode bob_hash; |
180 | struct GNUNET_CRYPTO_ShortHashCode alice_hash; | 180 | struct GNUNET_CRYPTO_ShortHashCode alice_hash; |
181 | struct GNUNET_CRYPTO_EccSignature *sig; | 181 | struct GNUNET_CRYPTO_EcdsaSignature *sig; |
182 | char* our_keyfile; | 182 | char* our_keyfile; |
183 | char* private_keyfile; | 183 | char* private_keyfile; |
184 | char* shorten_keyfile; | 184 | char* shorten_keyfile; |
@@ -226,22 +226,22 @@ void do_check (void *cls, | |||
226 | return; | 226 | return; |
227 | } | 227 | } |
228 | 228 | ||
229 | our_key = GNUNET_CRYPTO_ecc_key_create_from_file (our_keyfile); | 229 | our_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (our_keyfile); |
230 | GNUNET_free(our_keyfile); | 230 | GNUNET_free(our_keyfile); |
231 | 231 | ||
232 | bob_key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE_BOB); | 232 | bob_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (KEYFILE_BOB); |
233 | alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE_ALICE); | 233 | alice_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (KEYFILE_ALICE); |
234 | priv_key = GNUNET_CRYPTO_ecc_key_create_from_file (private_keyfile); | 234 | priv_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (private_keyfile); |
235 | short_key = GNUNET_CRYPTO_ecc_key_create_from_file (shorten_keyfile); | 235 | short_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (shorten_keyfile); |
236 | 236 | ||
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_for_signature (our_key, &our_pkey); | 240 | GNUNET_CRYPTO_ecdsa_key_get_public (our_key, &our_pkey); |
241 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (alice_key, &alice_pkey); | 241 | GNUNET_CRYPTO_ecdsa_key_get_public (alice_key, &alice_pkey); |
242 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (bob_key, &bob_pkey); | 242 | GNUNET_CRYPTO_ecdsa_key_get_public (bob_key, &bob_pkey); |
243 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (priv_key, &priv_pkey); | 243 | GNUNET_CRYPTO_ecdsa_key_get_public (priv_key, &priv_pkey); |
244 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (short_key, &short_pkey); | 244 | GNUNET_CRYPTO_ecdsa_key_get_public (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 76e564f41..f31ae6daa 100644 --- a/src/gns/test_gns_simple_srv_lookup.c +++ b/src/gns/test_gns_simple_srv_lookup.c | |||
@@ -182,12 +182,12 @@ 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_EccPublicSignKey alice_pkey; | 185 | struct GNUNET_CRYPTO_EcdsaPublicKey alice_pkey; |
186 | struct GNUNET_CRYPTO_EccPublicSignKey bob_pkey; | 186 | struct GNUNET_CRYPTO_EcdsaPublicKey bob_pkey; |
187 | struct GNUNET_CRYPTO_EccPrivateKey *alice_key; | 187 | struct GNUNET_CRYPTO_EcdsaPrivateKey *alice_key; |
188 | struct GNUNET_CRYPTO_EccPrivateKey *bob_key; | 188 | struct GNUNET_CRYPTO_EcdsaPrivateKey *bob_key; |
189 | struct GNUNET_CRYPTO_ShortHashCode bob_hash; | 189 | struct GNUNET_CRYPTO_ShortHashCode bob_hash; |
190 | struct GNUNET_CRYPTO_EccSignature *sig; | 190 | struct GNUNET_CRYPTO_EcdsaSignature *sig; |
191 | char* alice_keyfile; | 191 | char* alice_keyfile; |
192 | struct GNUNET_TUN_DnsSrvRecord *srv_data; | 192 | struct GNUNET_TUN_DnsSrvRecord *srv_data; |
193 | struct GNUNET_TIME_Absolute et; | 193 | struct GNUNET_TIME_Absolute et; |
@@ -213,11 +213,11 @@ do_check (void *cls, | |||
213 | return; | 213 | return; |
214 | } | 214 | } |
215 | 215 | ||
216 | alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (alice_keyfile); | 216 | alice_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (alice_keyfile); |
217 | bob_key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE_BOB); | 217 | bob_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (KEYFILE_BOB); |
218 | 218 | ||
219 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (alice_key, &alice_pkey); | 219 | GNUNET_CRYPTO_ecdsa_key_get_public (alice_key, &alice_pkey); |
220 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (bob_key, &bob_pkey); | 220 | GNUNET_CRYPTO_ecdsa_key_get_public (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 52a550ebf..a808d2d9d 100644 --- a/src/gns/test_gns_simple_zkey_lookup.c +++ b/src/gns/test_gns_simple_zkey_lookup.c | |||
@@ -199,11 +199,11 @@ 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_EccPublicSignKey alice_pkey; | 202 | struct GNUNET_CRYPTO_EcdsaPublicKey alice_pkey; |
203 | struct GNUNET_CRYPTO_EccPublicSignKey bob_pkey; | 203 | struct GNUNET_CRYPTO_EcdsaPublicKey bob_pkey; |
204 | struct GNUNET_CRYPTO_EccPrivateKey *alice_key; | 204 | struct GNUNET_CRYPTO_EcdsaPrivateKey *alice_key; |
205 | struct GNUNET_CRYPTO_EccPrivateKey *bob_key; | 205 | struct GNUNET_CRYPTO_EcdsaPrivateKey *bob_key; |
206 | struct GNUNET_CRYPTO_EccSignature *sig; | 206 | struct GNUNET_CRYPTO_EcdsaSignature *sig; |
207 | char* alice_keyfile; | 207 | char* alice_keyfile; |
208 | 208 | ||
209 | cfg = ccfg; | 209 | cfg = ccfg; |
@@ -227,11 +227,11 @@ do_check (void *cls, | |||
227 | return; | 227 | return; |
228 | } | 228 | } |
229 | 229 | ||
230 | alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (alice_keyfile); | 230 | alice_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (alice_keyfile); |
231 | bob_key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE_BOB); | 231 | bob_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (KEYFILE_BOB); |
232 | 232 | ||
233 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (alice_key, &alice_pkey); | 233 | GNUNET_CRYPTO_ecdsa_key_get_public (alice_key, &alice_pkey); |
234 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (bob_key, &bob_pkey); | 234 | GNUNET_CRYPTO_ecdsa_key_get_public (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; |