Improve PKCS11 store error return code logic.

Author: dgarske

src/internal.c

@@ -4367,9 +4367,16 @@ static int wp11_Token_Store(WP11_Token* token, int tokenId)
         wp11_storage_close(storage);
 
         object = token->object;
-        for (i = token->objCnt - 1; (ret == 0) && (i >= 0); i--) {
+        for (i = token->objCnt - 1; i >= 0; i--) {
             /* Write the objects. */
             ret = wp11_Object_Store(object, tokenId, i);
+            if (ret != 0) {
+            #if DEBUG_WOLFPKCS11
+                printf("Failed to store object %d, token %d, ret: %d\n",
+                    i, tokenId, ret);
+            #endif
+                break;
+            }
             object = object->next;
         }
     }
@@ -4637,8 +4644,15 @@ void WP11_Library_Final(void)
     if (cnt == 0) {
 #ifndef WOLFPKCS11_NO_STORE
         /* Store the slots. */
-        for (i = 0; i < slotCnt; i++)
-            wp11_Slot_Store(&slotList[i], i + 1);
+        for (i = 0; i < slotCnt; i++) {
+            int ret = wp11_Slot_Store(&slotList[i], i + 1);
+        #if DEBUG_WOLFPKCS11
+            if (ret != 0) {
+                printf("Failed to store slot %d, ret: %d\n", i + 1, ret);
+            }
+        #endif
+            (void)ret; /* store failure cannot be returned, so log and ignore */
+        }
 #endif
         /* Cleanup the slots. */
         for (i = 0; i < slotCnt; i++)
@@ -6179,7 +6193,7 @@ int WP11_Session_AddObject(WP11_Session* session, int onToken,
         }
     #ifndef WOLFPKCS11_NO_STORE
         if (ret == 0) {
-            wp11_Slot_Store(session->slot, (int)session->slotId);
+            ret = wp11_Slot_Store(session->slot, (int)session->slotId);
         }
     #endif
     }
@@ -6246,8 +6260,16 @@ void WP11_Session_RemoveObject(WP11_Session* session, WP11_Object* object)
     }
     if (object->onToken) {
 #ifndef WOLFPKCS11_NO_STORE
+        int ret;
         wp11_Object_Unstore(object, (int)session->slotId, id);
-        wp11_Slot_Store(session->slot, (int)session->slotId);
+        ret = wp11_Slot_Store(session->slot, (int)session->slotId);
+    #if DEBUG_WOLFPKCS11
+        if (ret != 0) {
+            printf("Failed to store slot %d, ret: %d\n",
+                (int)session->slotId, ret);
+        }
+    #endif
+        (void)ret; /* store failure cannot be returned, so log and ignore */
 #endif
         WP11_Lock_UnlockRW(object->lock);
     }