aboutsummaryrefslogtreecommitdiff
path: root/src/namestore
diff options
context:
space:
mode:
Diffstat (limited to 'src/namestore')
-rw-r--r--src/namestore/gnunet-namestore-fcfsd.c26
-rw-r--r--src/namestore/gnunet-namestore.c34
-rw-r--r--src/namestore/gnunet-service-namestore.c22
-rw-r--r--src/namestore/namestore.h22
-rw-r--r--src/namestore/namestore_api.c12
-rw-r--r--src/namestore/namestore_api_common.c68
-rw-r--r--src/namestore/namestore_api_monitor.c4
-rw-r--r--src/namestore/plugin_namestore_postgres.c28
-rw-r--r--src/namestore/plugin_namestore_sqlite.c38
-rw-r--r--src/namestore/test_namestore_api_blocks.c8
-rw-r--r--src/namestore/test_namestore_api_cache_block.c8
-rw-r--r--src/namestore/test_namestore_api_lookup_public.c12
-rw-r--r--src/namestore/test_namestore_api_monitoring.c12
-rw-r--r--src/namestore/test_namestore_api_monitoring_existing.c12
-rw-r--r--src/namestore/test_namestore_api_put.c10
-rw-r--r--src/namestore/test_namestore_api_remove.c8
-rw-r--r--src/namestore/test_namestore_api_remove_not_existing_record.c8
-rw-r--r--src/namestore/test_namestore_api_store.c8
-rw-r--r--src/namestore/test_namestore_api_store_update.c8
-rw-r--r--src/namestore/test_namestore_api_zone_iteration.c16
-rw-r--r--src/namestore/test_namestore_api_zone_iteration_specific_zone.c16
-rw-r--r--src/namestore/test_namestore_api_zone_iteration_stop.c16
-rw-r--r--src/namestore/test_namestore_api_zone_to_name.c18
-rw-r--r--src/namestore/test_plugin_namestore.c10
24 files changed, 212 insertions, 212 deletions
diff --git a/src/namestore/gnunet-namestore-fcfsd.c b/src/namestore/gnunet-namestore-fcfsd.c
index 7455c0ba5..08f03a055 100644
--- a/src/namestore/gnunet-namestore-fcfsd.c
+++ b/src/namestore/gnunet-namestore-fcfsd.c
@@ -196,7 +196,7 @@ static struct GNUNET_NAMESTORE_Handle *ns;
196/** 196/**
197 * Private key for the fcfsd zone. 197 * Private key for the fcfsd zone.
198 */ 198 */
199static struct GNUNET_CRYPTO_EccPrivateKey fcfs_zone_pkey; 199static struct GNUNET_CRYPTO_EcdsaPrivateKey fcfs_zone_pkey;
200 200
201/** 201/**
202 * Connection to identity service. 202 * Connection to identity service.
@@ -242,7 +242,7 @@ run_httpd_now ()
242 242
243static void 243static void
244iterate_cb (void *cls, 244iterate_cb (void *cls,
245 const struct GNUNET_CRYPTO_EccPrivateKey *zone_key, 245 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
246 const char *name, 246 const char *name,
247 unsigned int rd_len, 247 unsigned int rd_len,
248 const struct GNUNET_NAMESTORE_RecordData *rd) 248 const struct GNUNET_NAMESTORE_RecordData *rd)
@@ -504,14 +504,14 @@ put_continuation (void *cls,
504 */ 504 */
505static void 505static void
506zone_to_name_cb (void *cls, 506zone_to_name_cb (void *cls,
507 const struct GNUNET_CRYPTO_EccPrivateKey *zone_key, 507 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
508 const char *name, 508 const char *name,
509 unsigned int rd_count, 509 unsigned int rd_count,
510 const struct GNUNET_NAMESTORE_RecordData *rd) 510 const struct GNUNET_NAMESTORE_RecordData *rd)
511{ 511{
512 struct Request *request = cls; 512 struct Request *request = cls;
513 struct GNUNET_NAMESTORE_RecordData r; 513 struct GNUNET_NAMESTORE_RecordData r;
514 struct GNUNET_CRYPTO_EccPublicSignKey pub; 514 struct GNUNET_CRYPTO_EcdsaPublicKey pub;
515 515
516 request->qe = NULL; 516 request->qe = NULL;
517 if (NULL != name) 517 if (NULL != name)
@@ -523,7 +523,7 @@ zone_to_name_cb (void *cls,
523 run_httpd_now (); 523 run_httpd_now ();
524 return; 524 return;
525 } 525 }
526 GNUNET_CRYPTO_ecc_key_get_public_for_signature (zone_key, 526 GNUNET_CRYPTO_ecdsa_key_get_public (zone_key,
527 &pub); 527 &pub);
528 r.data = &pub; 528 r.data = &pub;
529 r.data_size = sizeof (pub); 529 r.data_size = sizeof (pub);
@@ -554,7 +554,7 @@ lookup_result_processor (void *cls,
554 const struct GNUNET_NAMESTORE_RecordData *rd) 554 const struct GNUNET_NAMESTORE_RecordData *rd)
555{ 555{
556 struct Request *request = cls; 556 struct Request *request = cls;
557 struct GNUNET_CRYPTO_EccPublicSignKey pub; 557 struct GNUNET_CRYPTO_EcdsaPublicKey pub;
558 558
559 if (0 != rd_count) 559 if (0 != rd_count)
560 { 560 {
@@ -567,7 +567,7 @@ lookup_result_processor (void *cls,
567 return; 567 return;
568 } 568 }
569 if (GNUNET_OK != 569 if (GNUNET_OK !=
570 GNUNET_CRYPTO_ecc_public_sign_key_from_string (request->public_key, 570 GNUNET_CRYPTO_ecdsa_public_key_from_string (request->public_key,
571 strlen (request->public_key), 571 strlen (request->public_key),
572 &pub)) 572 &pub))
573 { 573 {
@@ -596,7 +596,7 @@ lookup_block_processor (void *cls,
596 const struct GNUNET_NAMESTORE_Block *block) 596 const struct GNUNET_NAMESTORE_Block *block)
597{ 597{
598 struct Request *request = cls; 598 struct Request *request = cls;
599 struct GNUNET_CRYPTO_EccPublicSignKey pub; 599 struct GNUNET_CRYPTO_EcdsaPublicKey pub;
600 600
601 request->qe = NULL; 601 request->qe = NULL;
602 if (NULL == block) 602 if (NULL == block)
@@ -604,7 +604,7 @@ lookup_block_processor (void *cls,
604 lookup_result_processor (request, 0, NULL); 604 lookup_result_processor (request, 0, NULL);
605 return; 605 return;
606 } 606 }
607 GNUNET_CRYPTO_ecc_key_get_public_for_signature (&fcfs_zone_pkey, 607 GNUNET_CRYPTO_ecdsa_key_get_public (&fcfs_zone_pkey,
608 &pub); 608 &pub);
609 if (GNUNET_OK != 609 if (GNUNET_OK !=
610 GNUNET_NAMESTORE_block_decrypt (block, 610 GNUNET_NAMESTORE_block_decrypt (block,
@@ -657,7 +657,7 @@ create_response (void *cls,
657 struct MHD_Response *response; 657 struct MHD_Response *response;
658 struct Request *request; 658 struct Request *request;
659 int ret; 659 int ret;
660 struct GNUNET_CRYPTO_EccPublicSignKey pub; 660 struct GNUNET_CRYPTO_EcdsaPublicKey pub;
661 struct GNUNET_HashCode query; 661 struct GNUNET_HashCode query;
662 662
663 if ( (0 == strcmp (method, MHD_HTTP_METHOD_GET)) || 663 if ( (0 == strcmp (method, MHD_HTTP_METHOD_GET)) ||
@@ -707,7 +707,7 @@ create_response (void *cls,
707 request->pp = NULL; 707 request->pp = NULL;
708 } 708 }
709 if (GNUNET_OK != 709 if (GNUNET_OK !=
710 GNUNET_CRYPTO_ecc_public_sign_key_from_string (request->public_key, 710 GNUNET_CRYPTO_ecdsa_public_key_from_string (request->public_key,
711 strlen (request->public_key), 711 strlen (request->public_key),
712 &pub)) 712 &pub))
713 { 713 {
@@ -735,7 +735,7 @@ create_response (void *cls,
735 request, connection); 735 request, connection);
736 } 736 }
737 request->phase = RP_LOOKUP; 737 request->phase = RP_LOOKUP;
738 GNUNET_CRYPTO_ecc_key_get_public_for_signature (&fcfs_zone_pkey, 738 GNUNET_CRYPTO_ecdsa_key_get_public (&fcfs_zone_pkey,
739 &pub); 739 &pub);
740 GNUNET_NAMESTORE_query_from_public_key (&pub, 740 GNUNET_NAMESTORE_query_from_public_key (&pub,
741 request->domain_name, 741 request->domain_name,
@@ -1030,7 +1030,7 @@ main (int argc, char *const *argv)
1030 options, 1030 options,
1031 &run, NULL)) ? 0 : 1; 1031 &run, NULL)) ? 0 : 1;
1032 GNUNET_free ((void*) argv); 1032 GNUNET_free ((void*) argv);
1033 GNUNET_CRYPTO_ecc_key_clear (&fcfs_zone_pkey); 1033 GNUNET_CRYPTO_ecdsa_key_clear (&fcfs_zone_pkey);
1034 return ret; 1034 return ret;
1035} 1035}
1036 1036
diff --git a/src/namestore/gnunet-namestore.c b/src/namestore/gnunet-namestore.c
index 2ff640604..322030e65 100644
--- a/src/namestore/gnunet-namestore.c
+++ b/src/namestore/gnunet-namestore.c
@@ -41,7 +41,7 @@ static struct GNUNET_NAMESTORE_Handle *ns;
41/** 41/**
42 * Private key for the our zone. 42 * Private key for the our zone.
43 */ 43 */
44static struct GNUNET_CRYPTO_EccPrivateKey zone_pkey; 44static struct GNUNET_CRYPTO_EcdsaPrivateKey zone_pkey;
45 45
46/** 46/**
47 * Handle to identity lookup. 47 * Handle to identity lookup.
@@ -334,7 +334,7 @@ del_continuation (void *cls,
334 */ 334 */
335static void 335static void
336display_record (void *cls, 336display_record (void *cls,
337 const struct GNUNET_CRYPTO_EccPrivateKey *zone_key, 337 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
338 const char *name, 338 const char *name,
339 unsigned int rd_len, 339 unsigned int rd_len,
340 const struct GNUNET_NAMESTORE_RecordData *rd) 340 const struct GNUNET_NAMESTORE_RecordData *rd)
@@ -413,7 +413,7 @@ sync_cb (void *cls)
413 */ 413 */
414static void 414static void
415get_existing_record (void *cls, 415get_existing_record (void *cls,
416 const struct GNUNET_CRYPTO_EccPrivateKey *zone_key, 416 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
417 const char *rec_name, 417 const char *rec_name,
418 unsigned int rd_count, 418 unsigned int rd_count,
419 const struct GNUNET_NAMESTORE_RecordData *rd) 419 const struct GNUNET_NAMESTORE_RecordData *rd)
@@ -524,10 +524,10 @@ static void
524handle_block (void *cls, 524handle_block (void *cls,
525 const struct GNUNET_NAMESTORE_Block *block) 525 const struct GNUNET_NAMESTORE_Block *block)
526{ 526{
527 struct GNUNET_CRYPTO_EccPublicSignKey zone_pubkey; 527 struct GNUNET_CRYPTO_EcdsaPublicKey zone_pubkey;
528 528
529 list_qe = NULL; 529 list_qe = NULL;
530 GNUNET_CRYPTO_ecc_key_get_public_for_signature (&zone_pkey, 530 GNUNET_CRYPTO_ecdsa_key_get_public (&zone_pkey,
531 &zone_pubkey); 531 &zone_pubkey);
532 if (NULL == block) 532 if (NULL == block)
533 { 533 {
@@ -560,7 +560,7 @@ handle_block (void *cls,
560 */ 560 */
561static void 561static void
562handle_reverse_lookup (void *cls, 562handle_reverse_lookup (void *cls,
563 const struct GNUNET_CRYPTO_EccPrivateKey *zone, 563 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
564 const char *label, 564 const char *label,
565 unsigned int rd_count, 565 unsigned int rd_count,
566 const struct GNUNET_NAMESTORE_RecordData *rd) 566 const struct GNUNET_NAMESTORE_RecordData *rd)
@@ -591,7 +591,7 @@ testservice_task (void *cls,
591 int result) 591 int result)
592{ 592{
593 const struct GNUNET_CONFIGURATION_Handle *cfg = cls; 593 const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
594 struct GNUNET_CRYPTO_EccPublicSignKey pub; 594 struct GNUNET_CRYPTO_EcdsaPublicKey pub;
595 struct GNUNET_NAMESTORE_RecordData rd; 595 struct GNUNET_NAMESTORE_RecordData rd;
596 596
597 if (GNUNET_YES != result) 597 if (GNUNET_YES != result)
@@ -608,7 +608,7 @@ testservice_task (void *cls,
608 GNUNET_SCHEDULER_shutdown (); 608 GNUNET_SCHEDULER_shutdown ();
609 return; 609 return;
610 } 610 }
611 GNUNET_CRYPTO_ecc_key_get_public_for_signature (&zone_pkey, 611 GNUNET_CRYPTO_ecdsa_key_get_public (&zone_pkey,
612 &pub); 612 &pub);
613 613
614 ns = GNUNET_NAMESTORE_connect (cfg); 614 ns = GNUNET_NAMESTORE_connect (cfg);
@@ -738,9 +738,9 @@ testservice_task (void *cls,
738 else 738 else
739 { 739 {
740 struct GNUNET_HashCode query; 740 struct GNUNET_HashCode query;
741 struct GNUNET_CRYPTO_EccPublicSignKey zone_pubkey; 741 struct GNUNET_CRYPTO_EcdsaPublicKey zone_pubkey;
742 742
743 GNUNET_CRYPTO_ecc_key_get_public_for_signature (&zone_pkey, 743 GNUNET_CRYPTO_ecdsa_key_get_public (&zone_pkey,
744 &zone_pubkey); 744 &zone_pubkey);
745 GNUNET_NAMESTORE_query_from_public_key (&zone_pubkey, 745 GNUNET_NAMESTORE_query_from_public_key (&zone_pubkey,
746 name, 746 name,
@@ -753,10 +753,10 @@ testservice_task (void *cls,
753 } 753 }
754 if (NULL != reverse_pkey) 754 if (NULL != reverse_pkey)
755 { 755 {
756 struct GNUNET_CRYPTO_EccPublicSignKey pubkey; 756 struct GNUNET_CRYPTO_EcdsaPublicKey pubkey;
757 757
758 if (GNUNET_OK != 758 if (GNUNET_OK !=
759 GNUNET_CRYPTO_ecc_public_sign_key_from_string (reverse_pkey, 759 GNUNET_CRYPTO_ecdsa_public_key_from_string (reverse_pkey,
760 strlen (reverse_pkey), 760 strlen (reverse_pkey),
761 &pubkey)) 761 &pubkey))
762 { 762 {
@@ -775,14 +775,14 @@ testservice_task (void *cls,
775 { 775 {
776 char sh[105]; 776 char sh[105];
777 char sname[64]; 777 char sname[64];
778 struct GNUNET_CRYPTO_EccPublicSignKey pkey; 778 struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
779 779
780 if ( (2 != (sscanf (uri, 780 if ( (2 != (sscanf (uri,
781 "gnunet://gns/%104s/%63s", 781 "gnunet://gns/%104s/%63s",
782 sh, 782 sh,
783 sname)) ) || 783 sname)) ) ||
784 (GNUNET_OK != 784 (GNUNET_OK !=
785 GNUNET_CRYPTO_ecc_public_sign_key_from_string (sh, strlen (sh), &pkey)) ) 785 GNUNET_CRYPTO_ecdsa_public_key_from_string (sh, strlen (sh), &pkey)) )
786 { 786 {
787 fprintf (stderr, 787 fprintf (stderr,
788 _("Invalid URI `%s'\n"), 788 _("Invalid URI `%s'\n"),
@@ -793,7 +793,7 @@ testservice_task (void *cls,
793 } 793 }
794 memset (&rd, 0, sizeof (rd)); 794 memset (&rd, 0, sizeof (rd));
795 rd.data = &pkey; 795 rd.data = &pkey;
796 rd.data_size = sizeof (struct GNUNET_CRYPTO_EccPublicSignKey); 796 rd.data_size = sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey);
797 rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY; 797 rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
798 if (GNUNET_YES == etime_is_rel) 798 if (GNUNET_YES == etime_is_rel)
799 { 799 {
@@ -952,11 +952,11 @@ main (int argc, char *const *argv)
952 &run, NULL)) 952 &run, NULL))
953 { 953 {
954 GNUNET_free ((void*) argv); 954 GNUNET_free ((void*) argv);
955 GNUNET_CRYPTO_ecc_key_clear (&zone_pkey); 955 GNUNET_CRYPTO_ecdsa_key_clear (&zone_pkey);
956 return 1; 956 return 1;
957 } 957 }
958 GNUNET_free ((void*) argv); 958 GNUNET_free ((void*) argv);
959 GNUNET_CRYPTO_ecc_key_clear (&zone_pkey); 959 GNUNET_CRYPTO_ecdsa_key_clear (&zone_pkey);
960 return ret; 960 return ret;
961} 961}
962 962
diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c
index 49315f6e0..2cce92635 100644
--- a/src/namestore/gnunet-service-namestore.c
+++ b/src/namestore/gnunet-service-namestore.c
@@ -64,7 +64,7 @@ struct ZoneIteration
64 /** 64 /**
65 * Key of the zone we are iterating over. 65 * Key of the zone we are iterating over.
66 */ 66 */
67 struct GNUNET_CRYPTO_EccPrivateKey zone; 67 struct GNUNET_CRYPTO_EcdsaPrivateKey zone;
68 68
69 /** 69 /**
70 * The operation id fot the zone iteration in the response for the client 70 * The operation id fot the zone iteration in the response for the client
@@ -140,7 +140,7 @@ struct ZoneMonitor
140 /** 140 /**
141 * Private key of the zone. 141 * Private key of the zone.
142 */ 142 */
143 struct GNUNET_CRYPTO_EccPrivateKey zone; 143 struct GNUNET_CRYPTO_EcdsaPrivateKey zone;
144 144
145 /** 145 /**
146 * The operation id fot the zone iteration in the response for the client 146 * The operation id fot the zone iteration in the response for the client
@@ -512,7 +512,7 @@ static void
512send_lookup_response (struct GNUNET_SERVER_NotificationContext *nc, 512send_lookup_response (struct GNUNET_SERVER_NotificationContext *nc,
513 struct GNUNET_SERVER_Client *client, 513 struct GNUNET_SERVER_Client *client,
514 uint32_t request_id, 514 uint32_t request_id,
515 const struct GNUNET_CRYPTO_EccPrivateKey *zone_key, 515 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
516 const char *name, 516 const char *name,
517 unsigned int rd_count, 517 unsigned int rd_count,
518 const struct GNUNET_NAMESTORE_RecordData *rd) 518 const struct GNUNET_NAMESTORE_RecordData *rd)
@@ -563,7 +563,7 @@ send_lookup_response (struct GNUNET_SERVER_NotificationContext *nc,
563 * @param rd records stored under the given @a name 563 * @param rd records stored under the given @a name
564 */ 564 */
565static void 565static void
566refresh_block (const struct GNUNET_CRYPTO_EccPrivateKey *zone_key, 566refresh_block (const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
567 const char *name, 567 const char *name,
568 unsigned int rd_count, 568 unsigned int rd_count,
569 const struct GNUNET_NAMESTORE_RecordData *rd) 569 const struct GNUNET_NAMESTORE_RecordData *rd)
@@ -617,7 +617,7 @@ handle_record_store (void *cls,
617 const char *rd_ser; 617 const char *rd_ser;
618 unsigned int rd_count; 618 unsigned int rd_count;
619 int res; 619 int res;
620 struct GNUNET_CRYPTO_EccPublicSignKey pubkey; 620 struct GNUNET_CRYPTO_EcdsaPublicKey pubkey;
621 struct ZoneMonitor *zm; 621 struct ZoneMonitor *zm;
622 622
623 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 623 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -670,7 +670,7 @@ handle_record_store (void *cls,
670 } 670 }
671 671
672 /* Extracting and converting private key */ 672 /* Extracting and converting private key */
673 GNUNET_CRYPTO_ecc_key_get_public_for_signature (&rp_msg->private_key, 673 GNUNET_CRYPTO_ecdsa_key_get_public (&rp_msg->private_key,
674 &pubkey); 674 &pubkey);
675 conv_name = GNUNET_NAMESTORE_normalize_string (name_tmp); 675 conv_name = GNUNET_NAMESTORE_normalize_string (name_tmp);
676 if (NULL == conv_name) 676 if (NULL == conv_name)
@@ -711,7 +711,7 @@ handle_record_store (void *cls,
711 711
712 for (zm = monitor_head; NULL != zm; zm = zm->next) 712 for (zm = monitor_head; NULL != zm; zm = zm->next)
713 if (0 == memcmp (&rp_msg->private_key, &zm->zone, 713 if (0 == memcmp (&rp_msg->private_key, &zm->zone,
714 sizeof (struct GNUNET_CRYPTO_EccPrivateKey))) 714 sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
715 send_lookup_response (monitor_nc, 715 send_lookup_response (monitor_nc,
716 zm->nc->client, 716 zm->nc->client,
717 zm->request_id, 717 zm->request_id,
@@ -774,7 +774,7 @@ struct ZoneToNameCtx
774 */ 774 */
775static void 775static void
776handle_zone_to_name_it (void *cls, 776handle_zone_to_name_it (void *cls,
777 const struct GNUNET_CRYPTO_EccPrivateKey *zone_key, 777 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
778 const char *name, 778 const char *name,
779 unsigned int rd_count, 779 unsigned int rd_count,
780 const struct GNUNET_NAMESTORE_RecordData *rd) 780 const struct GNUNET_NAMESTORE_RecordData *rd)
@@ -936,7 +936,7 @@ struct ZoneIterationProcResult
936 */ 936 */
937static void 937static void
938zone_iteraterate_proc (void *cls, 938zone_iteraterate_proc (void *cls,
939 const struct GNUNET_CRYPTO_EccPrivateKey *zone_key, 939 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
940 const char *name, 940 const char *name,
941 unsigned int rd_count, 941 unsigned int rd_count,
942 const struct GNUNET_NAMESTORE_RecordData *rd) 942 const struct GNUNET_NAMESTORE_RecordData *rd)
@@ -992,7 +992,7 @@ zone_iteraterate_proc (void *cls,
992static void 992static void
993run_zone_iteration_round (struct ZoneIteration *zi) 993run_zone_iteration_round (struct ZoneIteration *zi)
994{ 994{
995 static struct GNUNET_CRYPTO_EccPrivateKey zero; 995 static struct GNUNET_CRYPTO_EcdsaPrivateKey zero;
996 struct ZoneIterationProcResult proc; 996 struct ZoneIterationProcResult proc;
997 struct RecordResultMessage rrm; 997 struct RecordResultMessage rrm;
998 int ret; 998 int ret;
@@ -1198,7 +1198,7 @@ monitor_next (void *cls,
1198 */ 1198 */
1199static void 1199static void
1200monitor_iterate_cb (void *cls, 1200monitor_iterate_cb (void *cls,
1201 const struct GNUNET_CRYPTO_EccPrivateKey *zone_key, 1201 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
1202 const char *name, 1202 const char *name,
1203 unsigned int rd_count, 1203 unsigned int rd_count,
1204 const struct GNUNET_NAMESTORE_RecordData *rd) 1204 const struct GNUNET_NAMESTORE_RecordData *rd)
diff --git a/src/namestore/namestore.h b/src/namestore/namestore.h
index a8851e104..4350dbab4 100644
--- a/src/namestore/namestore.h
+++ b/src/namestore/namestore.h
@@ -88,12 +88,12 @@ struct LookupBlockResponseMessage
88 /** 88 /**
89 * Signature. 89 * Signature.
90 */ 90 */
91 struct GNUNET_CRYPTO_EccSignature signature; 91 struct GNUNET_CRYPTO_EcdsaSignature signature;
92 92
93 /** 93 /**
94 * Derived public key. 94 * Derived public key.
95 */ 95 */
96 struct GNUNET_CRYPTO_EccPublicSignKey derived_key; 96 struct GNUNET_CRYPTO_EcdsaPublicKey derived_key;
97 97
98 /* follwed by encrypted block data */ 98 /* follwed by encrypted block data */
99}; 99};
@@ -117,12 +117,12 @@ struct BlockCacheMessage
117 /** 117 /**
118 * Signature. 118 * Signature.
119 */ 119 */
120 struct GNUNET_CRYPTO_EccSignature signature; 120 struct GNUNET_CRYPTO_EcdsaSignature signature;
121 121
122 /** 122 /**
123 * Derived public key. 123 * Derived public key.
124 */ 124 */
125 struct GNUNET_CRYPTO_EccPublicSignKey derived_key; 125 struct GNUNET_CRYPTO_EcdsaPublicKey derived_key;
126 126
127 /* follwed by encrypted block data */ 127 /* follwed by encrypted block data */
128}; 128};
@@ -183,7 +183,7 @@ struct RecordStoreMessage
183 /** 183 /**
184 * The private key of the authority. 184 * The private key of the authority.
185 */ 185 */
186 struct GNUNET_CRYPTO_EccPrivateKey private_key; 186 struct GNUNET_CRYPTO_EcdsaPrivateKey private_key;
187 187
188 /* followed by: 188 /* followed by:
189 * name with length name_len 189 * name with length name_len
@@ -223,12 +223,12 @@ struct ZoneToNameMessage
223 /** 223 /**
224 * The private key of the zone to look up in 224 * The private key of the zone to look up in
225 */ 225 */
226 struct GNUNET_CRYPTO_EccPrivateKey zone; 226 struct GNUNET_CRYPTO_EcdsaPrivateKey zone;
227 227
228 /** 228 /**
229 * The public key of the target zone 229 * The public key of the target zone
230 */ 230 */
231 struct GNUNET_CRYPTO_EccPublicSignKey value_zone; 231 struct GNUNET_CRYPTO_EcdsaPublicKey value_zone;
232}; 232};
233 233
234 234
@@ -266,7 +266,7 @@ struct ZoneToNameResponseMessage
266 /** 266 /**
267 * The private key of the zone that contained the name. 267 * The private key of the zone that contained the name.
268 */ 268 */
269 struct GNUNET_CRYPTO_EccPrivateKey zone; 269 struct GNUNET_CRYPTO_EcdsaPrivateKey zone;
270 270
271 /* followed by: 271 /* followed by:
272 * name with length name_len 272 * name with length name_len
@@ -309,7 +309,7 @@ struct RecordResultMessage
309 /** 309 /**
310 * The private key of the authority. 310 * The private key of the authority.
311 */ 311 */
312 struct GNUNET_CRYPTO_EccPrivateKey private_key; 312 struct GNUNET_CRYPTO_EcdsaPrivateKey private_key;
313 313
314 /* followed by: 314 /* followed by:
315 * name with length name_len 315 * name with length name_len
@@ -331,7 +331,7 @@ struct ZoneMonitorStartMessage
331 /** 331 /**
332 * Zone key. 332 * Zone key.
333 */ 333 */
334 struct GNUNET_CRYPTO_EccPrivateKey zone; 334 struct GNUNET_CRYPTO_EcdsaPrivateKey zone;
335 335
336}; 336};
337 337
@@ -349,7 +349,7 @@ struct ZoneIterationStartMessage
349 /** 349 /**
350 * Zone key. All zeros for "all zones". 350 * Zone key. All zeros for "all zones".
351 */ 351 */
352 struct GNUNET_CRYPTO_EccPrivateKey zone; 352 struct GNUNET_CRYPTO_EcdsaPrivateKey zone;
353 353
354}; 354};
355 355
diff --git a/src/namestore/namestore_api.c b/src/namestore/namestore_api.c
index 3df6f8210..c4282ec71 100644
--- a/src/namestore/namestore_api.c
+++ b/src/namestore/namestore_api.c
@@ -134,7 +134,7 @@ struct GNUNET_NAMESTORE_ZoneIterator
134 /** 134 /**
135 * Private key of the zone. 135 * Private key of the zone.
136 */ 136 */
137 struct GNUNET_CRYPTO_EccPrivateKey zone; 137 struct GNUNET_CRYPTO_EcdsaPrivateKey zone;
138 138
139 /** 139 /**
140 * The operation id this zone iteration operation has 140 * The operation id this zone iteration operation has
@@ -592,7 +592,7 @@ handle_zone_iteration_response (struct GNUNET_NAMESTORE_ZoneIterator *ze,
592 const struct RecordResultMessage *msg, 592 const struct RecordResultMessage *msg,
593 size_t size) 593 size_t size)
594{ 594{
595 static struct GNUNET_CRYPTO_EccPrivateKey priv_dummy; 595 static struct GNUNET_CRYPTO_EcdsaPrivateKey priv_dummy;
596 size_t msg_len; 596 size_t msg_len;
597 size_t exp_msg_len; 597 size_t exp_msg_len;
598 size_t name_len; 598 size_t name_len;
@@ -1082,7 +1082,7 @@ GNUNET_NAMESTORE_block_cache (struct GNUNET_NAMESTORE_Handle *h,
1082 */ 1082 */
1083struct GNUNET_NAMESTORE_QueueEntry * 1083struct GNUNET_NAMESTORE_QueueEntry *
1084GNUNET_NAMESTORE_records_store (struct GNUNET_NAMESTORE_Handle *h, 1084GNUNET_NAMESTORE_records_store (struct GNUNET_NAMESTORE_Handle *h,
1085 const struct GNUNET_CRYPTO_EccPrivateKey *pkey, 1085 const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey,
1086 const char *label, 1086 const char *label,
1087 unsigned int rd_count, 1087 unsigned int rd_count,
1088 const struct GNUNET_NAMESTORE_RecordData *rd, 1088 const struct GNUNET_NAMESTORE_RecordData *rd,
@@ -1212,8 +1212,8 @@ GNUNET_NAMESTORE_lookup_block (struct GNUNET_NAMESTORE_Handle *h,
1212 */ 1212 */
1213struct GNUNET_NAMESTORE_QueueEntry * 1213struct GNUNET_NAMESTORE_QueueEntry *
1214GNUNET_NAMESTORE_zone_to_name (struct GNUNET_NAMESTORE_Handle *h, 1214GNUNET_NAMESTORE_zone_to_name (struct GNUNET_NAMESTORE_Handle *h,
1215 const struct GNUNET_CRYPTO_EccPrivateKey *zone, 1215 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
1216 const struct GNUNET_CRYPTO_EccPublicSignKey *value_zone, 1216 const struct GNUNET_CRYPTO_EcdsaPublicKey *value_zone,
1217 GNUNET_NAMESTORE_RecordMonitor proc, void *proc_cls) 1217 GNUNET_NAMESTORE_RecordMonitor proc, void *proc_cls)
1218{ 1218{
1219 struct GNUNET_NAMESTORE_QueueEntry *qe; 1219 struct GNUNET_NAMESTORE_QueueEntry *qe;
@@ -1268,7 +1268,7 @@ GNUNET_NAMESTORE_zone_to_name (struct GNUNET_NAMESTORE_Handle *h,
1268 */ 1268 */
1269struct GNUNET_NAMESTORE_ZoneIterator * 1269struct GNUNET_NAMESTORE_ZoneIterator *
1270GNUNET_NAMESTORE_zone_iteration_start (struct GNUNET_NAMESTORE_Handle *h, 1270GNUNET_NAMESTORE_zone_iteration_start (struct GNUNET_NAMESTORE_Handle *h,
1271 const struct GNUNET_CRYPTO_EccPrivateKey *zone, 1271 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
1272 GNUNET_NAMESTORE_RecordMonitor proc, 1272 GNUNET_NAMESTORE_RecordMonitor proc,
1273 void *proc_cls) 1273 void *proc_cls)
1274{ 1274{
diff --git a/src/namestore/namestore_api_common.c b/src/namestore/namestore_api_common.c
index 8cf75330c..81662a861 100644
--- a/src/namestore/namestore_api_common.c
+++ b/src/namestore/namestore_api_common.c
@@ -98,13 +98,13 @@ GNUNET_NAMESTORE_normalize_string (const char *src)
98 * @return string form; will be overwritten by next call to #GNUNET_NAMESTORE_z2s 98 * @return string form; will be overwritten by next call to #GNUNET_NAMESTORE_z2s
99 */ 99 */
100const char * 100const char *
101GNUNET_NAMESTORE_z2s (const struct GNUNET_CRYPTO_EccPublicSignKey *z) 101GNUNET_NAMESTORE_z2s (const struct GNUNET_CRYPTO_EcdsaPublicKey *z)
102{ 102{
103 static char buf[sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) * 8]; 103 static char buf[sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) * 8];
104 char *end; 104 char *end;
105 105
106 end = GNUNET_STRINGS_data_to_string ((const unsigned char *) z, 106 end = GNUNET_STRINGS_data_to_string ((const unsigned char *) z,
107 sizeof (struct GNUNET_CRYPTO_EccPublicSignKey), 107 sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey),
108 buf, sizeof (buf)); 108 buf, sizeof (buf));
109 if (NULL == end) 109 if (NULL == end)
110 { 110 {
@@ -342,18 +342,18 @@ static void
342derive_block_aes_key (struct GNUNET_CRYPTO_SymmetricInitializationVector *iv, 342derive_block_aes_key (struct GNUNET_CRYPTO_SymmetricInitializationVector *iv,
343 struct GNUNET_CRYPTO_SymmetricSessionKey *skey, 343 struct GNUNET_CRYPTO_SymmetricSessionKey *skey,
344 const char *label, 344 const char *label,
345 const struct GNUNET_CRYPTO_EccPublicSignKey *pub) 345 const struct GNUNET_CRYPTO_EcdsaPublicKey *pub)
346{ 346{
347 static const char ctx_key[] = "gns-aes-ctx-key"; 347 static const char ctx_key[] = "gns-aes-ctx-key";
348 static const char ctx_iv[] = "gns-aes-ctx-iv"; 348 static const char ctx_iv[] = "gns-aes-ctx-iv";
349 349
350 GNUNET_CRYPTO_kdf (skey, sizeof (struct GNUNET_CRYPTO_SymmetricSessionKey), 350 GNUNET_CRYPTO_kdf (skey, sizeof (struct GNUNET_CRYPTO_SymmetricSessionKey),
351 pub, sizeof (struct GNUNET_CRYPTO_EccPublicSignKey), 351 pub, sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey),
352 label, strlen (label), 352 label, strlen (label),
353 ctx_key, strlen (ctx_key), 353 ctx_key, strlen (ctx_key),
354 NULL, 0); 354 NULL, 0);
355 GNUNET_CRYPTO_kdf (iv, sizeof (struct GNUNET_CRYPTO_SymmetricInitializationVector), 355 GNUNET_CRYPTO_kdf (iv, sizeof (struct GNUNET_CRYPTO_SymmetricInitializationVector),
356 pub, sizeof (struct GNUNET_CRYPTO_EccPublicSignKey), 356 pub, sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey),
357 label, strlen (label), 357 label, strlen (label),
358 ctx_iv, strlen (ctx_iv), 358 ctx_iv, strlen (ctx_iv),
359 NULL, 0); 359 NULL, 0);
@@ -371,7 +371,7 @@ derive_block_aes_key (struct GNUNET_CRYPTO_SymmetricInitializationVector *iv,
371 * @return NULL on error (block too large) 371 * @return NULL on error (block too large)
372 */ 372 */
373struct GNUNET_NAMESTORE_Block * 373struct GNUNET_NAMESTORE_Block *
374GNUNET_NAMESTORE_block_create (const struct GNUNET_CRYPTO_EccPrivateKey *key, 374GNUNET_NAMESTORE_block_create (const struct GNUNET_CRYPTO_EcdsaPrivateKey *key,
375 struct GNUNET_TIME_Absolute expire, 375 struct GNUNET_TIME_Absolute expire,
376 const char *label, 376 const char *label,
377 const struct GNUNET_NAMESTORE_RecordData *rd, 377 const struct GNUNET_NAMESTORE_RecordData *rd,
@@ -380,8 +380,8 @@ GNUNET_NAMESTORE_block_create (const struct GNUNET_CRYPTO_EccPrivateKey *key,
380 size_t payload_len = GNUNET_NAMESTORE_records_get_size (rd_count, rd); 380 size_t payload_len = GNUNET_NAMESTORE_records_get_size (rd_count, rd);
381 char payload[sizeof (uint32_t) + payload_len]; 381 char payload[sizeof (uint32_t) + payload_len];
382 struct GNUNET_NAMESTORE_Block *block; 382 struct GNUNET_NAMESTORE_Block *block;
383 struct GNUNET_CRYPTO_EccPublicSignKey pkey; 383 struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
384 struct GNUNET_CRYPTO_EccPrivateKey *dkey; 384 struct GNUNET_CRYPTO_EcdsaPrivateKey *dkey;
385 struct GNUNET_CRYPTO_SymmetricInitializationVector iv; 385 struct GNUNET_CRYPTO_SymmetricInitializationVector iv;
386 struct GNUNET_CRYPTO_SymmetricSessionKey skey; 386 struct GNUNET_CRYPTO_SymmetricSessionKey skey;
387 uint32_t rd_count_nbo; 387 uint32_t rd_count_nbo;
@@ -400,12 +400,12 @@ GNUNET_NAMESTORE_block_create (const struct GNUNET_CRYPTO_EccPrivateKey *key,
400 sizeof (struct GNUNET_TIME_AbsoluteNBO)); 400 sizeof (struct GNUNET_TIME_AbsoluteNBO));
401 block->purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_GNS_RECORD_SIGN); 401 block->purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_GNS_RECORD_SIGN);
402 block->expiration_time = GNUNET_TIME_absolute_hton (expire); 402 block->expiration_time = GNUNET_TIME_absolute_hton (expire);
403 dkey = GNUNET_CRYPTO_ecc_key_derive (key, 403 dkey = GNUNET_CRYPTO_ecdsa_private_key_derive (key,
404 label, 404 label,
405 "gns"); 405 "gns");
406 GNUNET_CRYPTO_ecc_key_get_public_for_signature (dkey, 406 GNUNET_CRYPTO_ecdsa_key_get_public (dkey,
407 &block->derived_key); 407 &block->derived_key);
408 GNUNET_CRYPTO_ecc_key_get_public_for_signature (key, 408 GNUNET_CRYPTO_ecdsa_key_get_public (key,
409 &pkey); 409 &pkey);
410 derive_block_aes_key (&iv, &skey, label, &pkey); 410 derive_block_aes_key (&iv, &skey, label, &pkey);
411 GNUNET_break (payload_len + sizeof (uint32_t) == 411 GNUNET_break (payload_len + sizeof (uint32_t) ==
@@ -413,7 +413,7 @@ GNUNET_NAMESTORE_block_create (const struct GNUNET_CRYPTO_EccPrivateKey *key,
413 &skey, &iv, 413 &skey, &iv,
414 &block[1])); 414 &block[1]));
415 if (GNUNET_OK != 415 if (GNUNET_OK !=
416 GNUNET_CRYPTO_ecc_sign (dkey, 416 GNUNET_CRYPTO_ecdsa_sign (dkey,
417 &block->purpose, 417 &block->purpose,
418 &block->signature)) 418 &block->signature))
419 { 419 {
@@ -437,7 +437,7 @@ GNUNET_NAMESTORE_block_create (const struct GNUNET_CRYPTO_EccPrivateKey *key,
437int 437int
438GNUNET_NAMESTORE_block_verify (const struct GNUNET_NAMESTORE_Block *block) 438GNUNET_NAMESTORE_block_verify (const struct GNUNET_NAMESTORE_Block *block)
439{ 439{
440 return GNUNET_CRYPTO_ecc_verify (GNUNET_SIGNATURE_PURPOSE_GNS_RECORD_SIGN, 440 return GNUNET_CRYPTO_ecdsa_verify (GNUNET_SIGNATURE_PURPOSE_GNS_RECORD_SIGN,
441 &block->purpose, 441 &block->purpose,
442 &block->signature, 442 &block->signature,
443 &block->derived_key); 443 &block->derived_key);
@@ -457,7 +457,7 @@ GNUNET_NAMESTORE_block_verify (const struct GNUNET_NAMESTORE_Block *block)
457 */ 457 */
458int 458int
459GNUNET_NAMESTORE_block_decrypt (const struct GNUNET_NAMESTORE_Block *block, 459GNUNET_NAMESTORE_block_decrypt (const struct GNUNET_NAMESTORE_Block *block,
460 const struct GNUNET_CRYPTO_EccPublicSignKey *zone_key, 460 const struct GNUNET_CRYPTO_EcdsaPublicKey *zone_key,
461 const char *label, 461 const char *label,
462 GNUNET_NAMESTORE_RecordCallback proc, 462 GNUNET_NAMESTORE_RecordCallback proc,
463 void *proc_cls) 463 void *proc_cls)
@@ -653,9 +653,9 @@ GNUNET_NAMESTORE_value_to_string (uint32_t type,
653 return NULL; 653 return NULL;
654 return GNUNET_strdup (tmp); 654 return GNUNET_strdup (tmp);
655 case GNUNET_NAMESTORE_TYPE_PKEY: 655 case GNUNET_NAMESTORE_TYPE_PKEY:
656 if (data_size != sizeof (struct GNUNET_CRYPTO_EccPublicSignKey)) 656 if (data_size != sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey))
657 return NULL; 657 return NULL;
658 return GNUNET_CRYPTO_ecc_public_sign_key_to_string (data); 658 return GNUNET_CRYPTO_ecdsa_public_key_to_string (data);
659 case GNUNET_NAMESTORE_TYPE_PHONE: 659 case GNUNET_NAMESTORE_TYPE_PHONE:
660 { 660 {
661 const struct GNUNET_CONVERSATION_PhoneRecord *pr; 661 const struct GNUNET_CONVERSATION_PhoneRecord *pr;
@@ -667,7 +667,7 @@ GNUNET_NAMESTORE_value_to_string (uint32_t type,
667 pr = data; 667 pr = data;
668 if (0 != ntohl (pr->version)) 668 if (0 != ntohl (pr->version))
669 return NULL; 669 return NULL;
670 pkey = GNUNET_CRYPTO_ecc_public_sign_key_to_string (&pr->peer.public_key); 670 pkey = GNUNET_CRYPTO_eddsa_public_key_to_string (&pr->peer.public_key);
671 GNUNET_asprintf (&ret, 671 GNUNET_asprintf (&ret,
672 "%u-%s", 672 "%u-%s",
673 ntohl (pr->line), 673 ntohl (pr->line),
@@ -792,7 +792,7 @@ GNUNET_NAMESTORE_string_to_value (uint32_t type,
792{ 792{
793 struct in_addr value_a; 793 struct in_addr value_a;
794 struct in6_addr value_aaaa; 794 struct in6_addr value_aaaa;
795 struct GNUNET_CRYPTO_EccPublicSignKey pkey; 795 struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
796 struct GNUNET_TUN_GnsVpnRecord *vpn; 796 struct GNUNET_TUN_GnsVpnRecord *vpn;
797 struct GNUNET_TUN_DnsTlsaRecord *tlsa; 797 struct GNUNET_TUN_DnsTlsaRecord *tlsa;
798 char s_peer[103 + 1]; 798 char s_peer[103 + 1];
@@ -987,16 +987,16 @@ GNUNET_NAMESTORE_string_to_value (uint32_t type,
987 return GNUNET_OK; 987 return GNUNET_OK;
988 case GNUNET_NAMESTORE_TYPE_PKEY: 988 case GNUNET_NAMESTORE_TYPE_PKEY:
989 if (GNUNET_OK != 989 if (GNUNET_OK !=
990 GNUNET_CRYPTO_ecc_public_sign_key_from_string (s, strlen (s), &pkey)) 990 GNUNET_CRYPTO_ecdsa_public_key_from_string (s, strlen (s), &pkey))
991 { 991 {
992 LOG (GNUNET_ERROR_TYPE_ERROR, 992 LOG (GNUNET_ERROR_TYPE_ERROR,
993 _("Unable to parse PKEY record `%s'\n"), 993 _("Unable to parse PKEY record `%s'\n"),
994 s); 994 s);
995 return GNUNET_SYSERR; 995 return GNUNET_SYSERR;
996 } 996 }
997 *data = GNUNET_new (struct GNUNET_CRYPTO_EccPublicSignKey); 997 *data = GNUNET_new (struct GNUNET_CRYPTO_EcdsaPublicKey);
998 memcpy (*data, &pkey, sizeof (pkey)); 998 memcpy (*data, &pkey, sizeof (pkey));
999 *data_size = sizeof (struct GNUNET_CRYPTO_EccPublicSignKey); 999 *data_size = sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey);
1000 return GNUNET_OK; 1000 return GNUNET_OK;
1001 case GNUNET_NAMESTORE_TYPE_PHONE: 1001 case GNUNET_NAMESTORE_TYPE_PHONE:
1002 { 1002 {
@@ -1008,7 +1008,7 @@ GNUNET_NAMESTORE_string_to_value (uint32_t type,
1008 if ( (NULL == (dash = strchr (s, '-'))) || 1008 if ( (NULL == (dash = strchr (s, '-'))) ||
1009 (1 != sscanf (s, "%u-", &line)) || 1009 (1 != sscanf (s, "%u-", &line)) ||
1010 (GNUNET_OK != 1010 (GNUNET_OK !=
1011 GNUNET_CRYPTO_ecc_public_sign_key_from_string (dash + 1, 1011 GNUNET_CRYPTO_eddsa_public_key_from_string (dash + 1,
1012 strlen (dash + 1), 1012 strlen (dash + 1),
1013 &peer.public_key)) ) 1013 &peer.public_key)) )
1014 { 1014 {
@@ -1044,7 +1044,7 @@ GNUNET_NAMESTORE_string_to_value (uint32_t type,
1044 } 1044 }
1045 *data_size = sizeof (struct GNUNET_TUN_GnsVpnRecord) + strlen (s_serv) + 1; 1045 *data_size = sizeof (struct GNUNET_TUN_GnsVpnRecord) + strlen (s_serv) + 1;
1046 *data = vpn = GNUNET_malloc (*data_size); 1046 *data = vpn = GNUNET_malloc (*data_size);
1047 if (GNUNET_OK != GNUNET_CRYPTO_ecc_public_sign_key_from_string ((char*) s_peer, 1047 if (GNUNET_OK != GNUNET_CRYPTO_eddsa_public_key_from_string ((char*) s_peer,
1048 strlen (s_peer), 1048 strlen (s_peer),
1049 &vpn->peer.public_key)) 1049 &vpn->peer.public_key))
1050 { 1050 {
@@ -1194,13 +1194,13 @@ GNUNET_NAMESTORE_is_expired (const struct GNUNET_NAMESTORE_RecordData *rd)
1194 * @param query hash to use for the query 1194 * @param query hash to use for the query
1195 */ 1195 */
1196void 1196void
1197GNUNET_NAMESTORE_query_from_private_key (const struct GNUNET_CRYPTO_EccPrivateKey *zone, 1197GNUNET_NAMESTORE_query_from_private_key (const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
1198 const char *label, 1198 const char *label,
1199 struct GNUNET_HashCode *query) 1199 struct GNUNET_HashCode *query)
1200{ 1200{
1201 struct GNUNET_CRYPTO_EccPublicSignKey pub; 1201 struct GNUNET_CRYPTO_EcdsaPublicKey pub;
1202 1202
1203 GNUNET_CRYPTO_ecc_key_get_public_for_signature (zone, &pub); 1203 GNUNET_CRYPTO_ecdsa_key_get_public (zone, &pub);
1204 GNUNET_NAMESTORE_query_from_public_key (&pub, label, query); 1204 GNUNET_NAMESTORE_query_from_public_key (&pub, label, query);
1205} 1205}
1206 1206
@@ -1213,13 +1213,13 @@ GNUNET_NAMESTORE_query_from_private_key (const struct GNUNET_CRYPTO_EccPrivateKe
1213 * @param query hash to use for the query 1213 * @param query hash to use for the query
1214 */ 1214 */
1215void 1215void
1216GNUNET_NAMESTORE_query_from_public_key (const struct GNUNET_CRYPTO_EccPublicSignKey *pub, 1216GNUNET_NAMESTORE_query_from_public_key (const struct GNUNET_CRYPTO_EcdsaPublicKey *pub,
1217 const char *label, 1217 const char *label,
1218 struct GNUNET_HashCode *query) 1218 struct GNUNET_HashCode *query)
1219{ 1219{
1220 struct GNUNET_CRYPTO_EccPublicSignKey pd; 1220 struct GNUNET_CRYPTO_EcdsaPublicKey pd;
1221 1221
1222 GNUNET_CRYPTO_ecc_public_key_derive (pub, label, "gns", &pd); 1222 GNUNET_CRYPTO_ecdsa_public_key_derive (pub, label, "gns", &pd);
1223 GNUNET_CRYPTO_hash (&pd, sizeof (pd), query); 1223 GNUNET_CRYPTO_hash (&pd, sizeof (pd), query);
1224} 1224}
1225 1225
@@ -1235,12 +1235,12 @@ GNUNET_NAMESTORE_query_from_public_key (const struct GNUNET_CRYPTO_EccPublicSign
1235 * key in an encoding suitable for DNS labels. 1235 * key in an encoding suitable for DNS labels.
1236 */ 1236 */
1237const char * 1237const char *
1238GNUNET_NAMESTORE_pkey_to_zkey (const struct GNUNET_CRYPTO_EccPublicSignKey *pkey) 1238GNUNET_NAMESTORE_pkey_to_zkey (const struct GNUNET_CRYPTO_EcdsaPublicKey *pkey)
1239{ 1239{
1240 static char ret[128]; 1240 static char ret[128];
1241 char *pkeys; 1241 char *pkeys;
1242 1242
1243 pkeys = GNUNET_CRYPTO_ecc_public_sign_key_to_string (pkey); 1243 pkeys = GNUNET_CRYPTO_ecdsa_public_key_to_string (pkey);
1244 GNUNET_snprintf (ret, 1244 GNUNET_snprintf (ret,
1245 sizeof (ret), 1245 sizeof (ret),
1246 "%s.zkey", 1246 "%s.zkey",
@@ -1261,7 +1261,7 @@ GNUNET_NAMESTORE_pkey_to_zkey (const struct GNUNET_CRYPTO_EccPublicSignKey *pkey
1261 */ 1261 */
1262int 1262int
1263GNUNET_NAMESTORE_zkey_to_pkey (const char *zkey, 1263GNUNET_NAMESTORE_zkey_to_pkey (const char *zkey,
1264 struct GNUNET_CRYPTO_EccPublicSignKey *pkey) 1264 struct GNUNET_CRYPTO_EcdsaPublicKey *pkey)
1265{ 1265{
1266 char *cpy; 1266 char *cpy;
1267 char *dot; 1267 char *dot;
@@ -1277,7 +1277,7 @@ GNUNET_NAMESTORE_zkey_to_pkey (const char *zkey,
1277 goto error; 1277 goto error;
1278 1278
1279 if (GNUNET_OK != 1279 if (GNUNET_OK !=
1280 GNUNET_CRYPTO_ecc_public_sign_key_from_string (x, 1280 GNUNET_CRYPTO_ecdsa_public_key_from_string (x,
1281 strlen (x), 1281 strlen (x),
1282 pkey)) 1282 pkey))
1283 goto error; 1283 goto error;
diff --git a/src/namestore/namestore_api_monitor.c b/src/namestore/namestore_api_monitor.c
index ccf556abd..c9834e46c 100644
--- a/src/namestore/namestore_api_monitor.c
+++ b/src/namestore/namestore_api_monitor.c
@@ -73,7 +73,7 @@ struct GNUNET_NAMESTORE_ZoneMonitor
73 /** 73 /**
74 * Monitored zone. 74 * Monitored zone.
75 */ 75 */
76 struct GNUNET_CRYPTO_EccPrivateKey zone; 76 struct GNUNET_CRYPTO_EcdsaPrivateKey zone;
77 77
78}; 78};
79 79
@@ -255,7 +255,7 @@ transmit_monitor_message (void *cls,
255 */ 255 */
256struct GNUNET_NAMESTORE_ZoneMonitor * 256struct GNUNET_NAMESTORE_ZoneMonitor *
257GNUNET_NAMESTORE_zone_monitor_start (const struct GNUNET_CONFIGURATION_Handle *cfg, 257GNUNET_NAMESTORE_zone_monitor_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
258 const struct GNUNET_CRYPTO_EccPrivateKey *zone, 258 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
259 GNUNET_NAMESTORE_RecordMonitor monitor, 259 GNUNET_NAMESTORE_RecordMonitor monitor,
260 GNUNET_NAMESTORE_RecordsSynchronizedCallback sync_cb, 260 GNUNET_NAMESTORE_RecordsSynchronizedCallback sync_cb,
261 void *cls) 261 void *cls)
diff --git a/src/namestore/plugin_namestore_postgres.c b/src/namestore/plugin_namestore_postgres.c
index 7be06b2f5..6a1dc6f2c 100644
--- a/src/namestore/plugin_namestore_postgres.c
+++ b/src/namestore/plugin_namestore_postgres.c
@@ -337,8 +337,8 @@ namestore_postgres_cache_block (void *cls,
337 struct Plugin *plugin = cls; 337 struct Plugin *plugin = cls;
338 struct GNUNET_HashCode query; 338 struct GNUNET_HashCode query;
339 size_t block_size = ntohl (block->purpose.size) + 339 size_t block_size = ntohl (block->purpose.size) +
340 sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) + 340 sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) +
341 sizeof (struct GNUNET_CRYPTO_EccSignature); 341 sizeof (struct GNUNET_CRYPTO_EcdsaSignature);
342 const char *paramValues[] = { 342 const char *paramValues[] = {
343 (const char *) &query, 343 (const char *) &query,
344 (const char *) block, 344 (const char *) block,
@@ -354,7 +354,7 @@ namestore_postgres_cache_block (void *cls,
354 354
355 namestore_postgres_expire_blocks (plugin); 355 namestore_postgres_expire_blocks (plugin);
356 GNUNET_CRYPTO_hash (&block->derived_key, 356 GNUNET_CRYPTO_hash (&block->derived_key,
357 sizeof (struct GNUNET_CRYPTO_EccPublicSignKey), 357 sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey),
358 &query); 358 &query);
359 if (block_size > 64 * 65536) 359 if (block_size > 64 * 65536)
360 { 360 {
@@ -433,8 +433,8 @@ namestore_postgres_lookup_block (void *cls,
433 block = (const struct GNUNET_NAMESTORE_Block *) PQgetvalue (res, 0, 0); 433 block = (const struct GNUNET_NAMESTORE_Block *) PQgetvalue (res, 0, 0);
434 if ( (bsize < sizeof (*block)) || 434 if ( (bsize < sizeof (*block)) ||
435 (bsize != ntohl (block->purpose.size) + 435 (bsize != ntohl (block->purpose.size) +
436 sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) + 436 sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) +
437 sizeof (struct GNUNET_CRYPTO_EccSignature)) ) 437 sizeof (struct GNUNET_CRYPTO_EcdsaSignature)) )
438 { 438 {
439 GNUNET_break (0); 439 GNUNET_break (0);
440 LOG (GNUNET_ERROR_TYPE_DEBUG, 440 LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -461,13 +461,13 @@ namestore_postgres_lookup_block (void *cls,
461 */ 461 */
462static int 462static int
463namestore_postgres_store_records (void *cls, 463namestore_postgres_store_records (void *cls,
464 const struct GNUNET_CRYPTO_EccPrivateKey *zone_key, 464 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
465 const char *label, 465 const char *label,
466 unsigned int rd_count, 466 unsigned int rd_count,
467 const struct GNUNET_NAMESTORE_RecordData *rd) 467 const struct GNUNET_NAMESTORE_RecordData *rd)
468{ 468{
469 struct Plugin *plugin = cls; 469 struct Plugin *plugin = cls;
470 struct GNUNET_CRYPTO_EccPublicSignKey pkey; 470 struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
471 uint64_t rvalue; 471 uint64_t rvalue;
472 uint32_t rd_count_nbo = htonl ((uint32_t) rd_count); 472 uint32_t rd_count_nbo = htonl ((uint32_t) rd_count);
473 size_t data_size; 473 size_t data_size;
@@ -477,7 +477,7 @@ namestore_postgres_store_records (void *cls,
477 for (i=0;i<rd_count;i++) 477 for (i=0;i<rd_count;i++)
478 if (GNUNET_NAMESTORE_TYPE_PKEY == rd[i].record_type) 478 if (GNUNET_NAMESTORE_TYPE_PKEY == rd[i].record_type)
479 { 479 {
480 GNUNET_break (sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) == rd[i].data_size); 480 GNUNET_break (sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) == rd[i].data_size);
481 memcpy (&pkey, 481 memcpy (&pkey,
482 rd[i].data, 482 rd[i].data,
483 rd[i].data_size); 483 rd[i].data_size);
@@ -549,7 +549,7 @@ namestore_postgres_store_records (void *cls,
549static int 549static int
550get_record_and_call_iterator (struct Plugin *plugin, 550get_record_and_call_iterator (struct Plugin *plugin,
551 PGresult *res, 551 PGresult *res,
552 const struct GNUNET_CRYPTO_EccPrivateKey *zone_key, 552 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
553 GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls) 553 GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls)
554{ 554{
555 const char *data; 555 const char *data;
@@ -580,13 +580,13 @@ get_record_and_call_iterator (struct Plugin *plugin,
580 GNUNET_assert (3 + ((NULL == zone_key) ? 1 : 0) == PQnfields (res)); 580 GNUNET_assert (3 + ((NULL == zone_key) ? 1 : 0) == PQnfields (res));
581 if (NULL == zone_key) 581 if (NULL == zone_key)
582 { 582 {
583 if (sizeof (struct GNUNET_CRYPTO_EccPrivateKey) != PQgetlength (res, 0, 3)) 583 if (sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey) != PQgetlength (res, 0, 3))
584 { 584 {
585 GNUNET_break (0); 585 GNUNET_break (0);
586 PQclear (res); 586 PQclear (res);
587 return GNUNET_SYSERR; 587 return GNUNET_SYSERR;
588 } 588 }
589 zone_key = (const struct GNUNET_CRYPTO_EccPrivateKey *) PQgetvalue (res, 0, 3); 589 zone_key = (const struct GNUNET_CRYPTO_EcdsaPrivateKey *) PQgetvalue (res, 0, 3);
590 } 590 }
591 if (sizeof (uint32_t) != PQfsize (res, 0)) 591 if (sizeof (uint32_t) != PQfsize (res, 0))
592 { 592 {
@@ -642,7 +642,7 @@ get_record_and_call_iterator (struct Plugin *plugin,
642 */ 642 */
643static int 643static int
644namestore_postgres_iterate_records (void *cls, 644namestore_postgres_iterate_records (void *cls,
645 const struct GNUNET_CRYPTO_EccPrivateKey *zone, 645 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
646 uint64_t offset, 646 uint64_t offset,
647 GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls) 647 GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls)
648{ 648{
@@ -707,8 +707,8 @@ namestore_postgres_iterate_records (void *cls,
707 */ 707 */
708static int 708static int
709namestore_postgres_zone_to_name (void *cls, 709namestore_postgres_zone_to_name (void *cls,
710 const struct GNUNET_CRYPTO_EccPrivateKey *zone, 710 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
711 const struct GNUNET_CRYPTO_EccPublicSignKey *value_zone, 711 const struct GNUNET_CRYPTO_EcdsaPublicKey *value_zone,
712 GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls) 712 GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls)
713{ 713{
714 struct Plugin *plugin = cls; 714 struct Plugin *plugin = cls;
diff --git a/src/namestore/plugin_namestore_sqlite.c b/src/namestore/plugin_namestore_sqlite.c
index 19fa86bf3..729b916ca 100644
--- a/src/namestore/plugin_namestore_sqlite.c
+++ b/src/namestore/plugin_namestore_sqlite.c
@@ -467,15 +467,15 @@ namestore_sqlite_cache_block (void *cls,
467 467
468 namestore_sqlite_expire_blocks (plugin); 468 namestore_sqlite_expire_blocks (plugin);
469 GNUNET_CRYPTO_hash (&block->derived_key, 469 GNUNET_CRYPTO_hash (&block->derived_key,
470 sizeof (struct GNUNET_CRYPTO_EccPublicSignKey), 470 sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey),
471 &query); 471 &query);
472 expiration = GNUNET_TIME_absolute_ntoh (block->expiration_time); 472 expiration = GNUNET_TIME_absolute_ntoh (block->expiration_time);
473 dval = (int64_t) expiration.abs_value_us; 473 dval = (int64_t) expiration.abs_value_us;
474 if (dval < 0) 474 if (dval < 0)
475 dval = INT64_MAX; 475 dval = INT64_MAX;
476 block_size = ntohl (block->purpose.size) + 476 block_size = ntohl (block->purpose.size) +
477 sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) + 477 sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) +
478 sizeof (struct GNUNET_CRYPTO_EccSignature); 478 sizeof (struct GNUNET_CRYPTO_EcdsaSignature);
479 if (block_size > 64 * 65536) 479 if (block_size > 64 * 65536)
480 { 480 {
481 GNUNET_break (0); 481 GNUNET_break (0);
@@ -606,8 +606,8 @@ namestore_sqlite_lookup_block (void *cls,
606 block_size = sqlite3_column_bytes (plugin->lookup_block, 0); 606 block_size = sqlite3_column_bytes (plugin->lookup_block, 0);
607 if ( (block_size < sizeof (struct GNUNET_NAMESTORE_Block)) || 607 if ( (block_size < sizeof (struct GNUNET_NAMESTORE_Block)) ||
608 (ntohl (block->purpose.size) + 608 (ntohl (block->purpose.size) +
609 sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) + 609 sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) +
610 sizeof (struct GNUNET_CRYPTO_EccSignature) != block_size) ) 610 sizeof (struct GNUNET_CRYPTO_EcdsaSignature) != block_size) )
611 { 611 {
612 GNUNET_break (0); 612 GNUNET_break (0);
613 ret = GNUNET_SYSERR; 613 ret = GNUNET_SYSERR;
@@ -656,14 +656,14 @@ namestore_sqlite_lookup_block (void *cls,
656 */ 656 */
657static int 657static int
658namestore_sqlite_store_records (void *cls, 658namestore_sqlite_store_records (void *cls,
659 const struct GNUNET_CRYPTO_EccPrivateKey *zone_key, 659 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
660 const char *label, 660 const char *label,
661 unsigned int rd_count, 661 unsigned int rd_count,
662 const struct GNUNET_NAMESTORE_RecordData *rd) 662 const struct GNUNET_NAMESTORE_RecordData *rd)
663{ 663{
664 struct Plugin *plugin = cls; 664 struct Plugin *plugin = cls;
665 int n; 665 int n;
666 struct GNUNET_CRYPTO_EccPublicSignKey pkey; 666 struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
667 uint64_t rvalue; 667 uint64_t rvalue;
668 size_t data_size; 668 size_t data_size;
669 unsigned int i; 669 unsigned int i;
@@ -672,7 +672,7 @@ namestore_sqlite_store_records (void *cls,
672 for (i=0;i<rd_count;i++) 672 for (i=0;i<rd_count;i++)
673 if (GNUNET_NAMESTORE_TYPE_PKEY == rd[i].record_type) 673 if (GNUNET_NAMESTORE_TYPE_PKEY == rd[i].record_type)
674 { 674 {
675 GNUNET_break (sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) == rd[i].data_size); 675 GNUNET_break (sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) == rd[i].data_size);
676 memcpy (&pkey, 676 memcpy (&pkey,
677 rd[i].data, 677 rd[i].data,
678 rd[i].data_size); 678 rd[i].data_size);
@@ -697,7 +697,7 @@ namestore_sqlite_store_records (void *cls,
697 697
698 /* First delete 'old' records */ 698 /* First delete 'old' records */
699 if ((SQLITE_OK != sqlite3_bind_blob (plugin->delete_records, 1, 699 if ((SQLITE_OK != sqlite3_bind_blob (plugin->delete_records, 1,
700 zone_key, sizeof (struct GNUNET_CRYPTO_EccPrivateKey), SQLITE_STATIC)) || 700 zone_key, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey), SQLITE_STATIC)) ||
701 (SQLITE_OK != sqlite3_bind_text (plugin->delete_records, 2, label, -1, SQLITE_STATIC))) 701 (SQLITE_OK != sqlite3_bind_text (plugin->delete_records, 2, label, -1, SQLITE_STATIC)))
702 { 702 {
703 LOG_SQLITE (plugin, 703 LOG_SQLITE (plugin,
@@ -718,9 +718,9 @@ namestore_sqlite_store_records (void *cls,
718 if (0 != rd_count) 718 if (0 != rd_count)
719 { 719 {
720 if ((SQLITE_OK != sqlite3_bind_blob (plugin->store_records, 1, 720 if ((SQLITE_OK != sqlite3_bind_blob (plugin->store_records, 1,
721 zone_key, sizeof (struct GNUNET_CRYPTO_EccPrivateKey), SQLITE_STATIC)) || 721 zone_key, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey), SQLITE_STATIC)) ||
722 (SQLITE_OK != sqlite3_bind_blob (plugin->store_records, 2, 722 (SQLITE_OK != sqlite3_bind_blob (plugin->store_records, 2,
723 &pkey, sizeof (struct GNUNET_CRYPTO_EccPublicSignKey), SQLITE_STATIC)) || 723 &pkey, sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey), SQLITE_STATIC)) ||
724 (SQLITE_OK != sqlite3_bind_int64 (plugin->store_records, 3, rvalue)) || 724 (SQLITE_OK != sqlite3_bind_int64 (plugin->store_records, 3, rvalue)) ||
725 (SQLITE_OK != sqlite3_bind_int (plugin->store_records, 4, rd_count)) || 725 (SQLITE_OK != sqlite3_bind_int (plugin->store_records, 4, rd_count)) ||
726 (SQLITE_OK != sqlite3_bind_blob (plugin->store_records, 5, data, data_size, SQLITE_STATIC)) || 726 (SQLITE_OK != sqlite3_bind_blob (plugin->store_records, 5, data, data_size, SQLITE_STATIC)) ||
@@ -776,7 +776,7 @@ namestore_sqlite_store_records (void *cls,
776static int 776static int
777get_record_and_call_iterator (struct Plugin *plugin, 777get_record_and_call_iterator (struct Plugin *plugin,
778 sqlite3_stmt *stmt, 778 sqlite3_stmt *stmt,
779 const struct GNUNET_CRYPTO_EccPrivateKey *zone_key, 779 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
780 GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls) 780 GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls)
781{ 781{
782 unsigned int record_count; 782 unsigned int record_count;
@@ -796,7 +796,7 @@ get_record_and_call_iterator (struct Plugin *plugin,
796 if (NULL == zone_key) 796 if (NULL == zone_key)
797 { 797 {
798 /* must be "iterate_all_zones", got one extra return value */ 798 /* must be "iterate_all_zones", got one extra return value */
799 if (sizeof (struct GNUNET_CRYPTO_EccPrivateKey) != 799 if (sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey) !=
800 sqlite3_column_bytes (stmt, 3)) 800 sqlite3_column_bytes (stmt, 3))
801 { 801 {
802 GNUNET_break (0); 802 GNUNET_break (0);
@@ -859,7 +859,7 @@ get_record_and_call_iterator (struct Plugin *plugin,
859 */ 859 */
860static int 860static int
861namestore_sqlite_iterate_records (void *cls, 861namestore_sqlite_iterate_records (void *cls,
862 const struct GNUNET_CRYPTO_EccPrivateKey *zone, 862 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
863 uint64_t offset, 863 uint64_t offset,
864 GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls) 864 GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls)
865{ 865{
@@ -877,7 +877,7 @@ namestore_sqlite_iterate_records (void *cls,
877 { 877 {
878 stmt = plugin->iterate_zone; 878 stmt = plugin->iterate_zone;
879 err = ( (SQLITE_OK != sqlite3_bind_blob (stmt, 1, 879 err = ( (SQLITE_OK != sqlite3_bind_blob (stmt, 1,
880 zone, sizeof (struct GNUNET_CRYPTO_EccPrivateKey), 880 zone, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey),
881 SQLITE_STATIC)) || 881 SQLITE_STATIC)) ||
882 (SQLITE_OK != sqlite3_bind_int64 (stmt, 2, 882 (SQLITE_OK != sqlite3_bind_int64 (stmt, 2,
883 offset)) ); 883 offset)) );
@@ -909,8 +909,8 @@ namestore_sqlite_iterate_records (void *cls,
909 */ 909 */
910static int 910static int
911namestore_sqlite_zone_to_name (void *cls, 911namestore_sqlite_zone_to_name (void *cls,
912 const struct GNUNET_CRYPTO_EccPrivateKey *zone, 912 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
913 const struct GNUNET_CRYPTO_EccPublicSignKey *value_zone, 913 const struct GNUNET_CRYPTO_EcdsaPublicKey *value_zone,
914 GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls) 914 GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls)
915{ 915{
916 struct Plugin *plugin = cls; 916 struct Plugin *plugin = cls;
@@ -918,10 +918,10 @@ namestore_sqlite_zone_to_name (void *cls,
918 918
919 stmt = plugin->zone_to_name; 919 stmt = plugin->zone_to_name;
920 if ( (SQLITE_OK != sqlite3_bind_blob (stmt, 1, 920 if ( (SQLITE_OK != sqlite3_bind_blob (stmt, 1,
921 zone, sizeof (struct GNUNET_CRYPTO_EccPrivateKey), 921 zone, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey),
922 SQLITE_STATIC)) || 922 SQLITE_STATIC)) ||
923 (SQLITE_OK != sqlite3_bind_blob (stmt, 2, 923 (SQLITE_OK != sqlite3_bind_blob (stmt, 2,
924 value_zone, sizeof (struct GNUNET_CRYPTO_EccPublicSignKey), 924 value_zone, sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey),
925 SQLITE_STATIC)) ) 925 SQLITE_STATIC)) )
926 { 926 {
927 LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, 927 LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
diff --git a/src/namestore/test_namestore_api_blocks.c b/src/namestore/test_namestore_api_blocks.c
index e480def31..001e7e182 100644
--- a/src/namestore/test_namestore_api_blocks.c
+++ b/src/namestore/test_namestore_api_blocks.c
@@ -40,7 +40,7 @@
40#define TEST_REMOVE_RECORD_DATA 'b' 40#define TEST_REMOVE_RECORD_DATA 'b'
41 41
42 42
43static struct GNUNET_CRYPTO_EccPrivateKey * privkey; 43static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey;
44 44
45static struct GNUNET_NAMESTORE_RecordData *s_rd; 45static struct GNUNET_NAMESTORE_RecordData *s_rd;
46 46
@@ -99,19 +99,19 @@ run (void *cls, char *const *args, const char *cfgfile,
99 const struct GNUNET_CONFIGURATION_Handle *cfg) 99 const struct GNUNET_CONFIGURATION_Handle *cfg)
100{ 100{
101 struct GNUNET_NAMESTORE_Block *block; 101 struct GNUNET_NAMESTORE_Block *block;
102 struct GNUNET_CRYPTO_EccPublicSignKey pubkey; 102 struct GNUNET_CRYPTO_EcdsaPublicKey pubkey;
103 103
104 /* load privat key */ 104 /* load privat key */
105 char *hostkey_file; 105 char *hostkey_file;
106 GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, 106 GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR,
107 "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); 107 "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey");
108 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); 108 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file);
109 privkey = GNUNET_CRYPTO_ecc_key_create_from_file(hostkey_file); 109 privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file);
110 GNUNET_free (hostkey_file); 110 GNUNET_free (hostkey_file);
111 GNUNET_assert (privkey != NULL); 111 GNUNET_assert (privkey != NULL);
112 struct GNUNET_TIME_Absolute expire = GNUNET_TIME_absolute_get(); 112 struct GNUNET_TIME_Absolute expire = GNUNET_TIME_absolute_get();
113 /* get public key */ 113 /* get public key */
114 GNUNET_CRYPTO_ecc_key_get_public_for_signature(privkey, &pubkey); 114 GNUNET_CRYPTO_ecdsa_key_get_public(privkey, &pubkey);
115 115
116 /* create record */ 116 /* create record */
117 s_name = "DUMMY.dummy.gnunet"; 117 s_name = "DUMMY.dummy.gnunet";
diff --git a/src/namestore/test_namestore_api_cache_block.c b/src/namestore/test_namestore_api_cache_block.c
index 8ed010abd..1fee80ec8 100644
--- a/src/namestore/test_namestore_api_cache_block.c
+++ b/src/namestore/test_namestore_api_cache_block.c
@@ -38,9 +38,9 @@ static struct GNUNET_NAMESTORE_Handle *nsh;
38 38
39static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; 39static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
40 40
41static struct GNUNET_CRYPTO_EccPrivateKey *privkey; 41static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey;
42 42
43static struct GNUNET_CRYPTO_EccPublicSignKey pubkey; 43static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey;
44 44
45static int res; 45static int res;
46 46
@@ -182,10 +182,10 @@ run (void *cls,
182 DIR_SEPARATOR_STR, 182 DIR_SEPARATOR_STR,
183 "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); 183 "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey");
184 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); 184 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file);
185 privkey = GNUNET_CRYPTO_ecc_key_create_from_file (hostkey_file); 185 privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file (hostkey_file);
186 GNUNET_free (hostkey_file); 186 GNUNET_free (hostkey_file);
187 GNUNET_assert (privkey != NULL); 187 GNUNET_assert (privkey != NULL);
188 GNUNET_CRYPTO_ecc_key_get_public_for_signature (privkey, &pubkey); 188 GNUNET_CRYPTO_ecdsa_key_get_public (privkey, &pubkey);
189 189
190 190
191 rd.expiration_time = GNUNET_TIME_absolute_get().abs_value_us; 191 rd.expiration_time = GNUNET_TIME_absolute_get().abs_value_us;
diff --git a/src/namestore/test_namestore_api_lookup_public.c b/src/namestore/test_namestore_api_lookup_public.c
index f2b009ac5..6c6ee55ec 100644
--- a/src/namestore/test_namestore_api_lookup_public.c
+++ b/src/namestore/test_namestore_api_lookup_public.c
@@ -38,9 +38,9 @@ static struct GNUNET_NAMESTORE_Handle *nsh;
38 38
39static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; 39static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
40 40
41static struct GNUNET_CRYPTO_EccPrivateKey *privkey; 41static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey;
42 42
43static struct GNUNET_CRYPTO_EccPublicSignKey pubkey; 43static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey;
44 44
45static int res; 45static int res;
46 46
@@ -149,7 +149,7 @@ put_cont (void *cls, int32_t success, const char *emsg)
149{ 149{
150 const char *name = cls; 150 const char *name = cls;
151 struct GNUNET_HashCode derived_hash; 151 struct GNUNET_HashCode derived_hash;
152 struct GNUNET_CRYPTO_EccPublicSignKey pubkey; 152 struct GNUNET_CRYPTO_EcdsaPublicKey pubkey;
153 153
154 GNUNET_assert (NULL != cls); 154 GNUNET_assert (NULL != cls);
155 155
@@ -159,7 +159,7 @@ put_cont (void *cls, int32_t success, const char *emsg)
159 (success == GNUNET_OK) ? "SUCCESS" : "FAIL"); 159 (success == GNUNET_OK) ? "SUCCESS" : "FAIL");
160 160
161 /* Create derived hash */ 161 /* Create derived hash */
162 GNUNET_CRYPTO_ecc_key_get_public_for_signature (privkey, &pubkey); 162 GNUNET_CRYPTO_ecdsa_key_get_public (privkey, &pubkey);
163 GNUNET_NAMESTORE_query_from_public_key (&pubkey, name, &derived_hash); 163 GNUNET_NAMESTORE_query_from_public_key (&pubkey, name, &derived_hash);
164 164
165 nsqe = GNUNET_NAMESTORE_lookup_block (nsh, &derived_hash, 165 nsqe = GNUNET_NAMESTORE_lookup_block (nsh, &derived_hash,
@@ -183,10 +183,10 @@ run (void *cls,
183 DIR_SEPARATOR_STR, 183 DIR_SEPARATOR_STR,
184 "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); 184 "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey");
185 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); 185 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file);
186 privkey = GNUNET_CRYPTO_ecc_key_create_from_file (hostkey_file); 186 privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file (hostkey_file);
187 GNUNET_free (hostkey_file); 187 GNUNET_free (hostkey_file);
188 GNUNET_assert (privkey != NULL); 188 GNUNET_assert (privkey != NULL);
189 GNUNET_CRYPTO_ecc_key_get_public_for_signature (privkey, &pubkey); 189 GNUNET_CRYPTO_ecdsa_key_get_public (privkey, &pubkey);
190 190
191 191
192 rd.expiration_time = GNUNET_TIME_absolute_get().abs_value_us; 192 rd.expiration_time = GNUNET_TIME_absolute_get().abs_value_us;
diff --git a/src/namestore/test_namestore_api_monitoring.c b/src/namestore/test_namestore_api_monitoring.c
index d0662617e..2d5888a5e 100644
--- a/src/namestore/test_namestore_api_monitoring.c
+++ b/src/namestore/test_namestore_api_monitoring.c
@@ -34,9 +34,9 @@ static struct GNUNET_NAMESTORE_Handle * nsh;
34 34
35static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; 35static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
36 36
37static struct GNUNET_CRYPTO_EccPrivateKey * privkey; 37static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey;
38 38
39static struct GNUNET_CRYPTO_EccPrivateKey * privkey2; 39static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey2;
40 40
41static struct GNUNET_NAMESTORE_ZoneMonitor *zm; 41static struct GNUNET_NAMESTORE_ZoneMonitor *zm;
42 42
@@ -145,7 +145,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
145 145
146static void 146static void
147zone_proc (void *cls, 147zone_proc (void *cls,
148 const struct GNUNET_CRYPTO_EccPrivateKey *zone_key, 148 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
149 const char *name, 149 const char *name,
150 unsigned int rd_count, 150 unsigned int rd_count,
151 const struct GNUNET_NAMESTORE_RecordData *rd) 151 const struct GNUNET_NAMESTORE_RecordData *rd)
@@ -156,7 +156,7 @@ zone_proc (void *cls,
156 "Comparing results name %s\n", 156 "Comparing results name %s\n",
157 name); 157 name);
158 158
159 if (0 != memcmp (zone_key, privkey, sizeof (struct GNUNET_CRYPTO_EccPrivateKey))) 159 if (0 != memcmp (zone_key, privkey, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
160 { 160 {
161 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 161 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
162 "Monitoring returned wrong zone key\n"); 162 "Monitoring returned wrong zone key\n");
@@ -268,7 +268,7 @@ run (void *cls,
268 "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); 268 "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey");
269 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 269 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
270 "Using zonekey file `%s' \n", hostkey_file); 270 "Using zonekey file `%s' \n", hostkey_file);
271 privkey = GNUNET_CRYPTO_ecc_key_create_from_file(hostkey_file); 271 privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file);
272 GNUNET_free (hostkey_file); 272 GNUNET_free (hostkey_file);
273 GNUNET_assert (privkey != NULL); 273 GNUNET_assert (privkey != NULL);
274 274
@@ -301,7 +301,7 @@ run (void *cls,
301 DIR_SEPARATOR_STR, 301 DIR_SEPARATOR_STR,
302 "HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey"); 302 "HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey");
303 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); 303 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file);
304 privkey2 = GNUNET_CRYPTO_ecc_key_create_from_file(hostkey_file); 304 privkey2 = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file);
305 GNUNET_free (hostkey_file); 305 GNUNET_free (hostkey_file);
306 GNUNET_assert (privkey2 != NULL); 306 GNUNET_assert (privkey2 != NULL);
307 307
diff --git a/src/namestore/test_namestore_api_monitoring_existing.c b/src/namestore/test_namestore_api_monitoring_existing.c
index 4db1c6d62..3b2ca6092 100644
--- a/src/namestore/test_namestore_api_monitoring_existing.c
+++ b/src/namestore/test_namestore_api_monitoring_existing.c
@@ -35,9 +35,9 @@ static struct GNUNET_NAMESTORE_Handle * nsh;
35 35
36static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; 36static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
37 37
38static struct GNUNET_CRYPTO_EccPrivateKey * privkey; 38static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey;
39 39
40static struct GNUNET_CRYPTO_EccPrivateKey * privkey2; 40static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey2;
41 41
42static struct GNUNET_NAMESTORE_ZoneMonitor *zm; 42static struct GNUNET_NAMESTORE_ZoneMonitor *zm;
43 43
@@ -146,7 +146,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
146 146
147static void 147static void
148zone_proc (void *cls, 148zone_proc (void *cls,
149 const struct GNUNET_CRYPTO_EccPrivateKey *zone_key, 149 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
150 const char *name, 150 const char *name,
151 unsigned int rd_count, 151 unsigned int rd_count,
152 const struct GNUNET_NAMESTORE_RecordData *rd) 152 const struct GNUNET_NAMESTORE_RecordData *rd)
@@ -157,7 +157,7 @@ zone_proc (void *cls,
157 "Comparing results name %s\n", 157 "Comparing results name %s\n",
158 name); 158 name);
159 159
160 if (0 != memcmp (zone_key, privkey, sizeof (struct GNUNET_CRYPTO_EccPrivateKey))) 160 if (0 != memcmp (zone_key, privkey, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
161 { 161 {
162 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 162 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
163 "Monitoring returned wrong zone key\n"); 163 "Monitoring returned wrong zone key\n");
@@ -286,7 +286,7 @@ run (void *cls,
286 "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); 286 "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey");
287 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 287 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
288 "Using zonekey file `%s' \n", hostkey_file); 288 "Using zonekey file `%s' \n", hostkey_file);
289 privkey = GNUNET_CRYPTO_ecc_key_create_from_file(hostkey_file); 289 privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file);
290 GNUNET_free (hostkey_file); 290 GNUNET_free (hostkey_file);
291 GNUNET_assert (privkey != NULL); 291 GNUNET_assert (privkey != NULL);
292 292
@@ -306,7 +306,7 @@ run (void *cls,
306 DIR_SEPARATOR_STR, 306 DIR_SEPARATOR_STR,
307 "HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey"); 307 "HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey");
308 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); 308 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file);
309 privkey2 = GNUNET_CRYPTO_ecc_key_create_from_file(hostkey_file); 309 privkey2 = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file);
310 GNUNET_free (hostkey_file); 310 GNUNET_free (hostkey_file);
311 GNUNET_assert (privkey2 != NULL); 311 GNUNET_assert (privkey2 != NULL);
312 312
diff --git a/src/namestore/test_namestore_api_put.c b/src/namestore/test_namestore_api_put.c
index e3610ccaf..983ea6804 100644
--- a/src/namestore/test_namestore_api_put.c
+++ b/src/namestore/test_namestore_api_put.c
@@ -41,9 +41,9 @@ static struct GNUNET_NAMESTORE_Handle * nsh;
41 41
42static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; 42static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
43 43
44static struct GNUNET_CRYPTO_EccPrivateKey * privkey; 44static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey;
45 45
46static struct GNUNET_CRYPTO_EccPublicSignKey pubkey; 46static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey;
47 47
48static struct GNUNET_NAMESTORE_RecordData *s_rd; 48static struct GNUNET_NAMESTORE_RecordData *s_rd;
49 49
@@ -135,7 +135,7 @@ run (void *cls,
135 const struct GNUNET_CONFIGURATION_Handle *cfg, 135 const struct GNUNET_CONFIGURATION_Handle *cfg,
136 struct GNUNET_TESTING_Peer *peer) 136 struct GNUNET_TESTING_Peer *peer)
137{ 137{
138 struct GNUNET_CRYPTO_EccSignature *signature; 138 struct GNUNET_CRYPTO_EcdsaSignature *signature;
139 char * s_name; 139 char * s_name;
140 int c; 140 int c;
141 char *hostkey_file; 141 char *hostkey_file;
@@ -146,11 +146,11 @@ run (void *cls,
146 GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, 146 GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR,
147 "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); 147 "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey");
148 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); 148 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file);
149 privkey = GNUNET_CRYPTO_ecc_key_create_from_file(hostkey_file); 149 privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file);
150 GNUNET_assert (privkey != NULL); 150 GNUNET_assert (privkey != NULL);
151 GNUNET_free (hostkey_file); 151 GNUNET_free (hostkey_file);
152 /* get public key */ 152 /* get public key */
153 GNUNET_CRYPTO_ecc_key_get_public_for_signature(privkey, &pubkey); 153 GNUNET_CRYPTO_ecdsa_key_get_public(privkey, &pubkey);
154 nsh = GNUNET_NAMESTORE_connect (cfg); 154 nsh = GNUNET_NAMESTORE_connect (cfg);
155 GNUNET_break (NULL != nsh); 155 GNUNET_break (NULL != nsh);
156 /* create record */ 156 /* create record */
diff --git a/src/namestore/test_namestore_api_remove.c b/src/namestore/test_namestore_api_remove.c
index 3f3823e89..f43bafecc 100644
--- a/src/namestore/test_namestore_api_remove.c
+++ b/src/namestore/test_namestore_api_remove.c
@@ -38,9 +38,9 @@ static struct GNUNET_NAMESTORE_Handle *nsh;
38 38
39static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; 39static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
40 40
41static struct GNUNET_CRYPTO_EccPrivateKey *privkey; 41static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey;
42 42
43static struct GNUNET_CRYPTO_EccPublicSignKey pubkey; 43static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey;
44 44
45static struct GNUNET_HashCode derived_hash; 45static struct GNUNET_HashCode derived_hash;
46 46
@@ -244,10 +244,10 @@ run (void *cls,
244 DIR_SEPARATOR_STR, 244 DIR_SEPARATOR_STR,
245 "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); 245 "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey");
246 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); 246 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file);
247 privkey = GNUNET_CRYPTO_ecc_key_create_from_file (hostkey_file); 247 privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file (hostkey_file);
248 GNUNET_free (hostkey_file); 248 GNUNET_free (hostkey_file);
249 GNUNET_assert (privkey != NULL); 249 GNUNET_assert (privkey != NULL);
250 GNUNET_CRYPTO_ecc_key_get_public_for_signature (privkey, &pubkey); 250 GNUNET_CRYPTO_ecdsa_key_get_public (privkey, &pubkey);
251 251
252 removed = GNUNET_NO; 252 removed = GNUNET_NO;
253 253
diff --git a/src/namestore/test_namestore_api_remove_not_existing_record.c b/src/namestore/test_namestore_api_remove_not_existing_record.c
index 86cf47e26..231d7b0bc 100644
--- a/src/namestore/test_namestore_api_remove_not_existing_record.c
+++ b/src/namestore/test_namestore_api_remove_not_existing_record.c
@@ -38,9 +38,9 @@ static struct GNUNET_NAMESTORE_Handle *nsh;
38 38
39static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; 39static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
40 40
41static struct GNUNET_CRYPTO_EccPrivateKey *privkey; 41static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey;
42 42
43static struct GNUNET_CRYPTO_EccPublicSignKey pubkey; 43static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey;
44 44
45static int res; 45static int res;
46 46
@@ -148,10 +148,10 @@ run (void *cls,
148 DIR_SEPARATOR_STR, 148 DIR_SEPARATOR_STR,
149 "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); 149 "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey");
150 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); 150 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file);
151 privkey = GNUNET_CRYPTO_ecc_key_create_from_file (hostkey_file); 151 privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file (hostkey_file);
152 GNUNET_free (hostkey_file); 152 GNUNET_free (hostkey_file);
153 GNUNET_assert (privkey != NULL); 153 GNUNET_assert (privkey != NULL);
154 GNUNET_CRYPTO_ecc_key_get_public_for_signature (privkey, &pubkey); 154 GNUNET_CRYPTO_ecdsa_key_get_public (privkey, &pubkey);
155 155
156 nsh = GNUNET_NAMESTORE_connect (cfg); 156 nsh = GNUNET_NAMESTORE_connect (cfg);
157 GNUNET_break (NULL != nsh); 157 GNUNET_break (NULL != nsh);
diff --git a/src/namestore/test_namestore_api_store.c b/src/namestore/test_namestore_api_store.c
index 69c47337f..133bf567f 100644
--- a/src/namestore/test_namestore_api_store.c
+++ b/src/namestore/test_namestore_api_store.c
@@ -38,9 +38,9 @@ static struct GNUNET_NAMESTORE_Handle *nsh;
38 38
39static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; 39static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
40 40
41static struct GNUNET_CRYPTO_EccPrivateKey *privkey; 41static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey;
42 42
43static struct GNUNET_CRYPTO_EccPublicSignKey pubkey; 43static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey;
44 44
45static int res; 45static int res;
46 46
@@ -181,10 +181,10 @@ run (void *cls,
181 DIR_SEPARATOR_STR, 181 DIR_SEPARATOR_STR,
182 "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); 182 "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey");
183 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); 183 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file);
184 privkey = GNUNET_CRYPTO_ecc_key_create_from_file (hostkey_file); 184 privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file (hostkey_file);
185 GNUNET_free (hostkey_file); 185 GNUNET_free (hostkey_file);
186 GNUNET_assert (privkey != NULL); 186 GNUNET_assert (privkey != NULL);
187 GNUNET_CRYPTO_ecc_key_get_public_for_signature (privkey, &pubkey); 187 GNUNET_CRYPTO_ecdsa_key_get_public (privkey, &pubkey);
188 188
189 189
190 rd.expiration_time = GNUNET_TIME_absolute_get().abs_value_us; 190 rd.expiration_time = GNUNET_TIME_absolute_get().abs_value_us;
diff --git a/src/namestore/test_namestore_api_store_update.c b/src/namestore/test_namestore_api_store_update.c
index 8b10763c0..91b8511c9 100644
--- a/src/namestore/test_namestore_api_store_update.c
+++ b/src/namestore/test_namestore_api_store_update.c
@@ -46,9 +46,9 @@ static struct GNUNET_NAMESTORE_Handle *nsh;
46 46
47static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; 47static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
48 48
49static struct GNUNET_CRYPTO_EccPrivateKey *privkey; 49static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey;
50 50
51static struct GNUNET_CRYPTO_EccPublicSignKey pubkey; 51static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey;
52 52
53static int res; 53static int res;
54 54
@@ -225,10 +225,10 @@ run (void *cls,
225 DIR_SEPARATOR_STR, 225 DIR_SEPARATOR_STR,
226 "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); 226 "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey");
227 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); 227 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file);
228 privkey = GNUNET_CRYPTO_ecc_key_create_from_file (hostkey_file); 228 privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file (hostkey_file);
229 GNUNET_free (hostkey_file); 229 GNUNET_free (hostkey_file);
230 GNUNET_assert (privkey != NULL); 230 GNUNET_assert (privkey != NULL);
231 GNUNET_CRYPTO_ecc_key_get_public_for_signature (privkey, &pubkey); 231 GNUNET_CRYPTO_ecdsa_key_get_public (privkey, &pubkey);
232 232
233 rd.flags = GNUNET_NAMESTORE_RF_NONE; 233 rd.flags = GNUNET_NAMESTORE_RF_NONE;
234 rd.expiration_time = GNUNET_TIME_absolute_get().abs_value_us; 234 rd.expiration_time = GNUNET_TIME_absolute_get().abs_value_us;
diff --git a/src/namestore/test_namestore_api_zone_iteration.c b/src/namestore/test_namestore_api_zone_iteration.c
index 94fd6d008..48671897e 100644
--- a/src/namestore/test_namestore_api_zone_iteration.c
+++ b/src/namestore/test_namestore_api_zone_iteration.c
@@ -34,9 +34,9 @@ static struct GNUNET_NAMESTORE_Handle * nsh;
34 34
35static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; 35static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
36 36
37static struct GNUNET_CRYPTO_EccPrivateKey * privkey; 37static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey;
38 38
39static struct GNUNET_CRYPTO_EccPrivateKey * privkey2; 39static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey2;
40 40
41static struct GNUNET_NAMESTORE_ZoneIterator *zi; 41static struct GNUNET_NAMESTORE_ZoneIterator *zi;
42 42
@@ -156,7 +156,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
156 156
157static void 157static void
158zone_proc (void *cls, 158zone_proc (void *cls,
159 const struct GNUNET_CRYPTO_EccPrivateKey *zone, 159 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
160 const char *label, 160 const char *label,
161 unsigned int rd_count, 161 unsigned int rd_count,
162 const struct GNUNET_NAMESTORE_RecordData *rd) 162 const struct GNUNET_NAMESTORE_RecordData *rd)
@@ -181,7 +181,7 @@ zone_proc (void *cls,
181 } 181 }
182 else 182 else
183 { 183 {
184 if (0 == memcmp (zone, privkey, sizeof (struct GNUNET_CRYPTO_EccPrivateKey))) 184 if (0 == memcmp (zone, privkey, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
185 { 185 {
186 if (0 == strcmp (label, s_name_1)) 186 if (0 == strcmp (label, s_name_1))
187 { 187 {
@@ -225,7 +225,7 @@ zone_proc (void *cls,
225 GNUNET_break (0); 225 GNUNET_break (0);
226 } 226 }
227 } 227 }
228 else if (0 == memcmp (zone, privkey2, sizeof (struct GNUNET_CRYPTO_EccPrivateKey))) 228 else if (0 == memcmp (zone, privkey2, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
229 { 229 {
230 if (0 == strcmp (label, s_name_3)) 230 if (0 == strcmp (label, s_name_3))
231 { 231 {
@@ -345,7 +345,7 @@ create_record (unsigned int count)
345 */ 345 */
346static void 346static void
347empty_zone_proc (void *cls, 347empty_zone_proc (void *cls,
348 const struct GNUNET_CRYPTO_EccPrivateKey *zone, 348 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
349 const char *label, 349 const char *label,
350 unsigned int rd_count, 350 unsigned int rd_count,
351 const struct GNUNET_NAMESTORE_RecordData *rd) 351 const struct GNUNET_NAMESTORE_RecordData *rd)
@@ -379,14 +379,14 @@ empty_zone_proc (void *cls,
379 GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, 379 GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR,
380 "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); 380 "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey");
381 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); 381 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file);
382 privkey = GNUNET_CRYPTO_ecc_key_create_from_file(hostkey_file); 382 privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file);
383 GNUNET_free (hostkey_file); 383 GNUNET_free (hostkey_file);
384 GNUNET_assert (privkey != NULL); 384 GNUNET_assert (privkey != NULL);
385 385
386 GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, 386 GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR,
387 "HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey"); 387 "HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey");
388 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); 388 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file);
389 privkey2 = GNUNET_CRYPTO_ecc_key_create_from_file(hostkey_file); 389 privkey2 = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file);
390 GNUNET_free (hostkey_file); 390 GNUNET_free (hostkey_file);
391 GNUNET_assert (privkey2 != NULL); 391 GNUNET_assert (privkey2 != NULL);
392 392
diff --git a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
index a34e742f0..7707c418e 100644
--- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
+++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
@@ -34,9 +34,9 @@ static struct GNUNET_NAMESTORE_Handle * nsh;
34 34
35static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; 35static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
36 36
37static struct GNUNET_CRYPTO_EccPrivateKey * privkey; 37static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey;
38 38
39static struct GNUNET_CRYPTO_EccPrivateKey * privkey2; 39static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey2;
40 40
41static struct GNUNET_NAMESTORE_ZoneIterator *zi; 41static struct GNUNET_NAMESTORE_ZoneIterator *zi;
42 42
@@ -156,7 +156,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
156 156
157static void 157static void
158zone_proc (void *cls, 158zone_proc (void *cls,
159 const struct GNUNET_CRYPTO_EccPrivateKey *zone, 159 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
160 const char *label, 160 const char *label,
161 unsigned int rd_count, 161 unsigned int rd_count,
162 const struct GNUNET_NAMESTORE_RecordData *rd) 162 const struct GNUNET_NAMESTORE_RecordData *rd)
@@ -181,7 +181,7 @@ zone_proc (void *cls,
181 } 181 }
182 else 182 else
183 { 183 {
184 if (0 == memcmp (zone, privkey, sizeof (struct GNUNET_CRYPTO_EccPrivateKey))) 184 if (0 == memcmp (zone, privkey, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
185 { 185 {
186 if (0 == strcmp (label, s_name_1)) 186 if (0 == strcmp (label, s_name_1))
187 { 187 {
@@ -225,7 +225,7 @@ zone_proc (void *cls,
225 GNUNET_break (0); 225 GNUNET_break (0);
226 } 226 }
227 } 227 }
228 else if (0 == memcmp (zone, privkey2, sizeof (struct GNUNET_CRYPTO_EccPrivateKey))) 228 else if (0 == memcmp (zone, privkey2, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
229 { 229 {
230 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Received data for not requested zone\n"); 230 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Received data for not requested zone\n");
231 failed = GNUNET_YES; 231 failed = GNUNET_YES;
@@ -323,7 +323,7 @@ create_record (unsigned int count)
323 */ 323 */
324static void 324static void
325empty_zone_proc (void *cls, 325empty_zone_proc (void *cls,
326 const struct GNUNET_CRYPTO_EccPrivateKey *zone, 326 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
327 const char *label, 327 const char *label,
328 unsigned int rd_count, 328 unsigned int rd_count,
329 const struct GNUNET_NAMESTORE_RecordData *rd) 329 const struct GNUNET_NAMESTORE_RecordData *rd)
@@ -357,14 +357,14 @@ empty_zone_proc (void *cls,
357 GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, 357 GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR,
358 "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); 358 "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey");
359 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); 359 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file);
360 privkey = GNUNET_CRYPTO_ecc_key_create_from_file(hostkey_file); 360 privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file);
361 GNUNET_free (hostkey_file); 361 GNUNET_free (hostkey_file);
362 GNUNET_assert (privkey != NULL); 362 GNUNET_assert (privkey != NULL);
363 363
364 GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, 364 GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR,
365 "HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey"); 365 "HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey");
366 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); 366 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file);
367 privkey2 = GNUNET_CRYPTO_ecc_key_create_from_file(hostkey_file); 367 privkey2 = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file);
368 GNUNET_free (hostkey_file); 368 GNUNET_free (hostkey_file);
369 GNUNET_assert (privkey2 != NULL); 369 GNUNET_assert (privkey2 != NULL);
370 370
diff --git a/src/namestore/test_namestore_api_zone_iteration_stop.c b/src/namestore/test_namestore_api_zone_iteration_stop.c
index ebc26db79..e56559f96 100644
--- a/src/namestore/test_namestore_api_zone_iteration_stop.c
+++ b/src/namestore/test_namestore_api_zone_iteration_stop.c
@@ -34,9 +34,9 @@ static struct GNUNET_NAMESTORE_Handle * nsh;
34 34
35static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; 35static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
36 36
37static struct GNUNET_CRYPTO_EccPrivateKey * privkey; 37static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey;
38 38
39static struct GNUNET_CRYPTO_EccPrivateKey * privkey2; 39static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey2;
40 40
41static struct GNUNET_NAMESTORE_ZoneIterator *zi; 41static struct GNUNET_NAMESTORE_ZoneIterator *zi;
42 42
@@ -156,7 +156,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
156 156
157static void 157static void
158zone_proc (void *cls, 158zone_proc (void *cls,
159 const struct GNUNET_CRYPTO_EccPrivateKey *zone, 159 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
160 const char *label, 160 const char *label,
161 unsigned int rd_count, 161 unsigned int rd_count,
162 const struct GNUNET_NAMESTORE_RecordData *rd) 162 const struct GNUNET_NAMESTORE_RecordData *rd)
@@ -178,7 +178,7 @@ zone_proc (void *cls,
178 } 178 }
179 else 179 else
180 { 180 {
181 if (0 == memcmp (zone, privkey, sizeof (struct GNUNET_CRYPTO_EccPrivateKey))) 181 if (0 == memcmp (zone, privkey, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
182 { 182 {
183 if (0 == strcmp (label, s_name_1)) 183 if (0 == strcmp (label, s_name_1))
184 { 184 {
@@ -222,7 +222,7 @@ zone_proc (void *cls,
222 GNUNET_break (0); 222 GNUNET_break (0);
223 } 223 }
224 } 224 }
225 else if (0 == memcmp (zone, privkey2, sizeof (struct GNUNET_CRYPTO_EccPrivateKey))) 225 else if (0 == memcmp (zone, privkey2, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
226 { 226 {
227 if (0 == strcmp (label, s_name_3)) 227 if (0 == strcmp (label, s_name_3))
228 { 228 {
@@ -357,7 +357,7 @@ create_record (unsigned int count)
357 */ 357 */
358static void 358static void
359empty_zone_proc (void *cls, 359empty_zone_proc (void *cls,
360 const struct GNUNET_CRYPTO_EccPrivateKey *zone, 360 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
361 const char *label, 361 const char *label,
362 unsigned int rd_count, 362 unsigned int rd_count,
363 const struct GNUNET_NAMESTORE_RecordData *rd) 363 const struct GNUNET_NAMESTORE_RecordData *rd)
@@ -391,14 +391,14 @@ empty_zone_proc (void *cls,
391 GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, 391 GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR,
392 "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); 392 "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey");
393 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); 393 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file);
394 privkey = GNUNET_CRYPTO_ecc_key_create_from_file(hostkey_file); 394 privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file);
395 GNUNET_free (hostkey_file); 395 GNUNET_free (hostkey_file);
396 GNUNET_assert (privkey != NULL); 396 GNUNET_assert (privkey != NULL);
397 397
398 GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, 398 GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR,
399 "HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey"); 399 "HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey");
400 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); 400 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file);
401 privkey2 = GNUNET_CRYPTO_ecc_key_create_from_file(hostkey_file); 401 privkey2 = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file);
402 GNUNET_free (hostkey_file); 402 GNUNET_free (hostkey_file);
403 GNUNET_assert (privkey2 != NULL); 403 GNUNET_assert (privkey2 != NULL);
404 404
diff --git a/src/namestore/test_namestore_api_zone_to_name.c b/src/namestore/test_namestore_api_zone_to_name.c
index 1eeed1001..973cc18a0 100644
--- a/src/namestore/test_namestore_api_zone_to_name.c
+++ b/src/namestore/test_namestore_api_zone_to_name.c
@@ -41,9 +41,9 @@ static struct GNUNET_NAMESTORE_Handle * nsh;
41 41
42static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; 42static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
43 43
44static struct GNUNET_CRYPTO_EccPrivateKey * privkey; 44static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey;
45 45
46static struct GNUNET_CRYPTO_EccPublicSignKey pubkey; 46static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey;
47 47
48static struct GNUNET_TIME_Absolute expire; 48static struct GNUNET_TIME_Absolute expire;
49 49
@@ -53,7 +53,7 @@ static struct GNUNET_CRYPTO_ShortHashCode s_zone_value;
53 53
54static char * s_name; 54static char * s_name;
55 55
56static struct GNUNET_CRYPTO_EccSignature *s_signature; 56static struct GNUNET_CRYPTO_EcdsaSignature *s_signature;
57 57
58static int res; 58static int res;
59 59
@@ -96,12 +96,12 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
96 96
97static void 97static void
98zone_to_name_proc (void *cls, 98zone_to_name_proc (void *cls,
99 const struct GNUNET_CRYPTO_EccPublicSignKey *zone_key, 99 const struct GNUNET_CRYPTO_EcdsaPublicKey *zone_key,
100 struct GNUNET_TIME_Absolute expire, 100 struct GNUNET_TIME_Absolute expire,
101 const char *n, 101 const char *n,
102 unsigned int rd_count, 102 unsigned int rd_count,
103 const struct GNUNET_NAMESTORE_RecordData *rd, 103 const struct GNUNET_NAMESTORE_RecordData *rd,
104 const struct GNUNET_CRYPTO_EccSignature *signature) 104 const struct GNUNET_CRYPTO_EcdsaSignature *signature)
105{ 105{
106 int fail = GNUNET_NO; 106 int fail = GNUNET_NO;
107 107
@@ -123,7 +123,7 @@ zone_to_name_proc (void *cls,
123 fail = GNUNET_YES; 123 fail = GNUNET_YES;
124 GNUNET_break (0); 124 GNUNET_break (0);
125 } 125 }
126 if ((zone_key == NULL) || (0 != memcmp (zone_key, &pubkey, sizeof (struct GNUNET_CRYPTO_EccPublicSignKey)))) 126 if ((zone_key == NULL) || (0 != memcmp (zone_key, &pubkey, sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey))))
127 { 127 {
128 fail = GNUNET_YES; 128 fail = GNUNET_YES;
129 GNUNET_break (0); 129 GNUNET_break (0);
@@ -173,14 +173,14 @@ run (void *cls,
173 GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, 173 GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR,
174 "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); 174 "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey");
175 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); 175 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file);
176 privkey = GNUNET_CRYPTO_ecc_key_create_from_file(hostkey_file); 176 privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file);
177 GNUNET_free (hostkey_file); 177 GNUNET_free (hostkey_file);
178 GNUNET_assert (privkey != NULL); 178 GNUNET_assert (privkey != NULL);
179 /* get public key */ 179 /* get public key */
180 GNUNET_CRYPTO_ecc_key_get_public_for_signature(privkey, &pubkey); 180 GNUNET_CRYPTO_ecdsa_key_get_public(privkey, &pubkey);
181 181
182 /* zone hash */ 182 /* zone hash */
183 GNUNET_CRYPTO_short_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_EccPublicSignKey), &s_zone); 183 GNUNET_CRYPTO_short_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey), &s_zone);
184 GNUNET_CRYPTO_short_hash (s_name, strlen (s_name) + 1, &s_zone_value); 184 GNUNET_CRYPTO_short_hash (s_name, strlen (s_name) + 1, &s_zone_value);
185 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using PKEY `%s' \n", GNUNET_NAMESTORE_short_h2s (&s_zone_value)); 185 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using PKEY `%s' \n", GNUNET_NAMESTORE_short_h2s (&s_zone_value));
186 186
diff --git a/src/namestore/test_plugin_namestore.c b/src/namestore/test_plugin_namestore.c
index 5274e8bca..7e77f4317 100644
--- a/src/namestore/test_plugin_namestore.c
+++ b/src/namestore/test_plugin_namestore.c
@@ -81,14 +81,14 @@ load_plugin (const struct GNUNET_CONFIGURATION_Handle *cfg)
81 81
82static void 82static void
83test_record (void *cls, 83test_record (void *cls,
84 const struct GNUNET_CRYPTO_EccPrivateKey *private_key, 84 const struct GNUNET_CRYPTO_EcdsaPrivateKey *private_key,
85 const char *label, 85 const char *label,
86 unsigned int rd_count, 86 unsigned int rd_count,
87 const struct GNUNET_NAMESTORE_RecordData *rd) 87 const struct GNUNET_NAMESTORE_RecordData *rd)
88{ 88{
89 int *idp = cls; 89 int *idp = cls;
90 int id = *idp; 90 int id = *idp;
91 struct GNUNET_CRYPTO_EccPrivateKey tzone_private_key; 91 struct GNUNET_CRYPTO_EcdsaPrivateKey tzone_private_key;
92 char tname[64]; 92 char tname[64];
93 unsigned int trd_count = 1 + (id % 1024); 93 unsigned int trd_count = 1 + (id % 1024);
94 unsigned int i; 94 unsigned int i;
@@ -104,7 +104,7 @@ test_record (void *cls,
104 } 104 }
105 memset (&tzone_private_key, (id % 241), sizeof (tzone_private_key)); 105 memset (&tzone_private_key, (id % 241), sizeof (tzone_private_key));
106 GNUNET_assert (0 == strcmp (label, tname)); 106 GNUNET_assert (0 == strcmp (label, tname));
107 GNUNET_assert (0 == memcmp (&tzone_private_key, private_key, sizeof (struct GNUNET_CRYPTO_EccPrivateKey))); 107 GNUNET_assert (0 == memcmp (&tzone_private_key, private_key, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)));
108} 108}
109 109
110 110
@@ -119,11 +119,11 @@ get_record (struct GNUNET_NAMESTORE_PluginFunctions *nsp, int id)
119static void 119static void
120put_record (struct GNUNET_NAMESTORE_PluginFunctions *nsp, int id) 120put_record (struct GNUNET_NAMESTORE_PluginFunctions *nsp, int id)
121{ 121{
122 struct GNUNET_CRYPTO_EccPrivateKey zone_private_key; 122 struct GNUNET_CRYPTO_EcdsaPrivateKey zone_private_key;
123 char label[64]; 123 char label[64];
124 unsigned int rd_count = 1 + (id % 1024); 124 unsigned int rd_count = 1 + (id % 1024);
125 struct GNUNET_NAMESTORE_RecordData rd[rd_count]; 125 struct GNUNET_NAMESTORE_RecordData rd[rd_count];
126 struct GNUNET_CRYPTO_EccSignature signature; 126 struct GNUNET_CRYPTO_EcdsaSignature signature;
127 unsigned int i; 127 unsigned int i;
128 128
129 GNUNET_snprintf (label, sizeof (label), 129 GNUNET_snprintf (label, sizeof (label),
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-26 15:39:33 +0000