ykcs11: fixed uninitialized sessions when cleaning up functions

Yubico · Jan 28, 2020 · e8ff8f6 · e8ff8f6
1 parent 8947e6c
commit e8ff8f6
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/ykcs11/ykcs11.c b/ykcs11/ykcs11.c
@@ -2712,7 +2712,7 @@ CK_DEFINE_FUNCTION(CK_RV, C_DigestFinal)(
 digest_out:
   session->op_info.type = YKCS11_NOOP;
   DOUT;
-  return CKR_OK;
+  return rv;
 }
 
 CK_DEFINE_FUNCTION(CK_RV, C_SignInit)(
@@ -2891,16 +2891,16 @@ CK_DEFINE_FUNCTION(CK_RV, C_SignUpdate)(
 
   if (!pid) {
     DBG("libykpiv is not initialized or already finalized");
-    rv = CKR_CRYPTOKI_NOT_INITIALIZED;
-    goto sign_out;
+    DOUT;
+    return CKR_CRYPTOKI_NOT_INITIALIZED;
   }
 
   ykcs11_session_t* session = get_session(hSession);
 
   if (session == NULL || session->slot == NULL) {
     DBG("Session is not open");
-    rv = CKR_SESSION_HANDLE_INVALID;
-    goto sign_out;
+    DOUT;
+    return CKR_SESSION_HANDLE_INVALID;
   }
 
   if (session->op_info.type != YKCS11_SIGN) {
@@ -3174,16 +3174,16 @@ CK_DEFINE_FUNCTION(CK_RV, C_VerifyUpdate)(
 
   if (!pid) {
     DBG("libykpiv is not initialized or already finalized");
-    rv = CKR_CRYPTOKI_NOT_INITIALIZED;
-    goto verify_out;
+    DOUT;
+    return CKR_CRYPTOKI_NOT_INITIALIZED;
   }
 
   ykcs11_session_t* session = get_session(hSession);
 
   if (session == NULL || session->slot == NULL) {
     DBG("Session is not open");
-    rv = CKR_SESSION_HANDLE_INVALID;
-    goto verify_out;
+    DOUT;
+    return CKR_SESSION_HANDLE_INVALID;
   }
 
   if (pPart == NULL) {