[evolution/evolution-3-12] Bug 741059 - Prompts for login PIN with CKF_PROTECTED_AUTHENTICATION_PATH

[dwmw2 <dwmw2 src gnome org>]

commit 99184975e80f6db542dc363a4c51d74758016088
Author: David Woodhouse <David Woodhouse intel com>
Date:   Mon Dec 8 14:08:20 2014 +0000

    Bug 741059 - Prompts for login PIN with CKF_PROTECTED_AUTHENTICATION_PATH
    
    This turns out to be relatively simple to fix. Based on the patch in
    http://bugzilla.mozilla.org/show_bug.cgi?id=229023
    
    (cherry picked from commit 080e9fa33f57eb909555b439c0015d54bfb701dc)

 smime/lib/e-cert-db.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c
index abb07be..21b167c 100644
--- a/smime/lib/e-cert-db.c
+++ b/smime/lib/e-cert-db.c
@@ -387,6 +387,11 @@ pk11_password (PK11SlotInfo *slot,
 
        gboolean rv = FALSE;
 
+       /* For tokens with CKF_PROTECTED_AUTHENTICATION_PATH we
+        * need to return a non-empty but unused password */
+       if (PK11_ProtectedAuthenticationPath(slot))
+               return PORT_Strdup("");
+
        g_signal_emit (
                e_cert_db_peek (),
                e_cert_db_signals[PK11_PASSWD], 0,