/* passphrase.c - GTK+ based passphrase callback
- * Copyright (C) 2001 Werner Koch (dd9jn)
+ * Copyright (C) 2001-2016 Werner Koch (dd9jn) and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifdef HAVE_CONFIG_H
#include <glib.h>
#include <glib/gi18n.h>
-#include <gdk/gdktypes.h>
+#include <gdk/gdk.h>
#include <gdk/gdkkeysyms.h>
-#include <gdk/gdkdisplay.h>
#ifdef GDK_WINDOWING_X11
# include <gdk/gdkx.h>
#endif /* GDK_WINDOWING_X11 */
-#include <gtk/gtkmain.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkfilesel.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
#include <string.h>
#include <sys/types.h>
#ifdef G_OS_WIN32
-#include <windows.h>
+#include <w32lib.h>
#else
#include <sys/mman.h>
#endif
gpointer data);
static gboolean passphrase_key_pressed(GtkWidget *widget, GdkEventKey *event,
gpointer data);
-static gchar* passphrase_mbox(const gchar *uid_hint, const gchar *pass_hint,
- gint prev_bad);
-static GtkWidget *create_description(const gchar *uid_hint,
- const gchar *pass_hint, gint prev_bad);
+static GtkWidget *create_description(const gchar *uid_hint, gint prev_bad, gint new_key);
void
gpgmegtk_set_passphrase_grab(gint yes)
grab_all = yes;
}
-static gchar*
-passphrase_mbox(const gchar *uid_hint, const gchar *pass_hint, gint prev_bad)
+gchar*
+passphrase_mbox(const gchar *uid_hint, const gchar *pass_hint, gint prev_bad, gint new_key)
{
gchar *the_passphrase = NULL;
GtkWidget *vbox, *hbox;
GtkWidget *pass_entry;
GtkWidget *ok_button;
GtkWidget *cancel_button;
+ GdkWindow *gdkwin;
SummaryView *summaryview = mainwindow_get_mainwindow()->summaryview;
gtk_menu_popdown(GTK_MENU(summaryview->popupmenu));
- window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "passphrase");
gtk_window_set_title(GTK_WINDOW(window), _("Passphrase"));
- gtk_widget_set_size_request(window, 450, -1);
+ gtk_window_set_default_size(GTK_WINDOW(window), 375, 100);
+ gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+ gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
gtk_window_set_modal(GTK_WINDOW(window), TRUE);
- gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(passphrase_deleted), NULL);
g_signal_connect(G_OBJECT(window), "key_press_event",
if (uid_hint || pass_hint) {
GtkWidget *label, *icon;
- label = create_description (uid_hint, pass_hint, prev_bad);
+ label = create_description (uid_hint, prev_bad, new_key);
icon = gtk_image_new_from_stock(GTK_STOCK_DIALOG_AUTHENTICATION,
GTK_ICON_SIZE_DIALOG);
gtk_entry_set_visibility(GTK_ENTRY(pass_entry), FALSE);
gtk_widget_grab_focus(pass_entry);
- gtkut_stock_button_set_create(&confirm_box, &ok_button, GTK_STOCK_OK,
+ gtkut_stock_button_set_create(&confirm_box,
&cancel_button, GTK_STOCK_CANCEL,
+ &ok_button, GTK_STOCK_OK,
NULL, NULL);
+
gtk_box_pack_end(GTK_BOX(vbox), confirm_box, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_button);
gtk_window_set_position (GTK_WINDOW(window), GTK_WIN_POS_CENTER);
if (grab_all)
- gtk_window_set_policy (GTK_WINDOW(window), FALSE, FALSE, TRUE);
+ gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
gtk_widget_show_all(window);
int err = 0, cnt = 0;
/* make sure that window is viewable */
gtk_widget_show_now(window);
- gdk_window_process_updates(window->window, TRUE);
+ gdkwin = gtk_widget_get_window(window);
+ gdk_window_process_updates(gdkwin, TRUE);
gdk_flush();
while(gtk_events_pending()) {
gtk_main_iteration();
}
try_again:
- if ((err = gdk_pointer_grab(window->window, TRUE, 0,
- window->window, NULL, GDK_CURRENT_TIME))) {
+ if ((err = gdk_pointer_grab(gdkwin, TRUE, 0,
+ gdkwin, NULL, GDK_CURRENT_TIME))) {
if (err == GDK_GRAB_NOT_VIEWABLE && cnt < 10) {
cnt++;
- g_warning("trying to grab mouse again\n");
+ g_warning("trying to grab mouse again");
gtk_main_iteration();
goto try_again;
} else {
- g_warning("OOPS: Could not grab mouse\n");
+ g_warning("OOPS: Could not grab mouse");
gtk_widget_destroy(window);
return NULL;
}
}
- if (gdk_keyboard_grab(window->window, FALSE, GDK_CURRENT_TIME)) {
+ if (gdk_keyboard_grab(gdkwin, FALSE, GDK_CURRENT_TIME)) {
gdk_display_pointer_ungrab(gdk_display_get_default(),
GDK_CURRENT_TIME);
- g_warning("OOPS: Could not grab keyboard\n");
+ g_warning("OOPS: Could not grab keyboard");
gtk_widget_destroy(window);
return NULL;
}
if (pass_ack) {
const gchar *entry_text;
entry_text = gtk_entry_get_text(GTK_ENTRY(pass_entry));
- if (entry_text) /* Hmmm: Do we really need this? */
+ the_passphrase = g_locale_from_utf8(entry_text, -1, NULL, NULL, NULL);
+ if (the_passphrase == NULL)
the_passphrase = g_strdup (entry_text);
}
gtk_widget_destroy (window);
static gboolean
passphrase_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
passphrase_cancel_cb(NULL, NULL);
return FALSE;
}
}
static GtkWidget *
-create_description(const gchar *uid_hint, const gchar *pass_hint, gint prev_bad)
+create_description(const gchar *uid_hint, gint prev_bad, gint new_key)
{
- const gchar *uid = NULL, *info = NULL;
+ const gchar *uid = NULL;
gchar *buf;
GtkWidget *label;
gchar *my_uid = NULL;
uid = _("[no user id]");
else
uid = uid_hint;
- if (!pass_hint)
- info = "";
- else
- info = pass_hint;
my_uid = g_strdup(uid);
while (strchr(my_uid, '<'))
while (strchr(my_uid, '>'))
*(strchr(my_uid, '>')) = ')';
- buf = g_strdup_printf (_("<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</span>\n\n"
- "%.*s\n"),
+ if (new_key == 1) {
+ buf = g_strdup_printf (g_strconcat("<span weight=\"bold\" size=\"larger\">%s",
+ _("Please enter the passphrase for the new key:"),
+ "</span>\n\n%.*s\n", NULL),
+ prev_bad ?
+ _("Passphrases did not match.\n") : "",
+ linelen (my_uid), my_uid);
+ } else if (new_key == 2) {
+ buf = g_strdup_printf (g_strconcat("<span weight=\"bold\" size=\"larger\">",
+ _("Please re-enter the passphrase for the new key:"),
+ "</span>\n\n%.*s\n", NULL),
+ linelen (my_uid), my_uid);
+ } else {
+ buf = g_strdup_printf (g_strconcat("<span weight=\"bold\" size=\"larger\">%s",
+ _("Please enter the passphrase for:"),
+ "</span>\n\n%.*s\n", NULL),
prev_bad ?
_("Bad passphrase.\n") : "",
linelen (my_uid), my_uid);
+ }
g_free(my_uid);
label = gtk_label_new (buf);
gtk_label_set_use_markup(GTK_LABEL (label), TRUE);
static int free_passphrase(gpointer _unused)
{
if (last_pass != NULL) {
-#ifndef G_OS_WIN32
+#ifndef G_PLATFORM_WIN32
munlock(last_pass, strlen(last_pass));
#endif
g_free(last_pass);
last_pass = NULL;
- debug_print("%% passphrase removed");
+ debug_print("%% passphrase removed\n");
}
return FALSE;
gpgmegtk_passphrase_cb(void *opaque, const char *uid_hint,
const char *passphrase_hint, int prev_bad, int fd)
{
- const char *pass;
+ char *pass = NULL;
if (prefs_gpg_get_config()->store_passphrase && last_pass && !prev_bad)
- pass = last_pass;
- else {
- gpgmegtk_set_passphrase_grab (prefs_gpg_get_config()->passphrase_grab);
- debug_print ("%% requesting passphrase for '%s': ", uid_hint);
- pass = passphrase_mbox (uid_hint, passphrase_hint, prev_bad);
- gpgmegtk_free_passphrase();
- if (!pass) {
- debug_print ("%% cancel passphrase entry");
- write(fd, "\n", 1);
- return GPG_ERR_CANCELED;
- }
+ pass = g_strdup(last_pass);
else {
- if (prefs_gpg_get_config()->store_passphrase) {
- last_pass = g_strdup(pass);
-#ifndef G_OS_WIN32
- if (mlock(last_pass, strlen(last_pass)) == -1)
- debug_print("%% locking passphrase failed");
+ gpgmegtk_set_passphrase_grab (prefs_gpg_get_config()->passphrase_grab);
+ debug_print ("%% requesting passphrase for '%s'\n", uid_hint);
+ pass = passphrase_mbox (uid_hint, passphrase_hint, prev_bad, FALSE);
+ gpgmegtk_free_passphrase();
+ if (!pass) {
+ debug_print ("%% cancel passphrase entry\n");
+ if (write(fd, "\n", 1) != 1)
+ debug_print("short write\n");
+
+ return GPG_ERR_CANCELED;
+ }
+ else {
+ if (prefs_gpg_get_config()->store_passphrase) {
+ last_pass = g_strdup(pass);
+#ifndef G_PLATFORM_WIN32
+ if (mlock(last_pass, strlen(last_pass)) == -1)
+ debug_print("%% locking passphrase failed\n");
#endif
- if (prefs_gpg_get_config()->store_passphrase_timeout > 0) {
- gtk_timeout_add(prefs_gpg_get_config()
- ->store_passphrase_timeout*60*1000,
- free_passphrase, NULL);
+ if (prefs_gpg_get_config()->store_passphrase_timeout > 0) {
+ g_timeout_add(prefs_gpg_get_config()
+ ->store_passphrase_timeout*60*1000,
+ free_passphrase, NULL);
+ }
}
- }
- debug_print ("%% sending passphrase");
- }
+ debug_print ("%% sending passphrase\n");
+ }
}
#ifdef G_OS_WIN32
WriteFile ((HANDLE)fd, "\n", 1, &nwritten, NULL);
}
#else
- write(fd, pass, strlen(pass));
- write(fd, "\n", 1);
+ if (write(fd, pass, strlen(pass)) != strlen(pass))
+ debug_print("short write\n");
+
+ if (write(fd, "\n", 1) != 1)
+ debug_print("short write\n");
#endif
+ g_free(pass);
+
return GPG_ERR_NO_ERROR;
}
projects / claws.git / blobdiff