aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--smime/ChangeLog6
-rw-r--r--smime/lib/e-cert-db.c1
2 files changed, 7 insertions, 0 deletions
diff --git a/smime/ChangeLog b/smime/ChangeLog
index 09c0d9c029..f3749f528b 100644
--- a/smime/ChangeLog
+++ b/smime/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-13 Not Zed <NotZed@Ximian.com>
+
+ * lib/e-cert-db.c (e_cert_db_login_to_slot): call SetPasswordFunc
+ before calling authenticate - some nss calls can overwrite the
+ setting. #52820.
+
2004-04-30 Chris Toshok <toshok@ximian.com>
[ fixes bug #52724 ]
diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c
index 7831572097..6141501f45 100644
--- a/smime/lib/e-cert-db.c
+++ b/smime/lib/e-cert-db.c
@@ -1157,6 +1157,7 @@ e_cert_db_login_to_slot (ECertDB *cert_db,
PK11_InitPin (slot, "", pwd);
}
+ PK11_SetPasswordFunc(pk11_password);
if (PK11_Authenticate (slot, PR_TRUE, NULL) != SECSuccess) {
printf ("PK11_Authenticate failed (err = %d/%d)\n", PORT_GetError(), PORT_GetError() + 0x2000);
return FALSE;