aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-10-10 14:41:41 +0000
committerChristian Grothoff <christian@grothoff.org>2013-10-10 14:41:41 +0000
commit413036c2b5e3778a7da9d0486a70259f90354368 (patch)
treee71a87bcd7842c32e04637e762a859c88c3dc172
parentc74707459bc24b35dd4d70ff8fe3d1321d151689 (diff)
downloadgnunet-gtk-413036c2b5e3778a7da9d0486a70259f90354368.tar.gz
gnunet-gtk-413036c2b5e3778a7da9d0486a70259f90354368.zip
separating ECC crypto into functions/structs for ECDHE, ECDSA and EDDSA
-rw-r--r--contrib/gnunet_identity_gtk_about_window.glade2
-rw-r--r--src/fs/gnunet-fs-gtk.c4
-rw-r--r--src/fs/gnunet-fs-gtk.h4
-rw-r--r--src/fs/gnunet-fs-gtk_common.c2
-rw-r--r--src/fs/gnunet-fs-gtk_main-window-search.c12
-rw-r--r--src/fs/gnunet-fs-gtk_publish-dialog.c2
-rw-r--r--src/identity/gnunet-identity-gtk.c6
-rw-r--r--src/identity/gnunet-identity-gtk_advertise.c8
-rw-r--r--src/identity/gnunet-identity-gtk_advertise.h2
-rw-r--r--src/namestore/gnunet-namestore-gtk.c18
-rw-r--r--src/namestore/gnunet-namestore-gtk_edit.c8
11 files changed, 34 insertions, 34 deletions
diff --git a/contrib/gnunet_identity_gtk_about_window.glade b/contrib/gnunet_identity_gtk_about_window.glade
index 097e8709..a75a926a 100644
--- a/contrib/gnunet_identity_gtk_about_window.glade
+++ b/contrib/gnunet_identity_gtk_about_window.glade
@@ -91,7 +91,7 @@ Daniel Nylander &lt;po@danielnylander.se&gt;</property>
91 <object class="GtkLabel" id="about_name_version_label"> 91 <object class="GtkLabel" id="about_name_version_label">
92 <property name="visible">True</property> 92 <property name="visible">True</property>
93 <property name="can_focus">False</property> 93 <property name="can_focus">False</property>
94 <property name="label">GNUnet-Peerinfo-GTK 0.9.3</property> 94 <property name="label">GNUnet-Peerinfo-GTK 0.9.5</property>
95 <attributes> 95 <attributes>
96 <attribute name="weight" value="bold"/> 96 <attribute name="weight" value="bold"/>
97 <attribute name="size" value="200"/> 97 <attribute name="size" value="200"/>
diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index 63e9f00f..21e03743 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -565,7 +565,7 @@ service_status_change (void *cls,
565 */ 565 */
566static void 566static void
567monitor_zone_records (void *cls, 567monitor_zone_records (void *cls,
568 const struct GNUNET_CRYPTO_EccPrivateKey *zone, 568 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
569 const char *label, 569 const char *label,
570 unsigned int rd_count, 570 unsigned int rd_count,
571 const struct GNUNET_NAMESTORE_RecordData *rd) 571 const struct GNUNET_NAMESTORE_RecordData *rd)
@@ -642,7 +642,7 @@ handle_sks_zone_identity (void *cls,
642 _("No default ego specified for `fs-sks` service, will not enable namespace search.\n")); 642 _("No default ego specified for `fs-sks` service, will not enable namespace search.\n"));
643 return; 643 return;
644 } 644 }
645 main_context.sks_zone = GNUNET_new (struct GNUNET_CRYPTO_EccPrivateKey); 645 main_context.sks_zone = GNUNET_new (struct GNUNET_CRYPTO_EcdsaPrivateKey);
646 *main_context.sks_zone = *GNUNET_IDENTITY_ego_get_private_key (ego); 646 *main_context.sks_zone = *GNUNET_IDENTITY_ego_get_private_key (ego);
647 gtk_widget_show (GTK_WIDGET (GNUNET_FS_GTK_get_main_window_object ("main_window_search_namespace_label"))); 647 gtk_widget_show (GTK_WIDGET (GNUNET_FS_GTK_get_main_window_object ("main_window_search_namespace_label")));
648 gtk_widget_show (GTK_WIDGET (GNUNET_FS_GTK_get_main_window_object ("main_window_search_namespace_combobox"))); 648 gtk_widget_show (GTK_WIDGET (GNUNET_FS_GTK_get_main_window_object ("main_window_search_namespace_combobox")));
diff --git a/src/fs/gnunet-fs-gtk.h b/src/fs/gnunet-fs-gtk.h
index 295a513e..3dab8bcf 100644
--- a/src/fs/gnunet-fs-gtk.h
+++ b/src/fs/gnunet-fs-gtk.h
@@ -132,7 +132,7 @@ struct PseuLookupContext
132 /** 132 /**
133 * Public key of the namespace we are trying to save. 133 * Public key of the namespace we are trying to save.
134 */ 134 */
135 struct GNUNET_CRYPTO_EccPublicSignKey pkey; 135 struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
136 136
137 /** 137 /**
138 * Nickname we're saving under. 138 * Nickname we're saving under.
@@ -253,7 +253,7 @@ struct GNUNET_GTK_MainWindowContext
253 /** 253 /**
254 * Our zone for SKS operations. Can be NULL. 254 * Our zone for SKS operations. Can be NULL.
255 */ 255 */
256 struct GNUNET_CRYPTO_EccPrivateKey *sks_zone; 256 struct GNUNET_CRYPTO_EcdsaPrivateKey *sks_zone;
257 257
258}; 258};
259 259
diff --git a/src/fs/gnunet-fs-gtk_common.c b/src/fs/gnunet-fs-gtk_common.c
index a35e3d1e..c7cfa663 100644
--- a/src/fs/gnunet-fs-gtk_common.c
+++ b/src/fs/gnunet-fs-gtk_common.c
@@ -276,7 +276,7 @@ GNUNET_FS_GTK_handle_uri (const struct GNUNET_FS_Uri *uri,
276 GtkEntry *query_entry; 276 GtkEntry *query_entry;
277 GtkComboBox *ns_cb; 277 GtkComboBox *ns_cb;
278 GtkEntry *ns_entry; 278 GtkEntry *ns_entry;
279 struct GNUNET_CRYPTO_EccPublicSignKey want; 279 struct GNUNET_CRYPTO_EcdsaPublicKey want;
280 280
281 281
282 if (GNUNET_FS_uri_test_chk (uri) || GNUNET_FS_uri_test_loc (uri)) 282 if (GNUNET_FS_uri_test_chk (uri) || GNUNET_FS_uri_test_loc (uri))
diff --git a/src/fs/gnunet-fs-gtk_main-window-search.c b/src/fs/gnunet-fs-gtk_main-window-search.c
index 11bacee2..6c5cd8f4 100644
--- a/src/fs/gnunet-fs-gtk_main-window-search.c
+++ b/src/fs/gnunet-fs-gtk_main-window-search.c
@@ -120,7 +120,7 @@ handle_gns_result (void *cls,
120 { 120 {
121 if (GNUNET_NAMESTORE_TYPE_PKEY != rd[i].record_type) 121 if (GNUNET_NAMESTORE_TYPE_PKEY != rd[i].record_type)
122 continue; 122 continue;
123 if (sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) != rd[i].data_size) 123 if (sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) != rd[i].data_size)
124 { 124 {
125 GNUNET_break_op (0); 125 GNUNET_break_op (0);
126 continue; 126 continue;
@@ -149,7 +149,7 @@ start_search (struct GNUNET_GTK_MainWindowContext *main_ctx)
149 gchar *mime_keyword; 149 gchar *mime_keyword;
150 const char *nsid; 150 const char *nsid;
151 struct GNUNET_FS_Uri *uri; 151 struct GNUNET_FS_Uri *uri;
152 struct GNUNET_CRYPTO_EccPublicSignKey pub_sks_zone; 152 struct GNUNET_CRYPTO_EcdsaPublicKey pub_sks_zone;
153 struct SearchLookup *sl; 153 struct SearchLookup *sl;
154 char *emsg; 154 char *emsg;
155 155
@@ -224,7 +224,7 @@ start_search (struct GNUNET_GTK_MainWindowContext *main_ctx)
224 sl->anonymity_level = anonymity_level; 224 sl->anonymity_level = anonymity_level;
225 sl->timeout_task = GNUNET_SCHEDULER_add_delayed (LOOKUP_TIMEOUT, 225 sl->timeout_task = GNUNET_SCHEDULER_add_delayed (LOOKUP_TIMEOUT,
226 &timeout_search_lookup, sl); 226 &timeout_search_lookup, sl);
227 GNUNET_CRYPTO_ecc_key_get_public_for_signature (main_ctx->sks_zone, 227 GNUNET_CRYPTO_ecdsa_key_get_public (main_ctx->sks_zone,
228 &pub_sks_zone); 228 &pub_sks_zone);
229 sl->gns = GNUNET_GNS_lookup (main_ctx->gns, 229 sl->gns = GNUNET_GNS_lookup (main_ctx->gns,
230 nsid, 230 nsid,
@@ -416,7 +416,7 @@ save_pseudonym_with_nick (struct PseuLookupContext *lctx,
416 /* show the window */ 416 /* show the window */
417 gtk_window_present (GTK_WINDOW (lctx->progress_dialog)); 417 gtk_window_present (GTK_WINDOW (lctx->progress_dialog));
418 memset (&rd, 0, sizeof (rd)); 418 memset (&rd, 0, sizeof (rd));
419 rd.data_size = sizeof (struct GNUNET_CRYPTO_EccPublicSignKey); 419 rd.data_size = sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey);
420 rd.data = &lctx->pkey; 420 rd.data = &lctx->pkey;
421 rd.flags = GNUNET_NAMESTORE_RF_PRIVATE; 421 rd.flags = GNUNET_NAMESTORE_RF_PRIVATE;
422 rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us; 422 rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
@@ -651,7 +651,7 @@ GNUNET_FS_GTK_save_button_clicked_cb (GtkButton * button,
651 struct GNUNET_GTK_MainWindowContext *main_ctx = user_data; 651 struct GNUNET_GTK_MainWindowContext *main_ctx = user_data;
652 GtkComboBox *widget; 652 GtkComboBox *widget;
653 const gchar *text; 653 const gchar *text;
654 struct GNUNET_CRYPTO_EccPublicSignKey pkey; 654 struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
655 int ret; 655 int ret;
656 struct PseuLookupContext *lctx; 656 struct PseuLookupContext *lctx;
657 guint anonymity_level; 657 guint anonymity_level;
@@ -727,7 +727,7 @@ main_window_search_namespace_combobox_changed_cb (GtkComboBox *widget,
727{ 727{
728 GtkButton *button; 728 GtkButton *button;
729 const gchar *text; 729 const gchar *text;
730 struct GNUNET_CRYPTO_EccPublicSignKey pkey; 730 struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
731 int ret; 731 int ret;
732 732
733 text = gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (widget)))); 733 text = gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (widget))));
diff --git a/src/fs/gnunet-fs-gtk_publish-dialog.c b/src/fs/gnunet-fs-gtk_publish-dialog.c
index f9994a1b..b658afbc 100644
--- a/src/fs/gnunet-fs-gtk_publish-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-dialog.c
@@ -2108,7 +2108,7 @@ insert_advertisement (void *cls, struct GNUNET_FS_FileInformation *fi,
2108 void **client_info) 2108 void **client_info)
2109{ 2109{
2110 struct MainPublishingDialogContext *ctx = cls; 2110 struct MainPublishingDialogContext *ctx = cls;
2111 struct GNUNET_CRYPTO_EccPublicSignKey pub; 2111 struct GNUNET_CRYPTO_EcdsaPublicKey pub;
2112 struct GNUNET_FS_Uri *sks_uri; 2112 struct GNUNET_FS_Uri *sks_uri;
2113 char *sks_uri_string; 2113 char *sks_uri_string;
2114 2114
diff --git a/src/identity/gnunet-identity-gtk.c b/src/identity/gnunet-identity-gtk.c
index f201c596..3c262784 100644
--- a/src/identity/gnunet-identity-gtk.c
+++ b/src/identity/gnunet-identity-gtk.c
@@ -177,7 +177,7 @@ advertise_ctx_menu (GtkMenuItem *item,
177 gpointer user_data) 177 gpointer user_data)
178{ 178{
179 struct AdvertisePopupContext *apc = user_data; 179 struct AdvertisePopupContext *apc = user_data;
180 const struct GNUNET_CRYPTO_EccPrivateKey *priv; 180 const struct GNUNET_CRYPTO_EcdsaPrivateKey *priv;
181 181
182 priv = GNUNET_IDENTITY_ego_get_private_key (apc->ego); 182 priv = GNUNET_IDENTITY_ego_get_private_key (apc->ego);
183 GIG_advertise_dialog_start_ (priv); 183 GIG_advertise_dialog_start_ (priv);
@@ -440,7 +440,7 @@ add_ego (void *cls,
440 GtkTreeRowReference *rr; 440 GtkTreeRowReference *rr;
441 GtkTreeIter iter; 441 GtkTreeIter iter;
442 char *id; 442 char *id;
443 struct GNUNET_CRYPTO_EccPublicSignKey pub; 443 struct GNUNET_CRYPTO_EcdsaPublicKey pub;
444 444
445 if (NULL == ego) 445 if (NULL == ego)
446 return; /* nothing to be done */ 446 return; /* nothing to be done */
@@ -450,7 +450,7 @@ add_ego (void *cls,
450 /* insert operation */ 450 /* insert operation */
451 GNUNET_assert (NULL != name); 451 GNUNET_assert (NULL != name);
452 GNUNET_IDENTITY_ego_get_public_key (ego, &pub); 452 GNUNET_IDENTITY_ego_get_public_key (ego, &pub);
453 id = GNUNET_CRYPTO_ecc_public_sign_key_to_string (&pub); 453 id = GNUNET_CRYPTO_ecdsa_public_key_to_string (&pub);
454 gtk_list_store_insert_with_values (ls, 454 gtk_list_store_insert_with_values (ls,
455 &iter, G_MAXINT, 455 &iter, G_MAXINT,
456 IDENTITY_MC_NAME, name, 456 IDENTITY_MC_NAME, name,
diff --git a/src/identity/gnunet-identity-gtk_advertise.c b/src/identity/gnunet-identity-gtk_advertise.c
index 60f8e8ea..9df46929 100644
--- a/src/identity/gnunet-identity-gtk_advertise.c
+++ b/src/identity/gnunet-identity-gtk_advertise.c
@@ -119,7 +119,7 @@ struct AdvertiseContext
119 /** 119 /**
120 * Private key of the namespace we will be advertising. 120 * Private key of the namespace we will be advertising.
121 */ 121 */
122 struct GNUNET_CRYPTO_EccPrivateKey priv; 122 struct GNUNET_CRYPTO_EcdsaPrivateKey priv;
123 123
124 /** 124 /**
125 * Main dialog object. 125 * Main dialog object.
@@ -285,7 +285,7 @@ GNUNET_GTK_identity_advertise_dialog_response_cb (GtkDialog *dialog,
285 gchar *value; 285 gchar *value;
286 GtkTreeIter iter; 286 GtkTreeIter iter;
287 struct GNUNET_FS_BlockOptions bo; 287 struct GNUNET_FS_BlockOptions bo;
288 struct GNUNET_CRYPTO_EccPublicSignKey pk; 288 struct GNUNET_CRYPTO_EcdsaPublicKey pk;
289 struct PublishContext *pc; 289 struct PublishContext *pc;
290 guint anonymity; 290 guint anonymity;
291 const char *id; 291 const char *id;
@@ -356,7 +356,7 @@ GNUNET_GTK_identity_advertise_dialog_response_cb (GtkDialog *dialog,
356 (gtk_builder_get_object 356 (gtk_builder_get_object
357 (ac->builder, 357 (ac->builder,
358 "GNUNET_GTK_identity_advertise_replication_spin_button"))); 358 "GNUNET_GTK_identity_advertise_replication_spin_button")));
359 GNUNET_CRYPTO_ecc_key_get_public_for_signature (&ac->priv, 359 GNUNET_CRYPTO_ecdsa_key_get_public (&ac->priv,
360 &pk); 360 &pk);
361 id = gtk_entry_get_text 361 id = gtk_entry_get_text
362 (GTK_ENTRY 362 (GTK_ENTRY
@@ -631,7 +631,7 @@ GNUNET_GTK_identity_advertise_metadata_add_button_clicked_cb (GtkButton * button
631 * @param priv private key of the namespace to advertise 631 * @param priv private key of the namespace to advertise
632 */ 632 */
633void 633void
634GIG_advertise_dialog_start_ (const struct GNUNET_CRYPTO_EccPrivateKey *priv) 634GIG_advertise_dialog_start_ (const struct GNUNET_CRYPTO_EcdsaPrivateKey *priv)
635{ 635{
636 struct AdvertiseContext *ac; 636 struct AdvertiseContext *ac;
637 gint i; 637 gint i;
diff --git a/src/identity/gnunet-identity-gtk_advertise.h b/src/identity/gnunet-identity-gtk_advertise.h
index 5a9dd794..ae12b17f 100644
--- a/src/identity/gnunet-identity-gtk_advertise.h
+++ b/src/identity/gnunet-identity-gtk_advertise.h
@@ -43,7 +43,7 @@ GIG_advertise_shutdown_ (void);
43 * @param priv private key of the namespace to advertise 43 * @param priv private key of the namespace to advertise
44 */ 44 */
45void 45void
46GIG_advertise_dialog_start_ (const struct GNUNET_CRYPTO_EccPrivateKey *priv); 46GIG_advertise_dialog_start_ (const struct GNUNET_CRYPTO_EcdsaPrivateKey *priv);
47 47
48#endif 48#endif
49/* GNUNET_FS_GTK_NAMESPACE_MANAGER_H */ 49/* GNUNET_FS_GTK_NAMESPACE_MANAGER_H */
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 */
343static struct GNUNET_CRYPTO_EccPrivateKey *pkey; 343static 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 */
348static struct GNUNET_CRYPTO_EccPublicSignKey pubkey; 348static 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 */
1733static void 1733static void
1734zone_iteration_proc (void *cls, 1734zone_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")),
diff --git a/src/namestore/gnunet-namestore-gtk_edit.c b/src/namestore/gnunet-namestore-gtk_edit.c
index fc6dbca9..ebe42915 100644
--- a/src/namestore/gnunet-namestore-gtk_edit.c
+++ b/src/namestore/gnunet-namestore-gtk_edit.c
@@ -1118,14 +1118,14 @@ edit_dialog_phone_validity_check (struct EditDialogContext *edc)
1118{ 1118{
1119 GtkEditable *entry; 1119 GtkEditable *entry;
1120 const gchar *preedit; 1120 const gchar *preedit;
1121 struct GNUNET_CRYPTO_EccPublicSignKey pub; 1121 struct GNUNET_CRYPTO_EcdsaPublicKey pub;
1122 1122
1123 entry = GTK_EDITABLE (gtk_builder_get_object (edc->builder, 1123 entry = GTK_EDITABLE (gtk_builder_get_object (edc->builder,
1124 "edit_dialog_phone_peer_entry")), 1124 "edit_dialog_phone_peer_entry")),
1125 preedit = gtk_editable_get_chars (entry, 0, -1); 1125 preedit = gtk_editable_get_chars (entry, 0, -1);
1126 if ( (NULL == preedit) || 1126 if ( (NULL == preedit) ||
1127 (GNUNET_OK != 1127 (GNUNET_OK !=
1128 GNUNET_CRYPTO_ecc_public_sign_key_from_string (preedit, 1128 GNUNET_CRYPTO_ecdsa_public_key_from_string (preedit,
1129 strlen (preedit), 1129 strlen (preedit),
1130 &pub)) ) 1130 &pub)) )
1131 { 1131 {
@@ -1261,14 +1261,14 @@ edit_dialog_pkey_validity_check (struct EditDialogContext *edc)
1261{ 1261{
1262 GtkEditable *entry; 1262 GtkEditable *entry;
1263 const gchar *preedit; 1263 const gchar *preedit;
1264 struct GNUNET_CRYPTO_EccPublicSignKey pub; 1264 struct GNUNET_CRYPTO_EcdsaPublicKey pub;
1265 1265
1266 entry = GTK_EDITABLE (gtk_builder_get_object (edc->builder, 1266 entry = GTK_EDITABLE (gtk_builder_get_object (edc->builder,
1267 "edit_dialog_pkey_entry")), 1267 "edit_dialog_pkey_entry")),
1268 preedit = gtk_editable_get_chars (entry, 0, -1); 1268 preedit = gtk_editable_get_chars (entry, 0, -1);
1269 if ( (NULL == preedit) || 1269 if ( (NULL == preedit) ||
1270 (GNUNET_OK != 1270 (GNUNET_OK !=
1271 GNUNET_CRYPTO_ecc_public_sign_key_from_string (preedit, 1271 GNUNET_CRYPTO_ecdsa_public_key_from_string (preedit,
1272 strlen (preedit), 1272 strlen (preedit),
1273 &pub)) ) 1273 &pub)) )
1274 { 1274 {