aboutsummaryrefslogtreecommitdiff
path: root/src/setup
diff options
context:
space:
mode:
Diffstat (limited to 'src/setup')
-rw-r--r--src/setup/gnunet-setup-gns-edit.c4
-rw-r--r--src/setup/gnunet-setup-gns.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/src/setup/gnunet-setup-gns-edit.c b/src/setup/gnunet-setup-gns-edit.c
index 8bb79b21..eb7f821b 100644
--- a/src/setup/gnunet-setup-gns-edit.c
+++ b/src/setup/gnunet-setup-gns-edit.c
@@ -1120,14 +1120,14 @@ edit_dialog_pkey_validity_check (struct EditDialogContext *edc)
1120{ 1120{
1121 GtkEditable *entry; 1121 GtkEditable *entry;
1122 const gchar *preedit; 1122 const gchar *preedit;
1123 struct GNUNET_CRYPTO_EccPublicKey pub; 1123 struct GNUNET_CRYPTO_EccPublicSignKey pub;
1124 1124
1125 entry = GTK_EDITABLE (gtk_builder_get_object (edc->builder, 1125 entry = GTK_EDITABLE (gtk_builder_get_object (edc->builder,
1126 "edit_dialog_pkey_entry")), 1126 "edit_dialog_pkey_entry")),
1127 preedit = gtk_editable_get_chars (entry, 0, -1); 1127 preedit = gtk_editable_get_chars (entry, 0, -1);
1128 if ( (NULL == preedit) || 1128 if ( (NULL == preedit) ||
1129 (GNUNET_OK != 1129 (GNUNET_OK !=
1130 GNUNET_CRYPTO_ecc_public_key_from_string (preedit, 1130 GNUNET_CRYPTO_ecc_public_sign_key_from_string (preedit,
1131 strlen (preedit), 1131 strlen (preedit),
1132 &pub)) ) 1132 &pub)) )
1133 { 1133 {
diff --git a/src/setup/gnunet-setup-gns.c b/src/setup/gnunet-setup-gns.c
index ad028be1..7d62b2a6 100644
--- a/src/setup/gnunet-setup-gns.c
+++ b/src/setup/gnunet-setup-gns.c
@@ -346,7 +346,7 @@ static struct GNUNET_CRYPTO_EccPrivateKey *pkey;
346/** 346/**
347 * Public key of the zone we are currently editing. 347 * Public key of the zone we are currently editing.
348 */ 348 */
349static struct GNUNET_CRYPTO_EccPublicKey pubkey; 349static struct GNUNET_CRYPTO_EccPublicSignKey pubkey;
350 350
351/** 351/**
352 * Pseudonym of the current zone we are editing. 352 * Pseudonym of the current zone we are editing.
@@ -826,9 +826,9 @@ decrypt_block_for_merge (void *cls,
826 const struct GNUNET_NAMESTORE_Block *block) 826 const struct GNUNET_NAMESTORE_Block *block)
827{ 827{
828 struct MoveOperationContext *moc = cls; 828 struct MoveOperationContext *moc = cls;
829 struct GNUNET_CRYPTO_EccPublicKey pubkey; 829 struct GNUNET_CRYPTO_EccPublicSignKey pubkey;
830 830
831 GNUNET_CRYPTO_ecc_key_get_public (moc->pk, 831 GNUNET_CRYPTO_ecc_key_get_public_for_signature (moc->pk,
832 &pubkey); 832 &pubkey);
833 if (GNUNET_OK != 833 if (GNUNET_OK !=
834 GNUNET_NAMESTORE_block_decrypt (block, 834 GNUNET_NAMESTORE_block_decrypt (block,
@@ -1968,7 +1968,7 @@ identity_cb (void *cls,
1968 } 1968 }
1969 pkey = GNUNET_new (struct GNUNET_CRYPTO_EccPrivateKey); 1969 pkey = GNUNET_new (struct GNUNET_CRYPTO_EccPrivateKey);
1970 *pkey = *GNUNET_IDENTITY_ego_get_private_key (ego); 1970 *pkey = *GNUNET_IDENTITY_ego_get_private_key (ego);
1971 GNUNET_CRYPTO_ecc_key_get_public (pkey, &pubkey); 1971 GNUNET_CRYPTO_ecc_key_get_public_for_signature (pkey, &pubkey);
1972 label = g_markup_printf_escaped (_("<b>Editing zone %s</b>"), 1972 label = g_markup_printf_escaped (_("<b>Editing zone %s</b>"),
1973 GNUNET_NAMESTORE_z2s (&pubkey)); 1973 GNUNET_NAMESTORE_z2s (&pubkey));
1974 gtk_label_set_markup (GTK_LABEL (GNUNET_SETUP_get_object ("GNUNET_setup_gns_zone_label")), 1974 gtk_label_set_markup (GTK_LABEL (GNUNET_SETUP_get_object ("GNUNET_setup_gns_zone_label")),