From c717f1f715eb79651c968b7c51752bb46222df24 Mon Sep 17 00:00:00 2001 From: c20liu Date: Thu, 15 Jul 2021 10:49:43 +0800 Subject: [PATCH] According to the PKCS11 specification, modify the return value type of key-related operations --- src/lib/SoftHSM.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/lib/SoftHSM.cpp b/src/lib/SoftHSM.cpp index dac68a3c6..e2f4f148c 100644 --- a/src/lib/SoftHSM.cpp +++ b/src/lib/SoftHSM.cpp @@ -2163,7 +2163,7 @@ CK_RV SoftHSM::SymEncryptInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMech // Check the key handle. OSObject *key = (OSObject *)handleManager->getObject(hKey); - if (key == NULL_PTR || !key->isValid()) return CKR_OBJECT_HANDLE_INVALID; + if (key == NULL_PTR || !key->isValid()) return CKR_KEY_HANDLE_INVALID; CK_BBOOL isOnToken = key->getBooleanValue(CKA_TOKEN, false); CK_BBOOL isPrivate = key->getBooleanValue(CKA_PRIVATE, true); @@ -2410,7 +2410,7 @@ CK_RV SoftHSM::AsymEncryptInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMec // Check the key handle. OSObject *key = (OSObject *)handleManager->getObject(hKey); - if (key == NULL_PTR || !key->isValid()) return CKR_OBJECT_HANDLE_INVALID; + if (key == NULL_PTR || !key->isValid()) return CKR_KEY_HANDLE_INVALID; CK_BBOOL isOnToken = key->getBooleanValue(CKA_TOKEN, false); CK_BBOOL isPrivate = key->getBooleanValue(CKA_PRIVATE, true); @@ -2882,7 +2882,7 @@ CK_RV SoftHSM::SymDecryptInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMech // Check the key handle. OSObject *key = (OSObject *)handleManager->getObject(hKey); - if (key == NULL_PTR || !key->isValid()) return CKR_OBJECT_HANDLE_INVALID; + if (key == NULL_PTR || !key->isValid()) return CKR_KEY_HANDLE_INVALID; CK_BBOOL isOnToken = key->getBooleanValue(CKA_TOKEN, false); CK_BBOOL isPrivate = key->getBooleanValue(CKA_PRIVATE, true); @@ -3130,7 +3130,7 @@ CK_RV SoftHSM::AsymDecryptInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMec // Check the key handle. OSObject *key = (OSObject *)handleManager->getObject(hKey); - if (key == NULL_PTR || !key->isValid()) return CKR_OBJECT_HANDLE_INVALID; + if (key == NULL_PTR || !key->isValid()) return CKR_KEY_HANDLE_INVALID; CK_BBOOL isOnToken = key->getBooleanValue(CKA_TOKEN, false); CK_BBOOL isPrivate = key->getBooleanValue(CKA_PRIVATE, true); @@ -3924,7 +3924,7 @@ CK_RV SoftHSM::MacSignInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechani // Check the key handle. OSObject *key = (OSObject *)handleManager->getObject(hKey); - if (key == NULL_PTR || !key->isValid()) return CKR_OBJECT_HANDLE_INVALID; + if (key == NULL_PTR || !key->isValid()) return CKR_KEY_HANDLE_INVALID; CK_BBOOL isOnToken = key->getBooleanValue(CKA_TOKEN, false); CK_BBOOL isPrivate = key->getBooleanValue(CKA_PRIVATE, true); @@ -4076,7 +4076,7 @@ CK_RV SoftHSM::AsymSignInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechan // Check the key handle. OSObject *key = (OSObject *)handleManager->getObject(hKey); - if (key == NULL_PTR || !key->isValid()) return CKR_OBJECT_HANDLE_INVALID; + if (key == NULL_PTR || !key->isValid()) return CKR_KEY_HANDLE_INVALID; CK_BBOOL isOnToken = key->getBooleanValue(CKA_TOKEN, false); CK_BBOOL isPrivate = key->getBooleanValue(CKA_PRIVATE, true); @@ -4902,7 +4902,7 @@ CK_RV SoftHSM::MacVerifyInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMecha // Check the key handle. OSObject *key = (OSObject *)handleManager->getObject(hKey); - if (key == NULL_PTR || !key->isValid()) return CKR_OBJECT_HANDLE_INVALID; + if (key == NULL_PTR || !key->isValid()) return CKR_KEY_HANDLE_INVALID; CK_BBOOL isOnToken = key->getBooleanValue(CKA_TOKEN, false); CK_BBOOL isPrivate = key->getBooleanValue(CKA_PRIVATE, true); @@ -5054,7 +5054,7 @@ CK_RV SoftHSM::AsymVerifyInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMech // Check the key handle. OSObject *key = (OSObject *)handleManager->getObject(hKey); - if (key == NULL_PTR || !key->isValid()) return CKR_OBJECT_HANDLE_INVALID; + if (key == NULL_PTR || !key->isValid()) return CKR_KEY_HANDLE_INVALID; CK_BBOOL isOnToken = key->getBooleanValue(CKA_TOKEN, false); CK_BBOOL isPrivate = key->getBooleanValue(CKA_PRIVATE, true); @@ -7255,7 +7255,7 @@ CK_RV SoftHSM::C_DeriveKey // Check the key handle. OSObject *key = (OSObject *)handleManager->getObject(hBaseKey); - if (key == NULL_PTR || !key->isValid()) return CKR_OBJECT_HANDLE_INVALID; + if (key == NULL_PTR || !key->isValid()) return CKR_KEY_HANDLE_INVALID; CK_BBOOL isKeyOnToken = key->getBooleanValue(CKA_TOKEN, false); CK_BBOOL isKeyPrivate = key->getBooleanValue(CKA_PRIVATE, true); @@ -11570,7 +11570,7 @@ CK_RV SoftHSM::deriveSymmetric // Check the key handle OSObject *baseKey = (OSObject *)handleManager->getObject(hBaseKey); - if (baseKey == NULL_PTR || !baseKey->isValid()) return CKR_OBJECT_HANDLE_INVALID; + if (baseKey == NULL_PTR || !baseKey->isValid()) return CKR_KEY_HANDLE_INVALID; // Get the data ByteString secretValue;