rebase and fix CI

Author: aidangarske

src/internal.c

@@ -6973,8 +6973,8 @@ int WP11_Slot_IsLoggedIn(WP11_Slot* slot)
 
 void WP11_Slot_Logout(WP11_Slot* slot)
 {
-    int state;
 #ifndef WOLFPKCS11_NO_STORE
+    int state;
     int ret = 0;
 #endif
 
@@ -6988,15 +6988,9 @@ void WP11_Slot_Logout(WP11_Slot* slot)
             ret = wp11_Object_Encode(object, 1);
             object = object->next;
         }
-    }
-#else
-    state = slot->token.loginState;
-#endif
-    /* Zero token key only on user logout — SO logout must preserve it
-     * for subsequent object encryption (e.g., empty-PIN flow). */
-    if (state == WP11_APP_STATE_RO_USER || state == WP11_APP_STATE_RW_USER) {
         wc_ForceZero(slot->token.key, sizeof(slot->token.key));
     }
+#endif
     slot->token.loginState = WP11_APP_STATE_RW_PUBLIC;
 
     WP11_Lock_UnlockRW(&slot->lock);
@@ -9196,14 +9190,16 @@ int WP11_Object_Find(WP11_Session* session, CK_OBJECT_HANDLE objHandle,
          * module without calling C_Login. */
         if ((obj->opFlag & WP11_FLAG_PRIVATE) == WP11_FLAG_PRIVATE) {
             int loginState;
+            int hasEmptyPin;
             WP11_Lock_LockRO(&session->slot->lock);
             loginState = session->slot->token.loginState;
-            if (!WP11_Slot_Has_Empty_Pin(session->slot) &&
+            WP11_Lock_UnlockRO(&session->slot->lock);
+            hasEmptyPin = WP11_Slot_Has_Empty_Pin(session->slot);
+            if (!hasEmptyPin &&
                 (loginState == WP11_APP_STATE_RW_PUBLIC ||
                  loginState == WP11_APP_STATE_RO_PUBLIC)) {
                 ret = BAD_FUNC_ARG;
             }
-            WP11_Lock_UnlockRO(&session->slot->lock);
         }
 #endif
         if (ret == 0)

tests/pkcs11mtt.c

@@ -71,9 +71,7 @@ static CK_OBJECT_CLASS pubKeyClass     = CKO_PUBLIC_KEY;
 static CK_OBJECT_CLASS privKeyClass    = CKO_PRIVATE_KEY;
 static CK_OBJECT_CLASS secretKeyClass  = CKO_SECRET_KEY;
 
-#if defined(HAVE_ECC) || !defined(NO_DH)
 static CK_BBOOL ckFalse = CK_FALSE;
-#endif
 static CK_BBOOL ckTrue  = CK_TRUE;
 
 #ifndef NO_RSA