[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29237 - in gnunet-gtk: contrib src/fs src/identity src/set
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r29237 - in gnunet-gtk: contrib src/fs src/identity src/setup |
|
Date: |
Fri, 13 Sep 2013 14:00:19 +0200 |
Author: grothoff
Date: 2013-09-13 14:00:18 +0200 (Fri, 13 Sep 2013)
New Revision: 29237
Modified:
gnunet-gtk/contrib/gnunet_identity_gtk_about_window.glade
gnunet-gtk/src/fs/gnunet-fs-gtk.h
gnunet-gtk/src/fs/gnunet-fs-gtk_common.c
gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-search.c
gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c
gnunet-gtk/src/identity/gnunet-identity-gtk.c
gnunet-gtk/src/identity/gnunet-identity-gtk_advertise.c
gnunet-gtk/src/setup/gnunet-setup-gns-edit.c
gnunet-gtk/src/setup/gnunet-setup-gns.c
Log:
splitting 'struct GNUNET_CRYPTO_EccPublicKey' into one struct for signing and
another for encryption
Modified: gnunet-gtk/contrib/gnunet_identity_gtk_about_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_identity_gtk_about_window.glade 2013-09-13
12:00:01 UTC (rev 29236)
+++ gnunet-gtk/contrib/gnunet_identity_gtk_about_window.glade 2013-09-13
12:00:18 UTC (rev 29237)
@@ -91,7 +91,7 @@
<object class="GtkLabel" id="about_name_version_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">GNUnet-Peerinfo-GTK 0.9.3</property>
+ <property name="label">GNUnet-Peerinfo-GTK 0.9.5</property>
<attributes>
<attribute name="weight" value="bold"/>
<attribute name="size" value="200"/>
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk.h
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk.h 2013-09-13 12:00:01 UTC (rev 29236)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk.h 2013-09-13 12:00:18 UTC (rev 29237)
@@ -132,7 +132,7 @@
/**
* Public key of the namespace we are trying to save.
*/
- struct GNUNET_CRYPTO_EccPublicKey pkey;
+ struct GNUNET_CRYPTO_EccPublicSignKey pkey;
/**
* Nickname we're saving under.
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_common.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_common.c 2013-09-13 12:00:01 UTC (rev
29236)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_common.c 2013-09-13 12:00:18 UTC (rev
29237)
@@ -276,7 +276,7 @@
GtkEntry *query_entry;
GtkComboBox *ns_cb;
GtkEntry *ns_entry;
- struct GNUNET_CRYPTO_EccPublicKey want;
+ struct GNUNET_CRYPTO_EccPublicSignKey want;
if (GNUNET_FS_uri_test_chk (uri) || GNUNET_FS_uri_test_loc (uri))
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-search.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-search.c 2013-09-13
12:00:01 UTC (rev 29236)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-search.c 2013-09-13
12:00:18 UTC (rev 29237)
@@ -120,7 +120,7 @@
{
if (GNUNET_NAMESTORE_TYPE_PKEY != rd[i].record_type)
continue;
- if (sizeof (struct GNUNET_CRYPTO_EccPublicKey) != rd[i].data_size)
+ if (sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) != rd[i].data_size)
{
GNUNET_break_op (0);
continue;
@@ -149,7 +149,7 @@
gchar *mime_keyword;
const char *nsid;
struct GNUNET_FS_Uri *uri;
- struct GNUNET_CRYPTO_EccPublicKey pub_sks_zone;
+ struct GNUNET_CRYPTO_EccPublicSignKey pub_sks_zone;
struct SearchLookup *sl;
char *emsg;
@@ -224,7 +224,7 @@
sl->anonymity_level = anonymity_level;
sl->timeout_task = GNUNET_SCHEDULER_add_delayed (LOOKUP_TIMEOUT,
&timeout_search_lookup,
sl);
- GNUNET_CRYPTO_ecc_key_get_public (main_ctx->sks_zone,
+ GNUNET_CRYPTO_ecc_key_get_public_for_signature (main_ctx->sks_zone,
&pub_sks_zone);
sl->gns = GNUNET_GNS_lookup (main_ctx->gns,
nsid,
@@ -399,7 +399,7 @@
/* show the window */
gtk_window_present (GTK_WINDOW (lctx->progress_dialog));
memset (&rd, 0, sizeof (rd));
- rd.data_size = sizeof (struct GNUNET_CRYPTO_EccPublicKey);
+ rd.data_size = sizeof (struct GNUNET_CRYPTO_EccPublicSignKey);
rd.data = &lctx->pkey;
rd.flags = GNUNET_NAMESTORE_RF_PRIVATE;
rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
@@ -631,7 +631,7 @@
struct GNUNET_GTK_MainWindowContext *main_ctx = user_data;
GtkComboBox *widget;
const gchar *text;
- struct GNUNET_CRYPTO_EccPublicKey pkey;
+ struct GNUNET_CRYPTO_EccPublicSignKey pkey;
int ret;
struct PseuLookupContext *lctx;
guint anonymity_level;
@@ -707,7 +707,7 @@
{
GtkButton *button;
const gchar *text;
- struct GNUNET_CRYPTO_EccPublicKey pkey;
+ struct GNUNET_CRYPTO_EccPublicSignKey pkey;
int ret;
text = gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (widget))));
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c 2013-09-13 12:00:01 UTC
(rev 29236)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c 2013-09-13 12:00:18 UTC
(rev 29237)
@@ -2108,7 +2108,7 @@
void **client_info)
{
struct MainPublishingDialogContext *ctx = cls;
- struct GNUNET_CRYPTO_EccPublicKey pub;
+ struct GNUNET_CRYPTO_EccPublicSignKey pub;
struct GNUNET_FS_Uri *sks_uri;
char *sks_uri_string;
Modified: gnunet-gtk/src/identity/gnunet-identity-gtk.c
===================================================================
--- gnunet-gtk/src/identity/gnunet-identity-gtk.c 2013-09-13 12:00:01 UTC
(rev 29236)
+++ gnunet-gtk/src/identity/gnunet-identity-gtk.c 2013-09-13 12:00:18 UTC
(rev 29237)
@@ -440,7 +440,7 @@
GtkTreeRowReference *rr;
GtkTreeIter iter;
char *id;
- struct GNUNET_CRYPTO_EccPublicKey pub;
+ struct GNUNET_CRYPTO_EccPublicSignKey pub;
if (NULL == ego)
return; /* nothing to be done */
Modified: gnunet-gtk/src/identity/gnunet-identity-gtk_advertise.c
===================================================================
--- gnunet-gtk/src/identity/gnunet-identity-gtk_advertise.c 2013-09-13
12:00:01 UTC (rev 29236)
+++ gnunet-gtk/src/identity/gnunet-identity-gtk_advertise.c 2013-09-13
12:00:18 UTC (rev 29237)
@@ -285,7 +285,7 @@
gchar *value;
GtkTreeIter iter;
struct GNUNET_FS_BlockOptions bo;
- struct GNUNET_CRYPTO_EccPublicKey pk;
+ struct GNUNET_CRYPTO_EccPublicSignKey pk;
struct PublishContext *pc;
guint anonymity;
const char *id;
@@ -356,7 +356,7 @@
(gtk_builder_get_object
(ac->builder,
"GNUNET_GTK_identity_advertise_replication_spin_button")));
- GNUNET_CRYPTO_ecc_key_get_public (&ac->priv,
+ GNUNET_CRYPTO_ecc_key_get_public_for_signature (&ac->priv,
&pk);
id = gtk_entry_get_text
(GTK_ENTRY
Modified: gnunet-gtk/src/setup/gnunet-setup-gns-edit.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-gns-edit.c 2013-09-13 12:00:01 UTC
(rev 29236)
+++ gnunet-gtk/src/setup/gnunet-setup-gns-edit.c 2013-09-13 12:00:18 UTC
(rev 29237)
@@ -1120,14 +1120,14 @@
{
GtkEditable *entry;
const gchar *preedit;
- struct GNUNET_CRYPTO_EccPublicKey pub;
+ struct GNUNET_CRYPTO_EccPublicSignKey pub;
entry = GTK_EDITABLE (gtk_builder_get_object (edc->builder,
"edit_dialog_pkey_entry")),
preedit = gtk_editable_get_chars (entry, 0, -1);
if ( (NULL == preedit) ||
(GNUNET_OK !=
- GNUNET_CRYPTO_ecc_public_key_from_string (preedit,
+ GNUNET_CRYPTO_ecc_public_sign_key_from_string (preedit,
strlen (preedit),
&pub)) )
{
Modified: gnunet-gtk/src/setup/gnunet-setup-gns.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-gns.c 2013-09-13 12:00:01 UTC (rev
29236)
+++ gnunet-gtk/src/setup/gnunet-setup-gns.c 2013-09-13 12:00:18 UTC (rev
29237)
@@ -346,7 +346,7 @@
/**
* Public key of the zone we are currently editing.
*/
-static struct GNUNET_CRYPTO_EccPublicKey pubkey;
+static struct GNUNET_CRYPTO_EccPublicSignKey pubkey;
/**
* Pseudonym of the current zone we are editing.
@@ -826,9 +826,9 @@
const struct GNUNET_NAMESTORE_Block *block)
{
struct MoveOperationContext *moc = cls;
- struct GNUNET_CRYPTO_EccPublicKey pubkey;
+ struct GNUNET_CRYPTO_EccPublicSignKey pubkey;
- GNUNET_CRYPTO_ecc_key_get_public (moc->pk,
+ GNUNET_CRYPTO_ecc_key_get_public_for_signature (moc->pk,
&pubkey);
if (GNUNET_OK !=
GNUNET_NAMESTORE_block_decrypt (block,
@@ -1968,7 +1968,7 @@
}
pkey = GNUNET_new (struct GNUNET_CRYPTO_EccPrivateKey);
*pkey = *GNUNET_IDENTITY_ego_get_private_key (ego);
- GNUNET_CRYPTO_ecc_key_get_public (pkey, &pubkey);
+ GNUNET_CRYPTO_ecc_key_get_public_for_signature (pkey, &pubkey);
label = g_markup_printf_escaped (_("<b>Editing zone %s</b>"),
GNUNET_NAMESTORE_z2s (&pubkey));
gtk_label_set_markup (GTK_LABEL (GNUNET_SETUP_get_object
("GNUNET_setup_gns_zone_label")),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29237 - in gnunet-gtk: contrib src/fs src/identity src/setup,
gnunet <=