[libcryptui] Add symmetric encryption as a choice in "choose recipients" dialog
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libcryptui] Add symmetric encryption as a choice in "choose recipients" dialog
- Date: Tue, 9 Jul 2013 08:26:53 +0000 (UTC)
commit cd74aa6bf810a5ce0935d2ec89d6db64dbbde24d
Author: Jérémy Bobbio <lunar debian org>
Date: Thu May 2 13:17:55 2013 +0000
Add symmetric encryption as a choice in "choose recipients" dialog
This extends the current "choose recipients" dialog to offer symmetric
encryption instead of public key recipients.
Callers need to use the new cryptui_prompt_recipients_with_symmetric()
function to offer symmetric encryption. cryptui_prompt_recipients()
behaviour is unchanged.
https://bugzilla.gnome.org/show_bug.cgi?id=325803
libcryptui/cryptui-key-chooser.c | 131 ++++++++++++++++++++++++++++++++++--
libcryptui/cryptui-key-chooser.h | 12 +++-
libcryptui/cryptui.c | 62 +++++++++++++----
libcryptui/cryptui.h | 4 +
libcryptui/tests/cryptui-test-ui.c | 12 +++-
5 files changed, 196 insertions(+), 25 deletions(-)
---
diff --git a/libcryptui/cryptui-key-chooser.c b/libcryptui/cryptui-key-chooser.c
index f45c181..c320142 100644
--- a/libcryptui/cryptui-key-chooser.c
+++ b/libcryptui/cryptui-key-chooser.c
@@ -32,7 +32,8 @@ enum {
PROP_0,
PROP_KEYSET,
PROP_MODE,
- PROP_ENFORCE_PREFS
+ PROP_ENFORCE_PREFS,
+ PROP_SYMMETRIC
};
enum {
@@ -44,6 +45,7 @@ enum {
struct _CryptUIKeyChooserPriv {
guint mode;
gboolean initialized : 1;
+ gboolean symmetric : 1;
CryptUIKeyset *ckset;
CryptUIKeyStore *ckstore;
@@ -136,6 +138,19 @@ signer_toggled (GtkWidget *widget, CryptUIKeyChooser *chooser)
g_signal_emit (chooser, signals[CHANGED], 0);
}
+static void encryption_mode_changed (GtkToggleButton * button, CryptUIKeyChooser *chooser)
+{
+ gboolean use_public_key_encryption;
+
+ use_public_key_encryption = gtk_toggle_button_get_active (button);
+ chooser->priv->symmetric = !use_public_key_encryption;
+ gtk_widget_set_sensitive (GTK_WIDGET (chooser->priv->filtermode), use_public_key_encryption);
+ gtk_widget_set_sensitive (GTK_WIDGET (chooser->priv->filtertext), use_public_key_encryption);
+ gtk_widget_set_sensitive (GTK_WIDGET (chooser->priv->keylist), use_public_key_encryption);
+
+ g_signal_emit (chooser, signals[CHANGED], 0);
+}
+
static void
construct_recipients (CryptUIKeyChooser *chooser, GtkBox *box)
{
@@ -143,6 +158,16 @@ construct_recipients (CryptUIKeyChooser *chooser, GtkBox *box)
GtkWidget *scroll;
GtkWidget *label;
GtkWidget *hbox;
+ GtkWidget *vbox;
+ GtkWidget *radio_public_key;
+ GtkWidget *radio_symmetric;
+ gboolean support_symmetric;
+ gint indicator_size = 0;
+ gint indicator_spacing = 0;
+ gint focus_width = 0;
+ gint focus_pad = 0;
+
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
/* Top filter box */
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
@@ -181,9 +206,9 @@ construct_recipients (CryptUIKeyChooser *chooser, GtkBox *box)
FALSE, TRUE, 0, GTK_PACK_START);
/* Add Filter box */
- gtk_container_add (GTK_CONTAINER (box), hbox);
- gtk_box_set_child_packing (GTK_BOX (box), hbox,
- FALSE, TRUE, 0, GTK_PACK_START);
+ gtk_container_add (GTK_CONTAINER (vbox), hbox);
+ gtk_box_set_child_packing (GTK_BOX (vbox), hbox,
+ FALSE, TRUE, 0, GTK_PACK_START);
chooser->priv->ckstore = cryptui_key_store_new (chooser->priv->ckset, TRUE, NULL);
cryptui_key_store_set_sortable (chooser->priv->ckstore, TRUE);
@@ -199,8 +224,47 @@ construct_recipients (CryptUIKeyChooser *chooser, GtkBox *box)
GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll), GTK_SHADOW_IN);
gtk_container_add (GTK_CONTAINER (scroll), GTK_WIDGET (chooser->priv->keylist));
- gtk_container_add (GTK_CONTAINER (box), scroll);
- gtk_box_set_child_packing (box, scroll, TRUE, TRUE, 0, GTK_PACK_START);
+ gtk_container_add (GTK_CONTAINER (vbox), scroll);
+ gtk_box_set_child_packing (GTK_BOX (vbox), scroll,
+ TRUE, TRUE, 0, GTK_PACK_START);
+
+ support_symmetric = (chooser->priv->mode & CRYPTUI_KEY_CHOOSER_SUPPORT_SYMMETRIC) ==
CRYPTUI_KEY_CHOOSER_SUPPORT_SYMMETRIC;
+
+ if (support_symmetric) {
+ radio_symmetric = gtk_radio_button_new (NULL /* first of the group */);
+ label = gtk_label_new (_("Use passphrase only"));
+ gtk_container_add (GTK_CONTAINER (radio_symmetric), label);
+ gtk_container_add (GTK_CONTAINER (box), radio_symmetric);
+ gtk_box_set_child_packing (GTK_BOX (box), radio_symmetric,
+ FALSE, TRUE, 0, GTK_PACK_START);
+
+ radio_public_key = gtk_radio_button_new_from_widget (GTK_RADIO_BUTTON (radio_symmetric));
+ g_signal_connect (radio_public_key, "toggled",
+ G_CALLBACK (encryption_mode_changed), chooser);
+ label = gtk_label_new (_("Choose a set of recipients:"));
+ gtk_container_add (GTK_CONTAINER (radio_public_key), label);
+ gtk_container_add (GTK_CONTAINER (box), radio_public_key);
+ gtk_box_set_child_packing (GTK_BOX (box), radio_public_key,
+ FALSE, TRUE, 0, GTK_PACK_START);
+ gtk_widget_style_get (GTK_WIDGET (radio_public_key),
+ "indicator-size", &indicator_size,
+ "indicator-spacing", &indicator_spacing,
+ NULL);
+ gtk_widget_style_get (GTK_WIDGET (radio_public_key),
+ "focus-line-width", &focus_width,
+ "focus-padding", &focus_pad,
+ NULL);
+
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (radio_public_key),
+ !cryptui_key_chooser_get_symmetric (chooser));
+
+ gtk_widget_set_margin_left (vbox, indicator_size + 2 * indicator_spacing +
+ focus_width + focus_pad);
+ }
+ gtk_container_add (GTK_CONTAINER (box), vbox);
+ gtk_box_set_child_packing (GTK_BOX (box), vbox,
+ TRUE, TRUE, 0, GTK_PACK_START);
+
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (chooser->priv->keylist));
g_signal_connect (selection, "changed", G_CALLBACK (recipients_changed), chooser);
}
@@ -212,10 +276,13 @@ construct_signer (CryptUIKeyChooser *chooser, GtkBox *box)
CryptUIKeyStore *ckstore;
GtkWidget *hbox;
GtkWidget *label;
+ GtkWidget *separator;
guint count;
GList *keys;
gchar *keyname, *labelstr;
+ gboolean support_symmetric;
+ support_symmetric = (chooser->priv->mode & CRYPTUI_KEY_CHOOSER_SUPPORT_SYMMETRIC) ==
CRYPTUI_KEY_CHOOSER_SUPPORT_SYMMETRIC;
/* TODO: HIG and beautification */
@@ -243,6 +310,11 @@ construct_signer (CryptUIKeyChooser *chooser, GtkBox *box)
g_signal_connect (chooser->priv->signercheck , "toggled", G_CALLBACK (signer_toggled), chooser);
/* Add it in */
+ if (support_symmetric) {
+ separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+ gtk_container_add (GTK_CONTAINER (box), separator);
+ gtk_box_set_child_packing (box, separator, FALSE, TRUE, 0, GTK_PACK_START);
+ }
gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (chooser->priv->signercheck));
gtk_box_set_child_packing (box, GTK_WIDGET (chooser->priv->signercheck), FALSE, TRUE, 0,
GTK_PACK_START);
@@ -268,6 +340,11 @@ construct_signer (CryptUIKeyChooser *chooser, GtkBox *box)
TRUE, TRUE, 0, GTK_PACK_START);
/* Add it in */
+ if (support_symmetric) {
+ separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+ gtk_container_add (GTK_CONTAINER (box), separator);
+ gtk_box_set_child_packing (box, separator, FALSE, TRUE, 0, GTK_PACK_START);
+ }
gtk_container_add (GTK_CONTAINER (box), hbox);
gtk_box_set_child_packing (box, hbox, FALSE, TRUE, 0, GTK_PACK_START);
}
@@ -382,6 +459,9 @@ cryptui_key_chooser_set_property (GObject *gobject, guint prop_id,
}
break;
+ case PROP_SYMMETRIC:
+ chooser->priv->symmetric = g_value_get_boolean (value);
+
default:
break;
}
@@ -405,6 +485,10 @@ cryptui_key_chooser_get_property (GObject *gobject, guint prop_id,
case PROP_ENFORCE_PREFS:
g_value_set_boolean (value, chooser->priv->settings != NULL);
break;
+
+ case PROP_SYMMETRIC:
+ g_value_set_boolean (value, chooser->priv->symmetric);
+
default:
break;
@@ -436,6 +520,10 @@ cryptui_key_chooser_class_init (CryptUIKeyChooserClass *klass)
g_object_class_install_property (gclass, PROP_ENFORCE_PREFS,
g_param_spec_boolean ("enforce-prefs", "Enforce User Preferences", "Enforce user preferences",
TRUE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+
+ g_object_class_install_property (gclass, PROP_SYMMETRIC,
+ g_param_spec_boolean ("symmetric", "Use symmetric encryption", "Use symmetric encryption",
+ FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
signals[CHANGED] = g_signal_new ("changed", CRYPTUI_TYPE_KEY_CHOOSER,
G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (CryptUIKeyChooserClass, changed),
@@ -629,6 +717,37 @@ cryptui_key_chooser_set_signer (CryptUIKeyChooser *chooser, const gchar *key)
}
/**
+ * cryptui_key_chooser_get_symmetric:
+ * @chooser: the chooser widget to get symmetric setting from
+ *
+ * Gets if symmetric encryption was selected.
+ *
+ * Returns: TRUE if symmetric encrypted was selected, FALSE otherwise.
+ */
+gboolean
+cryptui_key_chooser_get_symmetric (CryptUIKeyChooser *chooser)
+{
+ gboolean symmetric = FALSE;
+
+ g_object_get (chooser, "symmetric", &symmetric, NULL);
+ return symmetric;
+}
+
+/**
+ * cryptui_key_chooser_set_symmetric:
+ * @chooser: the chooser to set the signer on
+ * @key: the signer key to set
+ *
+ * Sets the signer in the chooser to the provided key.
+ */
+void
+cryptui_key_chooser_set_symmetric (CryptUIKeyChooser *chooser, gboolean symmetric)
+{
+ g_object_set (chooser, "symmetric", symmetric, NULL);
+}
+
+
+/**
* cryptui_key_chooser_get_mode:
* @chooser: the chooser to get the mode from
*
diff --git a/libcryptui/cryptui-key-chooser.h b/libcryptui/cryptui-key-chooser.h
index 264ec1c..483f17f 100644
--- a/libcryptui/cryptui-key-chooser.h
+++ b/libcryptui/cryptui-key-chooser.h
@@ -27,10 +27,11 @@
#include "cryptui-keyset.h"
typedef enum _CryptUIKeyChooserMode {
- CRYPTUI_KEY_CHOOSER_RECIPIENTS = 0x0001,
- CRYPTUI_KEY_CHOOSER_SIGNER = 0x0002,
+ CRYPTUI_KEY_CHOOSER_RECIPIENTS = 0x0001,
+ CRYPTUI_KEY_CHOOSER_SIGNER = 0x0002,
+ CRYPTUI_KEY_CHOOSER_SUPPORT_SYMMETRIC = 0x0004,
- CRYPTUI_KEY_CHOOSER_MUSTSIGN = 0x0010
+ CRYPTUI_KEY_CHOOSER_MUSTSIGN = 0x0010
} CryptUIKeyChooserMode;
#define CRYPTUI_TYPE_KEY_CHOOSER (cryptui_key_chooser_get_type ())
@@ -83,6 +84,11 @@ const gchar* cryptui_key_chooser_get_signer (CryptUIKeyChooser *
void cryptui_key_chooser_set_signer (CryptUIKeyChooser *chooser,
const gchar *key);
+gboolean cryptui_key_chooser_get_symmetric (CryptUIKeyChooser *chooser);
+
+void cryptui_key_chooser_set_symmetric (CryptUIKeyChooser *chooser,
+ gboolean symmetric);
+
CryptUIKeyChooserMode
cryptui_key_chooser_get_mode (CryptUIKeyChooser *chooser);
#endif /* __CRYPTUI_KEY_CHOOSER_H__ */
diff --git a/libcryptui/cryptui.c b/libcryptui/cryptui.c
index 246216a..507a8d8 100644
--- a/libcryptui/cryptui.c
+++ b/libcryptui/cryptui.c
@@ -146,29 +146,35 @@ cryptui_display_notification (const gchar *title, const gchar *body, const gchar
* QUICK PROMPTS
*/
-static void
+static void
selection_changed (CryptUIKeyChooser *chooser, GtkWidget *dialog)
{
- gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT,
- cryptui_key_chooser_have_recipients (chooser));
+ gboolean sensitive;
+
+ sensitive = cryptui_key_chooser_have_recipients (chooser) ||
+ cryptui_key_chooser_get_symmetric (chooser);
+ gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT,
+ sensitive);
}
/**
- * cryptui_prompt_recipients:
+ * cryptui_prompt_recipients_with_symmetric:
* @keyset: CryptUIKeyset to select keys to present to the user from
* @title: Window title for presented GtkWindow
* @signer: Variable in which to store the key of the signer if one is selected
+ * @symmetric: Variable in which to store if symmetric encryption is requested.
+ * Set to NULL to disable symmetric encryption.
*
* This function prompts the user to select one or more keys from the keyset to
* use to encrypt to. It also allows the user to select a private key from the
* keyset to sign with.
*
- * Returns: the selected key
+ * Returns: the selected key or NULL in case of symmetric encryption
*/
-
gchar**
-cryptui_prompt_recipients (CryptUIKeyset *keyset, const gchar *title,
- gchar **signer)
+cryptui_prompt_recipients_with_symmetric (CryptUIKeyset *keyset,
+ const gchar *title,
+ gchar **signer, gboolean *symmetric)
{
CryptUIKeyChooser *chooser;
GtkWidget *dialog;
@@ -182,6 +188,10 @@ cryptui_prompt_recipients (CryptUIKeyset *keyset, const gchar *title,
*signer = NULL;
mode |= CRYPTUI_KEY_CHOOSER_SIGNER;
}
+ if (symmetric) {
+ *symmetric = FALSE;
+ mode |= CRYPTUI_KEY_CHOOSER_SUPPORT_SYMMETRIC;
+ }
dialog = gtk_dialog_new_with_buttons (title, NULL, GTK_DIALOG_MODAL,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -199,12 +209,17 @@ cryptui_prompt_recipients (CryptUIKeyset *keyset, const gchar *title,
gtk_widget_show_all (dialog);
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
+ if (symmetric != NULL) {
+ *symmetric = cryptui_key_chooser_get_symmetric (chooser);
+ }
- recipients = cryptui_key_chooser_get_recipients (chooser);
- keys = g_new0(gchar*, g_list_length (recipients) + 1);
- for (l = recipients, i = 0; l; l = g_list_next (l), i++)
- keys[i] = g_strdup (l->data);
- g_list_free (recipients);
+ if (symmetric != NULL && !*symmetric) {
+ recipients = cryptui_key_chooser_get_recipients (chooser);
+ keys = g_new0(gchar*, g_list_length (recipients) + 1);
+ for (l = recipients, i = 0; l; l = g_list_next (l), i++)
+ keys[i] = g_strdup (l->data);
+ g_list_free (recipients);
+ }
if (signer) {
t = cryptui_key_chooser_get_signer (chooser);
@@ -217,6 +232,27 @@ cryptui_prompt_recipients (CryptUIKeyset *keyset, const gchar *title,
}
/**
+ * cryptui_prompt_recipients:
+ * @keyset: CryptUIKeyset to select keys to present to the user from
+ * @title: Window title for presented GtkWindow
+ * @signer: Variable in which to store the key of the signer if one is selected
+ *
+ * This function prompts the user to select one or more keys from the keyset to
+ * use to encrypt to. It also allows the user to select a private key from the
+ * keyset to sign with.
+ *
+ * Returns: the selected key
+ */
+gchar**
+cryptui_prompt_recipients (CryptUIKeyset *keyset, const gchar *title,
+ gchar **signer)
+{
+ return cryptui_prompt_recipients_with_symmetric (keyset, title,
+ signer, NULL);
+}
+
+
+/**
* cryptui_prompt_signer:
* @keyset: CryptUIKeyset to select keys to present to the user from
* @title: Window title for presented GtkWindow
diff --git a/libcryptui/cryptui.h b/libcryptui/cryptui.h
index df54f9a..d244b85 100644
--- a/libcryptui/cryptui.h
+++ b/libcryptui/cryptui.h
@@ -147,6 +147,10 @@ CryptUIEncType cryptui_key_get_enctype (const gchar *key);
void cryptui_display_notification (const gchar *title, const gchar *body,
const gchar *icon, gboolean urgent);
+gchar** cryptui_prompt_recipients_with_symmetric (CryptUIKeyset *keyset,
+ const gchar *title,
+ gchar **signer,
+ gboolean *symmetric);
gchar** cryptui_prompt_recipients (CryptUIKeyset *keyset,
const gchar *title, gchar **signer);
diff --git a/libcryptui/tests/cryptui-test-ui.c b/libcryptui/tests/cryptui-test-ui.c
index 1852b58..19183d6 100644
--- a/libcryptui/tests/cryptui-test-ui.c
+++ b/libcryptui/tests/cryptui-test-ui.c
@@ -62,12 +62,14 @@ show_ui_dialog (CryptUIKeyset *keyset)
}
static void
-show_chooser_dialog (CryptUIKeyset *keyset)
+show_chooser_dialog (CryptUIKeyset *keyset, gboolean support_symmetric)
{
gchar **recipients, **k;
gchar *signer;
+ gboolean symmetric;
- recipients = cryptui_prompt_recipients (keyset, "Choose Recipients", &signer);
+ recipients = cryptui_prompt_recipients_with_symmetric (keyset, "Choose Recipients", &signer,
+ support_symmetric ? &symmetric : NULL);
if (recipients) {
for (k = recipients; *k; k++)
@@ -76,6 +78,8 @@ show_chooser_dialog (CryptUIKeyset *keyset)
g_print ("SIGNER: %s\n", signer);
g_free (signer);
}
+ if (support_symmetric)
+ g_print ("SYMMETRIC: %s\n", symmetric ? "true" : "false");
}
static void
@@ -124,7 +128,9 @@ main (int argc, char **argv)
if (g_ascii_strcasecmp (arg, "plain") == 0)
show_ui_dialog (keyset);
else if (g_ascii_strcasecmp (arg, "normal") == 0)
- show_chooser_dialog (keyset);
+ show_chooser_dialog (keyset, FALSE);
+ else if (g_ascii_strcasecmp (arg, "symmetric") == 0)
+ show_chooser_dialog (keyset, TRUE);
else if (g_ascii_strcasecmp (arg, "keyset") == 0)
print_keyset (keyset);
else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
