diff options
author | Dennis Neufeld <dennis.neufeld@students.bfh.ch> | 2020-10-20 13:05:33 +0200 |
---|---|---|
committer | Dennis Neufeld <dennis.neufeld@students.bfh.ch> | 2020-10-20 13:05:33 +0200 |
commit | 62cfdab1c0e5849b2bf4ca3c3f05afe27a5cc9de (patch) | |
tree | 49c4a804f83ff279c23f3d83d005bbba9d0f8477 | |
parent | ddb4cc5434fa012b12863b7c0926e2fe95e35893 (diff) | |
download | gnunet-gtk-62cfdab1c0e5849b2bf4ca3c3f05afe27a5cc9de.tar.gz gnunet-gtk-62cfdab1c0e5849b2bf4ca3c3f05afe27a5cc9de.zip |
fix key usage
-rw-r--r-- | src/conversation/gnunet-conversation-gtk_contacts.c | 4 | ||||
-rw-r--r-- | src/conversation/gnunet-conversation-gtk_egos.c | 6 | ||||
-rw-r--r-- | src/conversation/gnunet-conversation-gtk_get_label.c | 4 | ||||
-rw-r--r-- | src/conversation/gnunet-conversation-gtk_import.c | 12 | ||||
-rw-r--r-- | src/conversation/gnunet-conversation-gtk_phone.c | 6 | ||||
-rw-r--r-- | src/fs/gnunet-fs-gtk.c | 4 | ||||
-rw-r--r-- | src/fs/gnunet-fs-gtk.h | 4 | ||||
-rw-r--r-- | src/fs/gnunet-fs-gtk_common.c | 2 | ||||
-rw-r--r-- | src/fs/gnunet-fs-gtk_main-window-search.c | 12 | ||||
-rw-r--r-- | src/fs/gnunet-fs-gtk_publish-dialog.c | 2 | ||||
-rw-r--r-- | src/namestore/gnunet-namestore-gtk.c | 27 | ||||
-rw-r--r-- | src/namestore/plugin_gtk_namestore_phone.c | 2 | ||||
-rw-r--r-- | src/namestore/plugin_gtk_namestore_pkey.c | 2 |
13 files changed, 46 insertions, 41 deletions
diff --git a/src/conversation/gnunet-conversation-gtk_contacts.c b/src/conversation/gnunet-conversation-gtk_contacts.c index 28951dcb..c823373d 100644 --- a/src/conversation/gnunet-conversation-gtk_contacts.c +++ b/src/conversation/gnunet-conversation-gtk_contacts.c | |||
@@ -156,7 +156,7 @@ gnunet_conversation_gtk_contact_list_treeview_row_activated_cb ( | |||
156 | */ | 156 | */ |
157 | static void | 157 | static void |
158 | display_record (void *cls, | 158 | display_record (void *cls, |
159 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key, | 159 | const struct GNUNET_IDENTITY_PrivateKey *zone_key, |
160 | const char *rname, | 160 | const char *rname, |
161 | unsigned int rd_len, | 161 | unsigned int rd_len, |
162 | const struct GNUNET_GNSRECORD_Data *rd) | 162 | const struct GNUNET_GNSRECORD_Data *rd) |
@@ -311,7 +311,7 @@ gnunet_conversation_gtk_contacts_zone_combobox_changed_cb (GtkComboBox *widget, | |||
311 | gpointer user_data) | 311 | gpointer user_data) |
312 | { | 312 | { |
313 | struct GNUNET_IDENTITY_Ego *ego; | 313 | struct GNUNET_IDENTITY_Ego *ego; |
314 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *temp_zone_pkey; | 314 | const struct GNUNET_IDENTITY_PrivateKey *temp_zone_pkey; |
315 | const char *tld; | 315 | const char *tld; |
316 | 316 | ||
317 | if (NULL != zone_mon) | 317 | if (NULL != zone_mon) |
diff --git a/src/conversation/gnunet-conversation-gtk_egos.c b/src/conversation/gnunet-conversation-gtk_egos.c index 08801ced..91ed2de7 100644 --- a/src/conversation/gnunet-conversation-gtk_egos.c +++ b/src/conversation/gnunet-conversation-gtk_egos.c | |||
@@ -171,8 +171,8 @@ gnunet_conversation_gtk_ego_copy_button_clicked_cb (GtkButton *button, | |||
171 | { | 171 | { |
172 | struct GNUNET_IDENTITY_Ego *ego; | 172 | struct GNUNET_IDENTITY_Ego *ego; |
173 | const gchar *label; | 173 | const gchar *label; |
174 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *priv; | 174 | const struct GNUNET_IDENTITY_PrivateKey *priv; |
175 | struct GNUNET_CRYPTO_EcdsaPublicKey pub; | 175 | struct GNUNET_IDENTITY_PublicKey pub; |
176 | const char *zkey; | 176 | const char *zkey; |
177 | char *uri; | 177 | char *uri; |
178 | GtkClipboard *cb; | 178 | GtkClipboard *cb; |
@@ -183,7 +183,7 @@ gnunet_conversation_gtk_ego_copy_button_clicked_cb (GtkButton *button, | |||
183 | ego = GCG_EGOS_get_selected_ego (); | 183 | ego = GCG_EGOS_get_selected_ego (); |
184 | GNUNET_break (NULL != ego); | 184 | GNUNET_break (NULL != ego); |
185 | priv = GNUNET_IDENTITY_ego_get_private_key (ego); | 185 | priv = GNUNET_IDENTITY_ego_get_private_key (ego); |
186 | GNUNET_CRYPTO_ecdsa_key_get_public (priv, &pub); | 186 | GNUNET_IDENTITY_ego_get_public_key (priv, &pub); |
187 | zkey = GNUNET_GNSRECORD_pkey_to_zkey (&pub); | 187 | zkey = GNUNET_GNSRECORD_pkey_to_zkey (&pub); |
188 | GNUNET_asprintf (&uri, "gnunet://gns/%s.%s/", label, zkey); | 188 | GNUNET_asprintf (&uri, "gnunet://gns/%s.%s/", label, zkey); |
189 | cb = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); | 189 | cb = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); |
diff --git a/src/conversation/gnunet-conversation-gtk_get_label.c b/src/conversation/gnunet-conversation-gtk_get_label.c index 0a2baea0..05825a5c 100644 --- a/src/conversation/gnunet-conversation-gtk_get_label.c +++ b/src/conversation/gnunet-conversation-gtk_get_label.c | |||
@@ -66,7 +66,7 @@ handle_error (void *cls) | |||
66 | */ | 66 | */ |
67 | static void | 67 | static void |
68 | handle_existing_records (void *cls, | 68 | handle_existing_records (void *cls, |
69 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, | 69 | const struct GNUNET_IDENTITY_PrivateKey *zone, |
70 | const char *label, | 70 | const char *label, |
71 | unsigned int rd_count, | 71 | unsigned int rd_count, |
72 | const struct GNUNET_GNSRECORD_Data *rd) | 72 | const struct GNUNET_GNSRECORD_Data *rd) |
@@ -104,7 +104,7 @@ gnunet_conversation_gtk_enter_label_entry_changed_cb (GtkEditable *editable, | |||
104 | const gchar *label; | 104 | const gchar *label; |
105 | GtkWidget *b_add; | 105 | GtkWidget *b_add; |
106 | struct GNUNET_IDENTITY_Ego *ego; | 106 | struct GNUNET_IDENTITY_Ego *ego; |
107 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey; | 107 | const struct GNUNET_IDENTITY_PrivateKey *pkey; |
108 | const char *tld; | 108 | const char *tld; |
109 | 109 | ||
110 | if (NULL != qe) | 110 | if (NULL != qe) |
diff --git a/src/conversation/gnunet-conversation-gtk_import.c b/src/conversation/gnunet-conversation-gtk_import.c index 63e735eb..5f72df04 100644 --- a/src/conversation/gnunet-conversation-gtk_import.c +++ b/src/conversation/gnunet-conversation-gtk_import.c | |||
@@ -71,7 +71,7 @@ static char *phone_label; | |||
71 | /** | 71 | /** |
72 | * Current private key for the phone entry's zone. | 72 | * Current private key for the phone entry's zone. |
73 | */ | 73 | */ |
74 | static struct GNUNET_CRYPTO_EcdsaPrivateKey zone_pkey; | 74 | static struct GNUNET_IDENTITY_PrivateKey zone_pkey; |
75 | 75 | ||
76 | /** | 76 | /** |
77 | * Our current phone record. | 77 | * Our current phone record. |
@@ -124,11 +124,11 @@ void | |||
124 | GSC_add_contact (const gchar *name, const gchar *address) | 124 | GSC_add_contact (const gchar *name, const gchar *address) |
125 | { | 125 | { |
126 | struct GNUNET_GNSRECORD_Data rd; | 126 | struct GNUNET_GNSRECORD_Data rd; |
127 | struct GNUNET_CRYPTO_EcdsaPublicKey rvalue; | 127 | struct GNUNET_IDENTITY_PublicKey rvalue; |
128 | const void *value; | 128 | const void *value; |
129 | struct GNUNET_IDENTITY_Ego *ego; | 129 | struct GNUNET_IDENTITY_Ego *ego; |
130 | size_t value_size; | 130 | size_t value_size; |
131 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zkey; | 131 | const struct GNUNET_IDENTITY_PrivateKey *zkey; |
132 | uint32_t type; | 132 | uint32_t type; |
133 | char cname[256]; | 133 | char cname[256]; |
134 | const char *tld; | 134 | const char *tld; |
@@ -154,7 +154,7 @@ GSC_add_contact (const gchar *name, const gchar *address) | |||
154 | { | 154 | { |
155 | type = GNUNET_GNSRECORD_TYPE_PKEY; | 155 | type = GNUNET_GNSRECORD_TYPE_PKEY; |
156 | value = &rvalue; | 156 | value = &rvalue; |
157 | value_size = sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey); | 157 | value_size = sizeof (struct GNUNET_IDENTITY_PublicKey); |
158 | } | 158 | } |
159 | else | 159 | else |
160 | { | 160 | { |
@@ -225,7 +225,7 @@ add_phone_continuation (void *cls, int32_t success, const char *emsg) | |||
225 | static void | 225 | static void |
226 | add_phone_handle_existing_records ( | 226 | add_phone_handle_existing_records ( |
227 | void *cls, | 227 | void *cls, |
228 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, | 228 | const struct GNUNET_IDENTITY_PrivateKey *zone, |
229 | const char *label, | 229 | const char *label, |
230 | unsigned int rd_count, | 230 | unsigned int rd_count, |
231 | const struct GNUNET_GNSRECORD_Data *rd) | 231 | const struct GNUNET_GNSRECORD_Data *rd) |
@@ -385,7 +385,7 @@ remove_phone_continuation (void *cls, int32_t success, const char *emsg) | |||
385 | static void | 385 | static void |
386 | remove_phone_handle_existing_records ( | 386 | remove_phone_handle_existing_records ( |
387 | void *cls, | 387 | void *cls, |
388 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, | 388 | const struct GNUNET_IDENTITY_PrivateKey *zone, |
389 | const char *label, | 389 | const char *label, |
390 | unsigned int rd_count, | 390 | unsigned int rd_count, |
391 | const struct GNUNET_GNSRECORD_Data *rd) | 391 | const struct GNUNET_GNSRECORD_Data *rd) |
diff --git a/src/conversation/gnunet-conversation-gtk_phone.c b/src/conversation/gnunet-conversation-gtk_phone.c index d3097cd1..552acc55 100644 --- a/src/conversation/gnunet-conversation-gtk_phone.c +++ b/src/conversation/gnunet-conversation-gtk_phone.c | |||
@@ -199,7 +199,7 @@ struct IncomingCall | |||
199 | /** | 199 | /** |
200 | * Public key identifying the caller. | 200 | * Public key identifying the caller. |
201 | */ | 201 | */ |
202 | struct GNUNET_CRYPTO_EcdsaPublicKey caller_id; | 202 | struct GNUNET_IDENTITY_PublicKey caller_id; |
203 | 203 | ||
204 | /** | 204 | /** |
205 | * Caller ID as human-readable string. | 205 | * Caller ID as human-readable string. |
@@ -849,7 +849,7 @@ set_incoming_call_state (struct IncomingCall *ic, enum InCallState state) | |||
849 | */ | 849 | */ |
850 | static void | 850 | static void |
851 | handle_reverse_lookup_result (void *cls, | 851 | handle_reverse_lookup_result (void *cls, |
852 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, | 852 | const struct GNUNET_IDENTITY_PrivateKey *zone, |
853 | const char *label, | 853 | const char *label, |
854 | unsigned int rd_count, | 854 | unsigned int rd_count, |
855 | const struct GNUNET_GNSRECORD_Data *rd) | 855 | const struct GNUNET_GNSRECORD_Data *rd) |
@@ -887,7 +887,7 @@ static void | |||
887 | phone_event_handler (void *cls, | 887 | phone_event_handler (void *cls, |
888 | enum GNUNET_CONVERSATION_PhoneEventCode code, | 888 | enum GNUNET_CONVERSATION_PhoneEventCode code, |
889 | struct GNUNET_CONVERSATION_Caller *caller, | 889 | struct GNUNET_CONVERSATION_Caller *caller, |
890 | const struct GNUNET_CRYPTO_EcdsaPublicKey *caller_id) | 890 | const struct GNUNET_IDENTITY_PublicKey *caller_id) |
891 | { | 891 | { |
892 | GtkTreeIter iter; | 892 | GtkTreeIter iter; |
893 | gboolean valid; | 893 | gboolean valid; |
diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c index fecb84e1..c4cf18af 100644 --- a/src/fs/gnunet-fs-gtk.c +++ b/src/fs/gnunet-fs-gtk.c | |||
@@ -596,7 +596,7 @@ monitor_zone_sync (void *cls) | |||
596 | */ | 596 | */ |
597 | static void | 597 | static void |
598 | monitor_zone_records (void *cls, | 598 | monitor_zone_records (void *cls, |
599 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, | 599 | const struct GNUNET_IDENTITY_PrivateKey *zone, |
600 | const char *label, | 600 | const char *label, |
601 | unsigned int rd_count, | 601 | unsigned int rd_count, |
602 | const struct GNUNET_GNSRECORD_Data *rd) | 602 | const struct GNUNET_GNSRECORD_Data *rd) |
@@ -663,7 +663,7 @@ handle_sks_zone_identity (void *cls, | |||
663 | "No default ego specified for `fs-sks` service, will not enable namespace search.\n")); | 663 | "No default ego specified for `fs-sks` service, will not enable namespace search.\n")); |
664 | return; | 664 | return; |
665 | } | 665 | } |
666 | main_context.sks_zone = GNUNET_new (struct GNUNET_CRYPTO_EcdsaPrivateKey); | 666 | main_context.sks_zone = GNUNET_new (struct GNUNET_IDENTITY_PrivateKey); |
667 | *main_context.sks_zone = *GNUNET_IDENTITY_ego_get_private_key (ego); | 667 | *main_context.sks_zone = *GNUNET_IDENTITY_ego_get_private_key (ego); |
668 | gtk_widget_show (GTK_WIDGET (GNUNET_FS_GTK_get_main_window_object ( | 668 | gtk_widget_show (GTK_WIDGET (GNUNET_FS_GTK_get_main_window_object ( |
669 | "main_window_search_namespace_label"))); | 669 | "main_window_search_namespace_label"))); |
diff --git a/src/fs/gnunet-fs-gtk.h b/src/fs/gnunet-fs-gtk.h index e968efc7..690e36e6 100644 --- a/src/fs/gnunet-fs-gtk.h +++ b/src/fs/gnunet-fs-gtk.h | |||
@@ -133,7 +133,7 @@ struct PseuLookupContext | |||
133 | /** | 133 | /** |
134 | * Public key of the namespace we are trying to save. | 134 | * Public key of the namespace we are trying to save. |
135 | */ | 135 | */ |
136 | struct GNUNET_CRYPTO_EcdsaPublicKey pkey; | 136 | struct GNUNET_IDENTITY_PublicKey pkey; |
137 | 137 | ||
138 | /** | 138 | /** |
139 | * Nickname we're saving under. | 139 | * 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_EcdsaPrivateKey *sks_zone; | 256 | struct GNUNET_IDENTITY_PrivateKey *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 743456e9..ebfccab0 100644 --- a/src/fs/gnunet-fs-gtk_common.c +++ b/src/fs/gnunet-fs-gtk_common.c | |||
@@ -294,7 +294,7 @@ GNUNET_FS_GTK_handle_uri (const struct GNUNET_FS_Uri *uri, | |||
294 | GtkEntry *query_entry; | 294 | GtkEntry *query_entry; |
295 | GtkComboBox *ns_cb; | 295 | GtkComboBox *ns_cb; |
296 | GtkEntry *ns_entry; | 296 | GtkEntry *ns_entry; |
297 | struct GNUNET_CRYPTO_EcdsaPublicKey want; | 297 | struct GNUNET_IDENTITY_PublicKey want; |
298 | 298 | ||
299 | 299 | ||
300 | if (GNUNET_FS_uri_test_chk (uri) || GNUNET_FS_uri_test_loc (uri)) | 300 | 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 98db564d..10209a3d 100644 --- a/src/fs/gnunet-fs-gtk_main-window-search.c +++ b/src/fs/gnunet-fs-gtk_main-window-search.c | |||
@@ -133,7 +133,7 @@ handle_gns_result (void *cls, | |||
133 | { | 133 | { |
134 | if (GNUNET_GNSRECORD_TYPE_PKEY != rd[i].record_type) | 134 | if (GNUNET_GNSRECORD_TYPE_PKEY != rd[i].record_type) |
135 | continue; | 135 | continue; |
136 | if (sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) != rd[i].data_size) | 136 | if (sizeof (struct GNUNET_IDENTITY_PublicKey) != rd[i].data_size) |
137 | { | 137 | { |
138 | GNUNET_break_op (0); | 138 | GNUNET_break_op (0); |
139 | continue; | 139 | continue; |
@@ -162,7 +162,7 @@ start_search (struct GNUNET_GTK_MainWindowContext *main_ctx) | |||
162 | gchar *mime_keyword; | 162 | gchar *mime_keyword; |
163 | const char *nsid; | 163 | const char *nsid; |
164 | struct GNUNET_FS_Uri *uri; | 164 | struct GNUNET_FS_Uri *uri; |
165 | struct GNUNET_CRYPTO_EcdsaPublicKey pub_sks_zone; | 165 | struct GNUNET_IDENTITY_PublicKey pub_sks_zone; |
166 | struct SearchLookup *sl; | 166 | struct SearchLookup *sl; |
167 | char *emsg; | 167 | char *emsg; |
168 | 168 | ||
@@ -235,7 +235,7 @@ start_search (struct GNUNET_GTK_MainWindowContext *main_ctx) | |||
235 | sl->anonymity_level = anonymity_level; | 235 | sl->anonymity_level = anonymity_level; |
236 | sl->timeout_task = | 236 | sl->timeout_task = |
237 | GNUNET_SCHEDULER_add_delayed (LOOKUP_TIMEOUT, &timeout_search_lookup, sl); | 237 | GNUNET_SCHEDULER_add_delayed (LOOKUP_TIMEOUT, &timeout_search_lookup, sl); |
238 | GNUNET_CRYPTO_ecdsa_key_get_public (main_ctx->sks_zone, &pub_sks_zone); | 238 | GNUNET_IDENTITY_ego_get_public_key (main_ctx->sks_zone, &pub_sks_zone); |
239 | sl->gns = GNUNET_GNS_lookup (main_ctx->gns, | 239 | sl->gns = GNUNET_GNS_lookup (main_ctx->gns, |
240 | nsid, | 240 | nsid, |
241 | &pub_sks_zone, | 241 | &pub_sks_zone, |
@@ -413,7 +413,7 @@ save_pseudonym_with_nick (struct PseuLookupContext *lctx, const char *nick) | |||
413 | /* show the window */ | 413 | /* show the window */ |
414 | gtk_window_present (GTK_WINDOW (lctx->progress_dialog)); | 414 | gtk_window_present (GTK_WINDOW (lctx->progress_dialog)); |
415 | memset (&rd, 0, sizeof (rd)); | 415 | memset (&rd, 0, sizeof (rd)); |
416 | rd.data_size = sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey); | 416 | rd.data_size = sizeof (struct GNUNET_IDENTITY_PublicKey); |
417 | rd.data = &lctx->pkey; | 417 | rd.data = &lctx->pkey; |
418 | rd.flags = GNUNET_GNSRECORD_RF_PRIVATE; | 418 | rd.flags = GNUNET_GNSRECORD_RF_PRIVATE; |
419 | rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us; | 419 | rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us; |
@@ -652,7 +652,7 @@ GNUNET_FS_GTK_save_button_clicked_cb (GtkButton *button, gpointer user_data) | |||
652 | struct GNUNET_GTK_MainWindowContext *main_ctx = user_data; | 652 | struct GNUNET_GTK_MainWindowContext *main_ctx = user_data; |
653 | GtkComboBox *widget; | 653 | GtkComboBox *widget; |
654 | const gchar *text; | 654 | const gchar *text; |
655 | struct GNUNET_CRYPTO_EcdsaPublicKey pkey; | 655 | struct GNUNET_IDENTITY_PublicKey pkey; |
656 | int ret; | 656 | int ret; |
657 | struct PseuLookupContext *lctx; | 657 | struct PseuLookupContext *lctx; |
658 | guint anonymity_level; | 658 | guint anonymity_level; |
@@ -728,7 +728,7 @@ main_window_search_namespace_combobox_changed_cb (GtkComboBox *widget, | |||
728 | { | 728 | { |
729 | GtkButton *button; | 729 | GtkButton *button; |
730 | const gchar *text; | 730 | const gchar *text; |
731 | struct GNUNET_CRYPTO_EcdsaPublicKey pkey; | 731 | struct GNUNET_IDENTITY_PublicKey pkey; |
732 | int ret; | 732 | int ret; |
733 | 733 | ||
734 | text = gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (widget)))); | 734 | 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 aafcce9b..1e1ec7fa 100644 --- a/src/fs/gnunet-fs-gtk_publish-dialog.c +++ b/src/fs/gnunet-fs-gtk_publish-dialog.c | |||
@@ -2196,7 +2196,7 @@ insert_advertisement (void *cls, | |||
2196 | void **client_info) | 2196 | void **client_info) |
2197 | { | 2197 | { |
2198 | struct MainPublishingDialogContext *ctx = cls; | 2198 | struct MainPublishingDialogContext *ctx = cls; |
2199 | struct GNUNET_CRYPTO_EcdsaPublicKey pub; | 2199 | struct GNUNET_IDENTITY_PublicKey pub; |
2200 | struct GNUNET_FS_Uri *sks_uri; | 2200 | struct GNUNET_FS_Uri *sks_uri; |
2201 | char *sks_uri_string; | 2201 | char *sks_uri_string; |
2202 | 2202 | ||
diff --git a/src/namestore/gnunet-namestore-gtk.c b/src/namestore/gnunet-namestore-gtk.c index 9e900f62..aad4bbd2 100644 --- a/src/namestore/gnunet-namestore-gtk.c +++ b/src/namestore/gnunet-namestore-gtk.c | |||
@@ -267,7 +267,7 @@ struct MoveOperationContext | |||
267 | /** | 267 | /** |
268 | * Private key of target zone. | 268 | * Private key of target zone. |
269 | */ | 269 | */ |
270 | struct GNUNET_CRYPTO_EcdsaPrivateKey pk; | 270 | struct GNUNET_IDENTITY_PrivateKey pk; |
271 | 271 | ||
272 | /** | 272 | /** |
273 | 273 | ||
@@ -416,12 +416,12 @@ static GtkTreeView *tv; | |||
416 | /** | 416 | /** |
417 | * Private key of the zone we are currently editing. | 417 | * Private key of the zone we are currently editing. |
418 | */ | 418 | */ |
419 | static struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey; | 419 | static struct GNUNET_IDENTITY_PrivateKey *pkey; |
420 | 420 | ||
421 | /** | 421 | /** |
422 | * Public key of the zone we are currently editing. | 422 | * Public key of the zone we are currently editing. |
423 | */ | 423 | */ |
424 | static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey; | 424 | static struct GNUNET_IDENTITY_PublicKey pubkey; |
425 | 425 | ||
426 | /** | 426 | /** |
427 | * Pseudonym of the current zone we are editing. | 427 | * Pseudonym of the current zone we are editing. |
@@ -939,7 +939,7 @@ merge_with_existing_records (void *cls, | |||
939 | */ | 939 | */ |
940 | static void | 940 | static void |
941 | handle_records_for_merge (void *cls, | 941 | handle_records_for_merge (void *cls, |
942 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, | 942 | const struct GNUNET_IDENTITY_PrivateKey *zone, |
943 | const char *label, | 943 | const char *label, |
944 | unsigned int rd_count, | 944 | unsigned int rd_count, |
945 | const struct GNUNET_GNSRECORD_Data *rd) | 945 | const struct GNUNET_GNSRECORD_Data *rd) |
@@ -1129,7 +1129,7 @@ edit_dialog_continuation (struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc, | |||
1129 | } | 1129 | } |
1130 | else | 1130 | else |
1131 | { | 1131 | { |
1132 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *pk; | 1132 | const struct GNUNET_IDENTITY_PrivateKey *pk; |
1133 | struct MoveOperationContext *moc; | 1133 | struct MoveOperationContext *moc; |
1134 | struct GNUNET_HashCode query; | 1134 | struct GNUNET_HashCode query; |
1135 | 1135 | ||
@@ -2367,7 +2367,7 @@ free_ri (struct RecordInfo *ri) | |||
2367 | */ | 2367 | */ |
2368 | static void | 2368 | static void |
2369 | zone_iteration_proc (void *cls, | 2369 | zone_iteration_proc (void *cls, |
2370 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key, | 2370 | const struct GNUNET_IDENTITY_PrivateKey *zone_key, |
2371 | const char *name, | 2371 | const char *name, |
2372 | unsigned int rd_count, | 2372 | unsigned int rd_count, |
2373 | const struct GNUNET_GNSRECORD_Data *rd) | 2373 | const struct GNUNET_GNSRECORD_Data *rd) |
@@ -2391,7 +2391,7 @@ zone_iteration_proc (void *cls, | |||
2391 | 2391 | ||
2392 | (void) cls; | 2392 | (void) cls; |
2393 | if (0 != | 2393 | if (0 != |
2394 | memcmp (zone_key, pkey, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey))) | 2394 | memcmp (zone_key, pkey, sizeof (struct GNUNET_IDENTITY_PrivateKey))) |
2395 | { | 2395 | { |
2396 | GNUNET_break (0); | 2396 | GNUNET_break (0); |
2397 | return; | 2397 | return; |
@@ -2608,9 +2608,9 @@ load_zone (const char *name, struct GNUNET_IDENTITY_Ego *ego) | |||
2608 | if (NULL == name) | 2608 | if (NULL == name) |
2609 | return; /* empty zone */ | 2609 | return; /* empty zone */ |
2610 | current_pseudonym = GNUNET_strdup (name); | 2610 | current_pseudonym = GNUNET_strdup (name); |
2611 | pkey = GNUNET_new (struct GNUNET_CRYPTO_EcdsaPrivateKey); | 2611 | pkey = GNUNET_new (struct GNUNET_IDENTITY_PrivateKey); |
2612 | *pkey = *GNUNET_IDENTITY_ego_get_private_key (ego); | 2612 | *pkey = *GNUNET_IDENTITY_ego_get_private_key (ego); |
2613 | GNUNET_CRYPTO_ecdsa_key_get_public (pkey, &pubkey); | 2613 | GNUNET_IDENTITY_ego_get_public_key (pkey, &pubkey); |
2614 | label = g_markup_printf_escaped ("<b>%s</b>", GNUNET_GNSRECORD_z2s (&pubkey)); | 2614 | label = g_markup_printf_escaped ("<b>%s</b>", GNUNET_GNSRECORD_z2s (&pubkey)); |
2615 | gtk_label_set_markup (GTK_LABEL ( | 2615 | gtk_label_set_markup (GTK_LABEL ( |
2616 | get_object ("gnunet_namestore_gtk_zone_label")), | 2616 | get_object ("gnunet_namestore_gtk_zone_label")), |
@@ -2707,7 +2707,7 @@ fresh_label (const char *label) | |||
2707 | */ | 2707 | */ |
2708 | static void | 2708 | static void |
2709 | iop_create_cont (void *cls, | 2709 | iop_create_cont (void *cls, |
2710 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *priv, | 2710 | const struct GNUNET_IDENTITY_PrivateKey *priv, |
2711 | const char *emsg) | 2711 | const char *emsg) |
2712 | { | 2712 | { |
2713 | GtkEntry *entry; | 2713 | GtkEntry *entry; |
@@ -3126,7 +3126,12 @@ gnunet_namestore_gtk_zone_add_button_clicked_cb (GtkButton *button, | |||
3126 | label = gtk_entry_get_text (entry); | 3126 | label = gtk_entry_get_text (entry); |
3127 | gtk_label_set_markup (status_label, _ ("Creating zone")); | 3127 | gtk_label_set_markup (status_label, _ ("Creating zone")); |
3128 | gtk_widget_set_sensitive (main_window, FALSE); | 3128 | gtk_widget_set_sensitive (main_window, FALSE); |
3129 | iop = GNUNET_IDENTITY_create (identity, label, NULL, &iop_create_cont, NULL); | 3129 | iop = GNUNET_IDENTITY_create (identity, |
3130 | label, | ||
3131 | NULL, | ||
3132 | GNUNET_IDENTITY_TYPE_ECDSA, | ||
3133 | &iop_create_cont, | ||
3134 | NULL); | ||
3130 | gtk_entry_set_text (entry, ""); | 3135 | gtk_entry_set_text (entry, ""); |
3131 | } | 3136 | } |
3132 | 3137 | ||
diff --git a/src/namestore/plugin_gtk_namestore_phone.c b/src/namestore/plugin_gtk_namestore_phone.c index 42582fd9..9d1576eb 100644 --- a/src/namestore/plugin_gtk_namestore_phone.c +++ b/src/namestore/plugin_gtk_namestore_phone.c | |||
@@ -124,7 +124,7 @@ phone_validate (void *cls, GtkBuilder *builder) | |||
124 | { | 124 | { |
125 | GtkEditable *entry; | 125 | GtkEditable *entry; |
126 | const gchar *preedit; | 126 | const gchar *preedit; |
127 | struct GNUNET_CRYPTO_EcdsaPublicKey pub; | 127 | struct GNUNET_IDENTITY_PublicKey pub; |
128 | 128 | ||
129 | entry = GTK_EDITABLE ( | 129 | entry = GTK_EDITABLE ( |
130 | gtk_builder_get_object (builder, "edit_dialog_phone_peer_entry")); | 130 | gtk_builder_get_object (builder, "edit_dialog_phone_peer_entry")); |
diff --git a/src/namestore/plugin_gtk_namestore_pkey.c b/src/namestore/plugin_gtk_namestore_pkey.c index 428fa422..c31ca79b 100644 --- a/src/namestore/plugin_gtk_namestore_pkey.c +++ b/src/namestore/plugin_gtk_namestore_pkey.c | |||
@@ -99,7 +99,7 @@ pkey_validate (void *cls, GtkBuilder *builder) | |||
99 | { | 99 | { |
100 | GtkEditable *entry; | 100 | GtkEditable *entry; |
101 | const gchar *preedit; | 101 | const gchar *preedit; |
102 | struct GNUNET_CRYPTO_EcdsaPublicKey pub; | 102 | struct GNUNET_IDENTITY_PublicKey pub; |
103 | 103 | ||
104 | entry = | 104 | entry = |
105 | GTK_EDITABLE (gtk_builder_get_object (builder, "edit_dialog_pkey_entry")), | 105 | GTK_EDITABLE (gtk_builder_get_object (builder, "edit_dialog_pkey_entry")), |