aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--smime/ChangeLog8
-rw-r--r--smime/gui/component.c4
-rw-r--r--smime/lib/e-pkcs12.c2
3 files changed, 11 insertions, 3 deletions
diff --git a/smime/ChangeLog b/smime/ChangeLog
index 96dc10e197..619807aeb4 100644
--- a/smime/ChangeLog
+++ b/smime/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-31 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #378759
+
+ * gui/component.c: (smime_pk11_passwd), (smime_pk11_change_passwd):
+ * lib/e-pkcs12.c: (prompt_for_password):
+ Do not pass NULL as 'key' parameter.
+
2007-07-30 Andre Klapper <a9016009@gmx.de>
* gui/smime-ui.glade:
diff --git a/smime/gui/component.c b/smime/gui/component.c
index 5fcd6c0478..5a8438dfd7 100644
--- a/smime/gui/component.c
+++ b/smime/gui/component.c
@@ -47,7 +47,7 @@ smime_pk11_passwd (ECertDB *db, PK11SlotInfo* slot, gboolean retry, char **passw
prompt = g_strdup_printf (_("Enter the password for `%s'"), slot_name);
g_free (slot_name);
- *passwd = e_passwords_ask_password (_("Enter password"), "SMIME-PKCS11", NULL,
+ *passwd = e_passwords_ask_password (_("Enter password"), "SMIME-PKCS11", "",
prompt,
E_PASSWORDS_REMEMBER_NEVER|E_PASSWORDS_SECRET, NULL,
NULL);
@@ -69,7 +69,7 @@ smime_pk11_change_passwd (ECertDB *db, char **old_passwd, char **passwd, gpointe
/* we're setting the password initially */
prompt = _("Enter new password for certificate database");
- *passwd = e_passwords_ask_password (_("Enter new password"), "SMIME-PKCS11", NULL,
+ *passwd = e_passwords_ask_password (_("Enter new password"), "SMIME-PKCS11", "",
prompt,
E_PASSWORDS_REMEMBER_NEVER|E_PASSWORDS_SECRET, NULL,
NULL);
diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c
index d67767679e..49ba602567 100644
--- a/smime/lib/e-pkcs12.c
+++ b/smime/lib/e-pkcs12.c
@@ -219,7 +219,7 @@ prompt_for_password (char *title, char *prompt, SECItem *pwd)
{
char *passwd;
- passwd = e_passwords_ask_password (title, "SMIME-PKCS12", NULL, prompt,
+ passwd = e_passwords_ask_password (title, "SMIME-PKCS12", "", prompt,
E_PASSWORDS_REMEMBER_NEVER|E_PASSWORDS_SECRET, NULL,
NULL);