diff options
Diffstat (limited to 'src/namestore/gnunet-namestore-gtk.c')
-rw-r--r-- | src/namestore/gnunet-namestore-gtk.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/namestore/gnunet-namestore-gtk.c b/src/namestore/gnunet-namestore-gtk.c index c01e95b4..b6b40191 100644 --- a/src/namestore/gnunet-namestore-gtk.c +++ b/src/namestore/gnunet-namestore-gtk.c | |||
@@ -234,7 +234,7 @@ struct MoveOperationContext | |||
234 | /** | 234 | /** |
235 | * Private key of target zone. | 235 | * Private key of target zone. |
236 | */ | 236 | */ |
237 | struct GNUNET_CRYPTO_EccPrivateKey pk; | 237 | struct GNUNET_CRYPTO_EcdsaPrivateKey pk; |
238 | 238 | ||
239 | /** | 239 | /** |
240 | * Data to free. | 240 | * Data to free. |
@@ -340,12 +340,12 @@ static GtkTreeView *tv; | |||
340 | /** | 340 | /** |
341 | * Private key of the zone we are currently editing. | 341 | * Private key of the zone we are currently editing. |
342 | */ | 342 | */ |
343 | static struct GNUNET_CRYPTO_EccPrivateKey *pkey; | 343 | static struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey; |
344 | 344 | ||
345 | /** | 345 | /** |
346 | * Public key of the zone we are currently editing. | 346 | * Public key of the zone we are currently editing. |
347 | */ | 347 | */ |
348 | static struct GNUNET_CRYPTO_EccPublicSignKey pubkey; | 348 | static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey; |
349 | 349 | ||
350 | /** | 350 | /** |
351 | * Pseudonym of the current zone we are editing. | 351 | * Pseudonym of the current zone we are editing. |
@@ -848,14 +848,14 @@ decrypt_block_for_merge (void *cls, | |||
848 | const struct GNUNET_NAMESTORE_Block *block) | 848 | const struct GNUNET_NAMESTORE_Block *block) |
849 | { | 849 | { |
850 | struct MoveOperationContext *moc = cls; | 850 | struct MoveOperationContext *moc = cls; |
851 | struct GNUNET_CRYPTO_EccPublicSignKey pubkey; | 851 | struct GNUNET_CRYPTO_EcdsaPublicKey pubkey; |
852 | 852 | ||
853 | if (NULL == block) | 853 | if (NULL == block) |
854 | { | 854 | { |
855 | merge_with_existing_records (moc, 0, NULL); | 855 | merge_with_existing_records (moc, 0, NULL); |
856 | return; | 856 | return; |
857 | } | 857 | } |
858 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (&moc->pk, | 858 | GNUNET_CRYPTO_ecdsa_key_get_public (&moc->pk, |
859 | &pubkey); | 859 | &pubkey); |
860 | if (GNUNET_OK != | 860 | if (GNUNET_OK != |
861 | GNUNET_NAMESTORE_block_decrypt (block, | 861 | GNUNET_NAMESTORE_block_decrypt (block, |
@@ -991,7 +991,7 @@ edit_dialog_continuation (struct EditDialogContext *edc, | |||
991 | } | 991 | } |
992 | else | 992 | else |
993 | { | 993 | { |
994 | const struct GNUNET_CRYPTO_EccPrivateKey *pk; | 994 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *pk; |
995 | struct MoveOperationContext *moc; | 995 | struct MoveOperationContext *moc; |
996 | struct GNUNET_HashCode query; | 996 | struct GNUNET_HashCode query; |
997 | 997 | ||
@@ -1732,7 +1732,7 @@ zone_sync_proc (void *cls) | |||
1732 | */ | 1732 | */ |
1733 | static void | 1733 | static void |
1734 | zone_iteration_proc (void *cls, | 1734 | zone_iteration_proc (void *cls, |
1735 | const struct GNUNET_CRYPTO_EccPrivateKey *zone_key, | 1735 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key, |
1736 | const char *name, | 1736 | const char *name, |
1737 | unsigned int rd_count, | 1737 | unsigned int rd_count, |
1738 | const struct GNUNET_NAMESTORE_RecordData *rd) | 1738 | const struct GNUNET_NAMESTORE_RecordData *rd) |
@@ -1955,9 +1955,9 @@ load_zone (const char *name, | |||
1955 | return; | 1955 | return; |
1956 | } | 1956 | } |
1957 | current_zone_option = GNUNET_strdup (name); | 1957 | current_zone_option = GNUNET_strdup (name); |
1958 | pkey = GNUNET_new (struct GNUNET_CRYPTO_EccPrivateKey); | 1958 | pkey = GNUNET_new (struct GNUNET_CRYPTO_EcdsaPrivateKey); |
1959 | *pkey = *GNUNET_IDENTITY_ego_get_private_key (ego); | 1959 | *pkey = *GNUNET_IDENTITY_ego_get_private_key (ego); |
1960 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (pkey, &pubkey); | 1960 | GNUNET_CRYPTO_ecdsa_key_get_public (pkey, &pubkey); |
1961 | label = g_markup_printf_escaped (_("<b>Editing zone %s</b>"), | 1961 | label = g_markup_printf_escaped (_("<b>Editing zone %s</b>"), |
1962 | GNUNET_NAMESTORE_z2s (&pubkey)); | 1962 | GNUNET_NAMESTORE_z2s (&pubkey)); |
1963 | gtk_label_set_markup (GTK_LABEL (get_object ("gnunet_namestore_gtk_zone_label")), | 1963 | gtk_label_set_markup (GTK_LABEL (get_object ("gnunet_namestore_gtk_zone_label")), |