Bug 1320708, strsclnt: Avoid infloop if DB is created without passwor…

…d, r=kaie
sailfishos-mirror · Aug 23, 2017 · c4a923f · c4a923f
1 parent a10cf68
commit c4a923f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/cmd/strsclnt/strsclnt.c b/cmd/strsclnt/strsclnt.c
@@ -886,8 +886,10 @@ PRBool
 LoggedIn(CERTCertificate *cert, SECKEYPrivateKey *key)
 {
     if ((cert->slot) && (key->pkcs11Slot) &&
-        (PR_TRUE == PK11_IsLoggedIn(cert->slot, NULL)) &&
-        (PR_TRUE == PK11_IsLoggedIn(key->pkcs11Slot, NULL))) {
+        (!PK11_NeedLogin(cert->slot) ||
+         PR_TRUE == PK11_IsLoggedIn(cert->slot, NULL)) &&
+        (!PK11_NeedLogin(key->pkcs11Slot) ||
+         PR_TRUE == PK11_IsLoggedIn(key->pkcs11Slot, NULL))) {
         return PR_TRUE;
     }