Finish fixes to resolve stray object store files.

Author: dgarske

src/crypto.c

@@ -884,7 +884,7 @@ static CK_RV AddRSAPrivateKeyObject(WP11_Session* session,
 err_out:
     if (rv != CKR_OK) {
         if (*phKey != CK_INVALID_HANDLE) {
-            WP11_Session_RemoveObject(session, privKeyObject);
+            rv = WP11_Session_RemoveObject(session, privKeyObject);
             *phKey = CK_INVALID_HANDLE;
         }
         if (privKeyObject != NULL) {
@@ -1050,7 +1050,7 @@ CK_RV C_CreateObject(CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pTemplate,
     }
     rv = AddObject(session, object, pTemplate, ulCount, phObject);
     if (rv != CKR_OK) {
-        WP11_Session_RemoveObject(session, object);
+        rv = WP11_Session_RemoveObject(session, object);
         WP11_Object_Free(object);
     }
 
@@ -1232,10 +1232,9 @@ CK_RV C_DestroyObject(CK_SESSION_HANDLE hSession,
         return rv;
     }
 
-    WP11_Session_RemoveObject(session, obj);
+    rv = WP11_Session_RemoveObject(session, obj);
     WP11_Object_Free(obj);
 
-    rv = CKR_OK;
     WOLFPKCS11_LEAVE("C_DestroyObject", rv);
     return rv;
 }
@@ -6731,7 +6730,7 @@ CK_RV C_UnwrapKey(CK_SESSION_HANDLE hSession,
             }
             if (rv != CKR_OK) {
                 if (*phKey != CK_INVALID_HANDLE) {
-                    WP11_Session_RemoveObject(session, keyObj);
+                    rv = WP11_Session_RemoveObject(session, keyObj);
                     *phKey = CK_INVALID_HANDLE;
                 }
                 if (keyObj != NULL) {

src/internal.c

@@ -763,7 +763,8 @@ static void wp11_Session_Final(WP11_Session* session)
     if (session->inUse) {
         /* Free objects in session. */
         while ((obj = session->object) != NULL) {
-            WP11_Session_RemoveObject(session, obj);
+            /* ignore return value, logged in function */
+            (void)WP11_Session_RemoveObject(session, obj);
             WP11_Object_Free(obj);
         }
         session->inUse = 0;
@@ -4260,7 +4261,7 @@ static int wp11_Object_Unstore(WP11_Object* object, int tokenId, int objId)
         return BAD_FUNC_ARG;
     }
 
-    /* Remove store and key object */
+    /* Remove store object */
     ret = wp11_storage_remove(WOLFPKCS11_STORE_OBJECT, tokenId, objId);
     if (ret != 0) {
         return ret;
@@ -4310,6 +4311,7 @@ static int wp11_Object_Unstore(WP11_Object* object, int tokenId, int objId)
             break;
         }
     }
+    /* remove actual object by type */
     return wp11_storage_remove(storeObjType, tokenId, objId);
 }
 #endif /* !WOLFPKCS11_NO_STORE */
@@ -6521,12 +6523,16 @@ int WP11_Session_AddObject(WP11_Session* session, int onToken,
  *
  * @param  session  [in]  Session object.
  * @param  object   [in]  Key Object object.
+ * @return  -ve on failure.
+ *          0 on success.
  */
-void WP11_Session_RemoveObject(WP11_Session* session, WP11_Object* object)
+int WP11_Session_RemoveObject(WP11_Session* session, WP11_Object* object)
 {
+    int ret = 0;
     WP11_Object** curr;
     WP11_Token* token;
     int id;
+
 #ifdef WOLFPKCS11_NSS
     if (object->session && (session != object->session))
         session = object->session;
@@ -6549,34 +6555,55 @@ void WP11_Session_RemoveObject(WP11_Session* session, WP11_Object* object)
         WP11_Lock_LockRW(&session->slot->token.lock);
     }
 
+    /* walk list to get id for object to remove */
     while (*curr != NULL) {
         if (*curr == object) {
             *curr = object->next;
             break;
         }
+
+    #ifndef WOLFPKCS11_NO_STORE
+        if (object->onToken) {
+            /* remove any id's with higher value */
+            ret = wp11_Object_Unstore(*curr, (int)session->slotId, id);
+        #ifdef DEBUG_WOLFPKCS11
+            if (ret != 0) {
+                printf("Failed to unstore slot %d, id: %d, ret: %d, continuing...\n",
+                    (int)session->slotId, id, ret);
+            }
+        #endif
+        }
+    #endif
+
         curr = &(*curr)->next;
         /* Id of next object as it isn't the one being removed. */
         id--;
     }
+
     if (object->onToken) {
 #ifndef WOLFPKCS11_NO_STORE
-        int ret = wp11_Object_Unstore(object, (int)session->slotId, id);
-        if (ret == 0) {
-            ret = wp11_Slot_Store(session->slot, (int)session->slotId);
+        ret = wp11_Object_Unstore(object, (int)session->slotId, id);
+    #ifdef DEBUG_WOLFPKCS11
+        if (ret != 0) {
+            printf("Failed to unstore slot %d, id: %d, ret: %d\n",
+                (int)session->slotId, id, ret);
         }
+    #endif
+        /* re-store the token */
+        ret = wp11_Slot_Store(session->slot, (int)session->slotId);
     #ifdef DEBUG_WOLFPKCS11
         if (ret != 0) {
-            printf("Failed to unstore slot %d, ret: %d\n",
+            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);
     }
     else {
         WP11_Lock_UnlockRW(&session->slot->token.lock);
     }
+    return ret;
 }
 
 /**

wolfpkcs11/internal.h

@@ -358,7 +358,7 @@ WP11_LOCAL int WP11_Session_SetCtsParams(WP11_Session* session, unsigned char* i
                               int enc, WP11_Object* object);
 WP11_LOCAL int WP11_Session_AddObject(WP11_Session* session, int onToken,
                            WP11_Object* object);
-WP11_LOCAL void WP11_Session_RemoveObject(WP11_Session* session, WP11_Object* object);
+WP11_LOCAL int WP11_Session_RemoveObject(WP11_Session* session, WP11_Object* object);
 WP11_LOCAL void WP11_Session_GetObject(WP11_Session* session, WP11_Object** object);
 WP11_LOCAL void WP11_Session_SetObject(WP11_Session* session, WP11_Object* object);