On failure cleanups, don't override the failure return code.

Author: dgarske

src/crypto.c

@@ -884,7 +884,8 @@ static CK_RV AddRSAPrivateKeyObject(WP11_Session* session,
 err_out:
     if (rv != CKR_OK) {
         if (*phKey != CK_INVALID_HANDLE) {
-            rv = WP11_Session_RemoveObject(session, privKeyObject);
+            /* ignore return value, logged in function */
+            (void)WP11_Session_RemoveObject(session, privKeyObject);
             *phKey = CK_INVALID_HANDLE;
         }
         if (privKeyObject != NULL) {
@@ -1050,7 +1051,8 @@ CK_RV C_CreateObject(CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pTemplate,
     }
     rv = AddObject(session, object, pTemplate, ulCount, phObject);
     if (rv != CKR_OK) {
-        rv = WP11_Session_RemoveObject(session, object);
+        /* ignore return value, logged in function */
+        (void)WP11_Session_RemoveObject(session, object);
         WP11_Object_Free(object);
     }
 
@@ -6730,7 +6732,8 @@ CK_RV C_UnwrapKey(CK_SESSION_HANDLE hSession,
             }
             if (rv != CKR_OK) {
                 if (*phKey != CK_INVALID_HANDLE) {
-                    rv = WP11_Session_RemoveObject(session, keyObj);
+                    /* ignore return value, logged in function */
+                    (void)WP11_Session_RemoveObject(session, keyObj);
                     *phKey = CK_INVALID_HANDLE;
                 }
                 if (keyObj != NULL) {