projects/aports·blob master · refs

99 lines · 3.1 KiB

1--- a/src/namestore/gnunet-namestore-gtk.c
2+++ b/src/namestore/gnunet-namestore-gtk.c
3@@ -266,7 +266,7 @@
4 /**
5 * Private key of target zone.
6 */
7- struct GNUNET_CRYPTO_PrivateKey pk;
8+ struct GNUNET_CRYPTO_BlindablePrivateKey pk;
9
10 /**
11 * Data to free.
12@@ -413,12 +413,12 @@
13 /**
14 * Private key of the zone we are currently editing.
15 */
16-static const struct GNUNET_CRYPTO_PrivateKey *pkey;
17+static const struct GNUNET_CRYPTO_BlindablePrivateKey *pkey;
18
19 /**
20 * Public key of the zone we are currently editing.
21 */
22-static struct GNUNET_CRYPTO_PublicKey pubkey;
23+static struct GNUNET_CRYPTO_BlindablePublicKey pubkey;
24
25 /**
26 * Pseudonym of the current zone we are editing.
27@@ -948,7 +948,7 @@
28 */
29 static void
30 handle_records_for_merge (void *cls,
31- const struct GNUNET_CRYPTO_PrivateKey *zone,
32+ const struct GNUNET_CRYPTO_BlindablePrivateKey *zone,
33 const char *label,
34 unsigned int rd_count,
35 const struct GNUNET_GNSRECORD_Data *rd)
36@@ -1149,7 +1149,7 @@
37 }
38 else
39 {
40- const struct GNUNET_CRYPTO_PrivateKey *pk;
41+ const struct GNUNET_CRYPTO_BlindablePrivateKey *pk;
42 struct MoveOperationContext *moc;
43 struct GNUNET_HashCode query;
44
45@@ -1733,7 +1733,13 @@
46 GNUNET_asprintf (&edc->liblow,
47 "libgnunet_plugin_gtk_namestore_%s",
48 typename);
49- GNUNET_STRINGS_utf8_tolower (edc->liblow, edc->liblow);
50+ {
51+ char *liblow;
52+
53+ liblow = GNUNET_STRINGS_utf8_tolower (edc->liblow);
54+ GNUNET_free (edc->liblow);
55+ edc->liblow = liblow;
56+ }
57 edc->plugin = GNUNET_PLUGIN_load (GNUNET_GTK_project_data (),
58 edc->liblow,
59 edc);
60@@ -2424,7 +2430,7 @@
61 */
62 static void
63 zone_iteration_proc (void *cls,
64- const struct GNUNET_CRYPTO_PrivateKey *zone_key,
65+ const struct GNUNET_CRYPTO_BlindablePrivateKey *zone_key,
66 const char *name,
67 unsigned int rd_count,
68 const struct GNUNET_GNSRECORD_Data *rd)
69@@ -2782,7 +2788,7 @@
70 */
71 static void
72 iop_create_cont (void *cls,
73- const struct GNUNET_CRYPTO_PrivateKey *priv,
74+ const struct GNUNET_CRYPTO_BlindablePrivateKey *priv,
75 enum GNUNET_ErrorCode ec)
76 {
77 GtkEntry *entry;
78--- a/src/namestore/plugin_gtk_namestore_phone.c
79+++ b/src/namestore/plugin_gtk_namestore_phone.c
80@@ -124,7 +124,7 @@
81 {
82 GtkEditable *entry;
83 const gchar *preedit;
84- struct GNUNET_CRYPTO_PublicKey pub;
85+ struct GNUNET_CRYPTO_BlindablePublicKey pub;
86
87 entry = GTK_EDITABLE (
88 gtk_builder_get_object (builder, "edit_dialog_phone_peer_entry"));
89--- a/src/namestore/plugin_gtk_namestore_pkey.c
90+++ b/src/namestore/plugin_gtk_namestore_pkey.c
91@@ -99,7 +99,7 @@
92 {
93 GtkEditable *entry;
94 const gchar *preedit;
95- struct GNUNET_CRYPTO_PublicKey pub;
96+ struct GNUNET_CRYPTO_BlindablePublicKey pub;
97
98 entry =
99 GTK_EDITABLE (gtk_builder_get_object (builder, "edit_dialog_pkey_entry")),