diff options
Diffstat (limited to 'src/namestore/gnunet-namestore-fcfsd.c')
-rw-r--r-- | src/namestore/gnunet-namestore-fcfsd.c | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/namestore/gnunet-namestore-fcfsd.c b/src/namestore/gnunet-namestore-fcfsd.c index 34641d22e..844f4a990 100644 --- a/src/namestore/gnunet-namestore-fcfsd.c +++ b/src/namestore/gnunet-namestore-fcfsd.c | |||
@@ -164,7 +164,7 @@ struct Request | |||
164 | */ | 164 | */ |
165 | char public_key[128]; | 165 | char public_key[128]; |
166 | 166 | ||
167 | struct GNUNET_CRYPTO_EcdsaPublicKey pub; | 167 | struct GNUNET_IDENTITY_PublicKey pub; |
168 | }; | 168 | }; |
169 | 169 | ||
170 | /** | 170 | /** |
@@ -211,7 +211,7 @@ static struct GNUNET_NAMESTORE_Handle *ns; | |||
211 | /** | 211 | /** |
212 | * Private key for the fcfsd zone. | 212 | * Private key for the fcfsd zone. |
213 | */ | 213 | */ |
214 | static struct GNUNET_CRYPTO_EcdsaPrivateKey fcfs_zone_pkey; | 214 | static struct GNUNET_IDENTITY_PrivateKey fcfs_zone_pkey; |
215 | 215 | ||
216 | /** | 216 | /** |
217 | * Connection to identity service. | 217 | * Connection to identity service. |
@@ -306,7 +306,6 @@ zone_iteration_end (void *cls) | |||
306 | /* return static form */ | 306 | /* return static form */ |
307 | GNUNET_asprintf (&full_page, | 307 | GNUNET_asprintf (&full_page, |
308 | ZONEINFO_PAGE, | 308 | ZONEINFO_PAGE, |
309 | zr->zoneinfo, | ||
310 | zr->zoneinfo); | 309 | zr->zoneinfo); |
311 | response = MHD_create_response_from_buffer (strlen (full_page), | 310 | response = MHD_create_response_from_buffer (strlen (full_page), |
312 | (void *) full_page, | 311 | (void *) full_page, |
@@ -332,7 +331,7 @@ zone_iteration_end (void *cls) | |||
332 | */ | 331 | */ |
333 | static void | 332 | static void |
334 | iterate_cb (void *cls, | 333 | iterate_cb (void *cls, |
335 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key, | 334 | const struct GNUNET_IDENTITY_PrivateKey *zone_key, |
336 | const char *name, | 335 | const char *name, |
337 | unsigned int rd_len, | 336 | unsigned int rd_len, |
338 | const struct GNUNET_GNSRECORD_Data *rd) | 337 | const struct GNUNET_GNSRECORD_Data *rd) |
@@ -615,7 +614,7 @@ zone_to_name_error (void *cls) | |||
615 | */ | 614 | */ |
616 | static void | 615 | static void |
617 | zone_to_name_cb (void *cls, | 616 | zone_to_name_cb (void *cls, |
618 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key, | 617 | const struct GNUNET_IDENTITY_PrivateKey *zone_key, |
619 | const char *name, | 618 | const char *name, |
620 | unsigned int rd_count, | 619 | unsigned int rd_count, |
621 | const struct GNUNET_GNSRECORD_Data *rd) | 620 | const struct GNUNET_GNSRECORD_Data *rd) |
@@ -677,7 +676,7 @@ lookup_it_error (void *cls) | |||
677 | */ | 676 | */ |
678 | static void | 677 | static void |
679 | lookup_it_processor (void *cls, | 678 | lookup_it_processor (void *cls, |
680 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zonekey, | 679 | const struct GNUNET_IDENTITY_PrivateKey *zonekey, |
681 | const char *label, | 680 | const char *label, |
682 | unsigned int rd_count, | 681 | unsigned int rd_count, |
683 | const struct GNUNET_GNSRECORD_Data *rd) | 682 | const struct GNUNET_GNSRECORD_Data *rd) |
@@ -712,9 +711,8 @@ lookup_it_finished (void *cls) | |||
712 | return; | 711 | return; |
713 | } | 712 | } |
714 | if (GNUNET_OK != | 713 | if (GNUNET_OK != |
715 | GNUNET_CRYPTO_ecdsa_public_key_from_string (request->public_key, | 714 | GNUNET_IDENTITY_public_key_from_string (request->public_key, |
716 | strlen (request->public_key), | 715 | &request->pub)) |
717 | &request->pub)) | ||
718 | { | 716 | { |
719 | GNUNET_break (0); | 717 | GNUNET_break (0); |
720 | request->phase = RP_FAIL; | 718 | request->phase = RP_FAIL; |
@@ -767,7 +765,7 @@ create_response (void *cls, | |||
767 | { | 765 | { |
768 | struct MHD_Response *response; | 766 | struct MHD_Response *response; |
769 | struct Request *request; | 767 | struct Request *request; |
770 | struct GNUNET_CRYPTO_EcdsaPublicKey pub; | 768 | struct GNUNET_IDENTITY_PublicKey pub; |
771 | MHD_RESULT ret; | 769 | MHD_RESULT ret; |
772 | 770 | ||
773 | (void) cls; | 771 | (void) cls; |
@@ -822,10 +820,8 @@ create_response (void *cls, | |||
822 | request->pp = NULL; | 820 | request->pp = NULL; |
823 | } | 821 | } |
824 | if (GNUNET_OK != | 822 | if (GNUNET_OK != |
825 | GNUNET_CRYPTO_ecdsa_public_key_from_string (request->public_key, | 823 | GNUNET_IDENTITY_public_key_from_string (request->public_key, |
826 | strlen ( | 824 | &pub)) |
827 | request->public_key), | ||
828 | &pub)) | ||
829 | { | 825 | { |
830 | /* parse error */ | 826 | /* parse error */ |
831 | return fill_s_reply ("Failed to parse given public key", | 827 | return fill_s_reply ("Failed to parse given public key", |
@@ -1211,7 +1207,8 @@ main (int argc, | |||
1211 | options, | 1207 | options, |
1212 | &run, NULL)) ? 0 : 1; | 1208 | &run, NULL)) ? 0 : 1; |
1213 | GNUNET_free_nz ((void *) argv); | 1209 | GNUNET_free_nz ((void *) argv); |
1214 | GNUNET_CRYPTO_ecdsa_key_clear (&fcfs_zone_pkey); | 1210 | // FIXME |
1211 | // GNUNET_CRYPTO_ecdsa_key_clear (&fcfs_zone_pkey); | ||
1215 | return ret; | 1212 | return ret; |
1216 | } | 1213 | } |
1217 | 1214 | ||