diff --git a/usr/lib/pkcs11/api/api_interface.c b/usr/lib/pkcs11/api/api_interface.c index 99dfbf1b..6dbbf70c 100755 --- a/usr/lib/pkcs11/api/api_interface.c +++ b/usr/lib/pkcs11/api/api_interface.c @@ -439,7 +439,7 @@ CK_RV C_CloseSession(CK_SESSION_HANDLE hSession) if (fcn->ST_CloseSession) { // Map the Session to the slot session rv = fcn->ST_CloseSession(&rSession); - TRACE_DEBUG("Called STDLL rv = 0x%x\n", rv); + TRACE_DEVEL("Called STDLL rv = 0x%x\n", rv); // If the STDLL successfuly closed the session // we can free it.. Otherwise we will have to leave it // lying arround. @@ -452,7 +452,7 @@ CK_RV C_CloseSession(CK_SESSION_HANDLE hSession) // other applications have the token active. decr_sess_counts(rSession.slotID); } else - TRACE_DEBUG("fcn->ST_CloseSession failed:0x%x\n", rv); + TRACE_DEVEL("fcn->ST_CloseSession failed:0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -589,7 +589,7 @@ C_CreateObject(CK_SESSION_HANDLE hSession, // Map the Session to the slot session rv = fcn->ST_CreateObject(&rSession, pTemplate, ulCount, phObject); - TRACE_DEBUG("fcn->ST_CreateObject returned:0x%x\n", rv); + TRACE_DEVEL("fcn->ST_CreateObject returned:0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -647,7 +647,7 @@ C_Decrypt(CK_SESSION_HANDLE hSession, // Map the Session to the slot session rv = fcn->ST_Decrypt(&rSession, pEncryptedData, ulEncryptedDataLen, pData, pulDataLen); - TRACE_DEBUG("fcn->ST_Decrypt returned:0x%x\n", rv); + TRACE_DEVEL("fcn->ST_Decrypt returned:0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -704,7 +704,7 @@ C_DecryptDigestUpdate(CK_SESSION_HANDLE hSession, rv = fcn->ST_DecryptDigestUpdate(&rSession, pEncryptedPart, ulEncryptedPartLen, pPart, pulPartLen); - TRACE_DEBUG("fcn->ST_DecryptDigestUpdate returned:0x%x\n", rv); + TRACE_DEVEL("fcn->ST_DecryptDigestUpdate returned:0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -763,7 +763,7 @@ C_DecryptFinal(CK_SESSION_HANDLE hSession, if (fcn->ST_DecryptFinal) { // Map the Session to the slot session rv = fcn->ST_DecryptFinal(&rSession, pLastPart, pulLastPartLen); - TRACE_DEBUG("fcn->ST_DecryptFinal returned: 0x%x\n", rv); + TRACE_DEVEL("fcn->ST_DecryptFinal returned: 0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -817,7 +817,7 @@ C_DecryptInit(CK_SESSION_HANDLE hSession, if (fcn->ST_DecryptInit) { // Map the Session to the slot session rv = fcn->ST_DecryptInit(&rSession, pMechanism, hKey); - TRACE_DEBUG("fcn->ST_DecryptInit returned:0x%x\n", rv); + TRACE_DEVEL("fcn->ST_DecryptInit returned:0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -875,7 +875,7 @@ C_DecryptUpdate(CK_SESSION_HANDLE hSession, rv = fcn->ST_DecryptUpdate(&rSession, pEncryptedPart, ulEncryptedPartLen, pPart, pulPartLen); - TRACE_DEBUG("fcn->ST_DecryptUpdate:0x%x\n", rv); + TRACE_DEVEL("fcn->ST_DecryptUpdate:0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -929,7 +929,7 @@ C_DecryptVerifyUpdate(CK_SESSION_HANDLE hSession, rv = fcn->ST_DecryptVerifyUpdate(&rSession, pEncryptedPart, ulEncryptedPartLen, pPart, pulPartLen); - TRACE_DEBUG("fcn->ST_DecryptVerifyUpdate returned:0x%x\n", rv); + TRACE_DEVEL("fcn->ST_DecryptVerifyUpdate returned:0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -994,7 +994,7 @@ C_DeriveKey(CK_SESSION_HANDLE hSession, // Map the Session to the slot session rv = fcn->ST_DeriveKey(&rSession, pMechanism, hBaseKey, pTemplate, ulAttributeCount, phKey); - TRACE_DEBUG("fcn->ST_DeriveKey returned:0x%x\n", rv); + TRACE_DEVEL("fcn->ST_DeriveKey returned:0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -1043,7 +1043,7 @@ CK_RV C_DestroyObject(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject) if (fcn->ST_DestroyObject) { // Map the Session to the slot session rv = fcn->ST_DestroyObject(&rSession, hObject); - TRACE_DEBUG("fcn->ST_DestroyObject returned:0x%x\n", rv); + TRACE_DEVEL("fcn->ST_DestroyObject returned:0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -1094,7 +1094,7 @@ C_Digest(CK_SESSION_HANDLE hSession, // Map the Session to the slot session rv = fcn->ST_Digest(&rSession, pData, ulDataLen, pDigest, pulDigestLen); - TRACE_DEBUG("fcn->ST_Digest:0x%x\n", rv); + TRACE_DEVEL("fcn->ST_Digest:0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -1151,7 +1151,7 @@ C_DigestEncryptUpdate(CK_SESSION_HANDLE hSession, rv = fcn->ST_DigestEncryptUpdate(&rSession, pPart, ulPartLen, pEncryptedPart, pulEncryptedPartLen); - TRACE_DEBUG("fcn->ST_DigestEncryptUpdate returned:0x%x\n", rv); + TRACE_DEVEL("fcn->ST_DigestEncryptUpdate returned:0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -1200,7 +1200,7 @@ C_DigestFinal(CK_SESSION_HANDLE hSession, if (fcn->ST_DigestFinal) { // Map the Session to the slot session rv = fcn->ST_DigestFinal(&rSession, pDigest, pulDigestLen); - TRACE_DEBUG("fcn->ST_DigestFinal returned:0x%x\n", rv); + TRACE_DEVEL("fcn->ST_DigestFinal returned:0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -1249,7 +1249,7 @@ CK_RV C_DigestInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism) if (fcn->ST_DigestInit) { // Map the Session to the slot session rv = fcn->ST_DigestInit(&rSession, pMechanism); - TRACE_DEBUG("fcn->ST_DigestInit returned:0x%x\n", rv); + TRACE_DEVEL("fcn->ST_DigestInit returned:0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -1292,7 +1292,7 @@ CK_RV C_DigestKey(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hKey) if (fcn->ST_DigestKey) { // Map the Session to the slot session rv = fcn->ST_DigestKey(&rSession, hKey); - TRACE_DEVEL("fcn->ST_DigestKey returned:0x%x\n", rv); + TRACE_DEBUG("fcn->ST_DigestKey returned:0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -1337,7 +1337,7 @@ C_DigestUpdate(CK_SESSION_HANDLE hSession, if (fcn->ST_DigestUpdate) { // Map the Session to the slot session rv = fcn->ST_DigestUpdate(&rSession, pPart, ulPartLen); - TRACE_DEBUG("fcn->ST_DigestUpdate returned:0x%x\n", rv); + TRACE_DEVEL("fcn->ST_DigestUpdate returned:0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -1390,7 +1390,7 @@ C_Encrypt(CK_SESSION_HANDLE hSession, // Map the Session to the slot session rv = fcn->ST_Encrypt(&rSession, pData, ulDataLen, pEncryptedData, pulEncryptedDataLen); - TRACE_DEBUG("fcn->ST_Encrypt returned: 0x%x\n", rv); + TRACE_DEVEL("fcn->ST_Encrypt returned: 0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -1441,7 +1441,7 @@ C_EncryptFinal(CK_SESSION_HANDLE hSession, // Map the Session to the slot session rv = fcn->ST_EncryptFinal(&rSession, pLastEncryptedPart, pulLastEncryptedPartLen); - TRACE_DEBUG("fcn->ST_EncryptFinal: 0x%x\n", rv); + TRACE_DEVEL("fcn->ST_EncryptFinal: 0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -1545,7 +1545,7 @@ C_EncryptUpdate(CK_SESSION_HANDLE hSession, // Map the Session to the slot session rv = fcn->ST_EncryptUpdate(&rSession, pPart, ulPartLen, pEncryptedPart, pulEncryptedPartLen); - TRACE_DEBUG("fcn->ST_EncryptUpdate returned:0x%x\n", rv); + TRACE_DEVEL("fcn->ST_EncryptUpdate returned:0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -1669,7 +1669,7 @@ C_FindObjects(CK_SESSION_HANDLE hSession, // Map the Session to the slot session rv = fcn->ST_FindObjects(&rSession, phObject, ulMaxObjectCount, pulObjectCount); - TRACE_DEBUG("fcn->ST_FindObjects returned:0x%x\n", rv); + TRACE_DEVEL("fcn->ST_FindObjects returned:0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -1718,7 +1718,7 @@ CK_RV C_FindObjectsFinal(CK_SESSION_HANDLE hSession) if (fcn->ST_FindObjectsFinal) { // Map the Session to the slot session rv = fcn->ST_FindObjectsFinal(&rSession); - TRACE_DEBUG("fcn->ST_FindObjectsFinal returned: 0x%x\n", rv); + TRACE_DEVEL("fcn->ST_FindObjectsFinal returned: 0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -1771,7 +1771,7 @@ C_FindObjectsInit(CK_SESSION_HANDLE hSession, if (fcn->ST_FindObjectsInit) { // Map the Session to the slot session rv = fcn->ST_FindObjectsInit(&rSession, pTemplate, ulCount); - TRACE_DEBUG("fcn->ST_FindObjectsInit returned:0x%x\n", rv); + TRACE_DEVEL("fcn->ST_FindObjectsInit returned:0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -1828,7 +1828,7 @@ C_GenerateKey(CK_SESSION_HANDLE hSession, // Map the Session to the slot session rv = fcn->ST_GenerateKey(&rSession, pMechanism, pTemplate, ulCount, phKey); - TRACE_DEBUG("fcn->ST_GenerateKey returned:0x%x\n", rv); + TRACE_DEVEL("fcn->ST_GenerateKey returned:0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -1897,7 +1897,7 @@ C_GenerateKeyPair(CK_SESSION_HANDLE hSession, pPrivateKeyTemplate, ulPrivateKeyAttributeCount, phPublicKey, phPrivateKey); - TRACE_DEBUG("fcn->ST_GenerateKeyPair returned:0x%x\n", rv); + TRACE_DEVEL("fcn->ST_GenerateKeyPair returned:0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -1946,7 +1946,7 @@ C_GenerateRandom(CK_SESSION_HANDLE hSession, if (fcn->ST_GenerateRandom) { // Map the Session to the slot session rv = fcn->ST_GenerateRandom(&rSession, RandomData, ulRandomLen); - TRACE_DEBUG("fcn->ST_GenerateRandom returned:0x%x\n", rv); + TRACE_DEVEL("fcn->ST_GenerateRandom returned:0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -2007,7 +2007,7 @@ C_GetAttributeValue(CK_SESSION_HANDLE hSession, // Map the Session to the slot session rv = fcn->ST_GetAttributeValue(&rSession, hObject, pTemplate, ulCount); - TRACE_DEBUG("fcn->ST_GetAttributeValue returned:0x%x\n", rv); + TRACE_DEVEL("fcn->ST_GetAttributeValue returned:0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -2192,7 +2192,7 @@ C_GetMechanismInfo(CK_SLOT_ID slotID, } if (fcn->ST_GetMechanismInfo) { rv = fcn->ST_GetMechanismInfo(slotID, type, pInfo); - TRACE_DEBUG("fcn->ST_GetMechanismInfo returned:0x%x\n", rv); + TRACE_DEVEL("fcn->ST_GetMechanismInfo returned:0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -2247,7 +2247,7 @@ C_GetMechanismList(CK_SLOT_ID slotID, } if (fcn->ST_GetMechanismList) { rv = fcn->ST_GetMechanismList(slotID, pMechanismList, pulCount); - TRACE_DEBUG("fcn->ST_GetMechanismList returned: 0x%x\n", rv); + TRACE_DEVEL("fcn->ST_GetMechanismList returned: 0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -2257,7 +2257,7 @@ C_GetMechanismList(CK_SLOT_ID slotID, if (pMechanismList) { unsigned long i; for (i = 0; i < *pulCount; i++) { - TRACE_DEBUG("Mechanism[%d] 0x%08X \n", i, + TRACE_DEVEL("Mechanism[%d] 0x%08X \n", i, pMechanismList[i]); } } @@ -2312,7 +2312,7 @@ C_GetObjectSize(CK_SESSION_HANDLE hSession, if (fcn->ST_GetObjectSize) { // Map the Session to the slot session rv = fcn->ST_GetObjectSize(&rSession, hObject, pulSize); - TRACE_DEBUG("fcn->ST_GetObjectSize retuned: 0x%x\n", rv); + TRACE_DEVEL("fcn->ST_GetObjectSize retuned: 0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -2365,7 +2365,7 @@ C_GetOperationState(CK_SESSION_HANDLE hSession, // Map the Session to the slot session rv = fcn->ST_GetOperationState(&rSession, pOperationState, pulOperationStateLen); - TRACE_DEBUG("fcn->ST_GetOperationState returned:0x%x\n", rv); + TRACE_DEVEL("fcn->ST_GetOperationState returned:0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -2419,8 +2419,8 @@ CK_RV C_GetSessionInfo(CK_SESSION_HANDLE hSession, CK_SESSION_INFO_PTR pInfo) // Map the Session to the slot session rv = fcn->ST_GetSessionInfo(&rSession, pInfo); - TRACE_DEBUG("fcn->ST_GetSessionInfo returned: 0x%x\n", rv); - TRACE_DEBUG("Slot %d State %x Flags %x DevErr %x\n", + TRACE_DEVEL("fcn->ST_GetSessionInfo returned: 0x%x\n", rv); + TRACE_DEVEL("Slot %d State %x Flags %x DevErr %x\n", pInfo->slotID, pInfo->state, pInfo->flags, pInfo->ulDeviceError); @@ -2568,7 +2568,7 @@ C_GetSlotList(CK_BBOOL tokenPresent, #endif TRACE_INFO("C_GetSlotList\n"); - TRACE_DEBUG(" Pres %d Count %d\n", tokenPresent, *pulCount); + TRACE_DEVEL(" Pres %d Count %d\n", tokenPresent, *pulCount); if (API_Initialized() == FALSE) { TRACE_ERROR("%s\n", ock_err(ERR_CRYPTOKI_NOT_INITIALIZED)); return CKR_CRYPTOKI_NOT_INITIALIZED; @@ -2721,7 +2721,7 @@ CK_RV C_GetTokenInfo(CK_SLOT_ID slotID, CK_TOKEN_INFO_PTR pInfo) } sltp = &(Anchor->SltList[slotID]); - TRACE_DEBUG("Slot p = %x id %d\n", sltp, slotID); + TRACE_DEVEL("Slot p = %x id %d\n", sltp, slotID); if (sltp->DLLoaded == FALSE) { TRACE_ERROR("%s\n", ock_err(ERR_TOKEN_NOT_PRESENT)); return CKR_TOKEN_NOT_PRESENT; @@ -2743,7 +2743,7 @@ CK_RV C_GetTokenInfo(CK_SLOT_ID slotID, CK_TOKEN_INFO_PTR pInfo) if (rv == CKR_OK) { get_sess_count(slotID, &(pInfo->ulSessionCount)); } - TRACE_DEBUG("rv %d CK_TOKEN_INFO Flags %x\n", rv, pInfo->flags); + TRACE_DEVEL("rv %d CK_TOKEN_INFO Flags %x\n", rv, pInfo->flags); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -2795,7 +2795,7 @@ CK_RV C_Initialize(CK_VOID_PTR pVoid) memset(slot_loaded, 0, sizeof(int) * NUMBER_SLOTS_MANAGED); // Clear out the load list - TRACE_DEVEL("Anchor allocated at %x\n", (char *)Anchor); + TRACE_DEBUG("Anchor allocated at %x\n", (char *)Anchor); // Validation of the parameters passed @@ -2804,7 +2804,7 @@ CK_RV C_Initialize(CK_VOID_PTR pVoid) // locks anyhow. // if (pVoid != NULL) { - TRACE_DEBUG("Initialization arg = %x Flags %d\n", pVoid, + TRACE_DEVEL("Initialization arg = %x Flags %d\n", pVoid, ((CK_C_INITIALIZE_ARGS *) pVoid)->flags); pArg = (CK_C_INITIALIZE_ARGS *) pVoid; @@ -2839,7 +2839,7 @@ CK_RV C_Initialize(CK_VOID_PTR pVoid) // Right now the library DOES NOT create threads and therefore this // check is irrelavant. if (pArg->flags & CKF_LIBRARY_CANT_CREATE_OS_THREADS) { - TRACE_DEBUG("Can't create OS threads...This is OK\n"); + TRACE_DEVEL("Can't create OS threads...This is OK\n"); } // Since this is an initialization path, we will be verbose in the // code rather than efficient. @@ -2921,7 +2921,7 @@ CK_RV C_Initialize(CK_VOID_PTR pVoid) TRACE_ERROR("%s\n", ock_err(ERR_HOST_MEMORY)); return CKR_HOST_MEMORY; } - TRACE_DEVEL("Shared memory %x \n", Anchor->SharedMemP); + TRACE_DEBUG("Shared memory %x \n", Anchor->SharedMemP); if (!init_socket_data()) { OCK_SYSLOG(LOG_ERR, "C_Initialize: Module failed to create a " @@ -3023,7 +3023,7 @@ CK_RV C_InitPIN(CK_SESSION_HANDLE hSession, CK_CHAR_PTR pPin, CK_ULONG ulPinLen) if (fcn->ST_InitPIN) { // Map the Session to the slot session rv = fcn->ST_InitPIN(&rSession, pPin, ulPinLen); - TRACE_DEBUG("fcn->ST_InitPIN returned: 0x%x\n", rv); + TRACE_DEVEL("fcn->ST_InitPIN returned: 0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -3091,7 +3091,7 @@ C_InitToken(CK_SLOT_ID slotID, } if (fcn->ST_InitToken) { rv = fcn->ST_InitToken(slotID, pPin, ulPinLen, pLabel); - TRACE_DEBUG("fcn->ST_InitToken returned: 0x%x\n", rv); + TRACE_DEVEL("fcn->ST_InitToken returned: 0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -3149,7 +3149,7 @@ C_Login(CK_SESSION_HANDLE hSession, if (fcn->ST_Login) { // Map the Session to the slot session rv = fcn->ST_Login(&rSession, userType, pPin, ulPinLen); - TRACE_DEBUG("fcn->ST_Login returned:0x%x\n", rv); + TRACE_DEVEL("fcn->ST_Login returned:0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -3198,7 +3198,7 @@ CK_RV C_Logout(CK_SESSION_HANDLE hSession) if (fcn->ST_Logout) { // Map the Session to the slot session rv = fcn->ST_Logout(&rSession); - TRACE_DEBUG("fcn->ST_Logout returned:0x%x\n", rv); + TRACE_DEVEL("fcn->ST_Logout returned:0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -3269,7 +3269,7 @@ C_OpenSession(CK_SLOT_ID slotID, if (fcn->ST_OpenSession) { rv = fcn->ST_OpenSession(slotID, flags, &(apiSessp->sessionh)); - TRACE_DEBUG("fcn->ST_OpenSession returned: 0x%x\n", rv); + TRACE_DEVEL("fcn->ST_OpenSession returned: 0x%x\n", rv); // If the session allocation is successful, then we need to // complete the API session block and return. Otherwise @@ -3350,7 +3350,7 @@ C_SeedRandom(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSeed, CK_ULONG ulSeedLen) if (fcn->ST_SeedRandom) { // Map the Session to the slot session rv = fcn->ST_SeedRandom(&rSession, pSeed, ulSeedLen); - TRACE_DEBUG("fcn->ST_SeedRandom returned: 0x%x\n", rv); + TRACE_DEVEL("fcn->ST_SeedRandom returned: 0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -3413,7 +3413,7 @@ C_SetAttributeValue(CK_SESSION_HANDLE hSession, // Map the Session to the slot session rv = fcn->ST_SetAttributeValue(&rSession, hObject, pTemplate, ulCount); - TRACE_DEBUG("fcn->ST_SetAttributeValue returned:0x%x\n", rv); + TRACE_DEVEL("fcn->ST_SetAttributeValue returned:0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -3469,7 +3469,7 @@ C_SetOperationState(CK_SESSION_HANDLE hSession, ulOperationStateLen, hEncryptionKey, hAuthenticationKey); - TRACE_DEBUG("fcn->ST_SetOperationState returned:0x%x\n", rv); + TRACE_DEVEL("fcn->ST_SetOperationState returned:0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -3527,7 +3527,7 @@ C_SetPIN(CK_SESSION_HANDLE hSession, // Map the Session to the slot session rv = fcn->ST_SetPIN(&rSession, pOldPin, ulOldLen, pNewPin, ulNewLen); - TRACE_DEBUG("fcn->ST_SetPIN returned: 0x%x\n", rv); + TRACE_DEVEL("fcn->ST_SetPIN returned: 0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -3583,7 +3583,7 @@ C_Sign(CK_SESSION_HANDLE hSession, // Map the Session to the slot session rv = fcn->ST_Sign(&rSession, pData, ulDataLen, pSignature, pulSignatureLen); - TRACE_DEBUG("fcn->ST_Sign returned: 0x%x\n", rv); + TRACE_DEVEL("fcn->ST_Sign returned: 0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -3637,7 +3637,7 @@ C_SignEncryptUpdate(CK_SESSION_HANDLE hSession, rv = fcn->ST_SignEncryptUpdate(&rSession, pPart, ulPartLen, pEncryptedPart, pulEncryptedPartLen); - TRACE_DEBUG("fcn->ST_SignEncryptUpdate return: 0x%x\n", rv); + TRACE_DEVEL("fcn->ST_SignEncryptUpdate return: 0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -3693,7 +3693,7 @@ C_SignFinal(CK_SESSION_HANDLE hSession, if (fcn->ST_SignFinal) { // Map the Session to the slot session rv = fcn->ST_SignFinal(&rSession, pSignature, pulSignatureLen); - TRACE_DEBUG("fcn->ST_SignFinal returned: 0x%x\n", rv); + TRACE_DEVEL("fcn->ST_SignFinal returned: 0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -3749,7 +3749,7 @@ C_SignInit(CK_SESSION_HANDLE hSession, if (fcn->ST_SignInit) { // Map the Session to the slot session rv = fcn->ST_SignInit(&rSession, pMechanism, hKey); - TRACE_DEBUG("fcn->ST_SignInit returned: 0x%x\n", rv); + TRACE_DEVEL("fcn->ST_SignInit returned: 0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -3801,7 +3801,7 @@ C_SignRecover(CK_SESSION_HANDLE hSession, // Map the Session to the slot session rv = fcn->ST_SignRecover(&rSession, pData, ulDataLen, pSignature, pulSignatureLen); - TRACE_DEBUG("fcn->ST_SignRecover returned:0x%x\n", rv); + TRACE_DEVEL("fcn->ST_SignRecover returned:0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -3853,7 +3853,7 @@ C_SignRecoverInit(CK_SESSION_HANDLE hSession, if (fcn->ST_SignRecoverInit) { // Map the Session to the slot session rv = fcn->ST_SignRecoverInit(&rSession, pMechanism, hKey); - TRACE_DEBUG("fcn->ST_SignRecoverInit returned: 0x%x\n", rv); + TRACE_DEVEL("fcn->ST_SignRecoverInit returned: 0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -3903,7 +3903,7 @@ C_SignUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, CK_ULONG ulPartLen) if (fcn->ST_SignUpdate) { // Map the Session to the slot session rv = fcn->ST_SignUpdate(&rSession, pPart, ulPartLen); - TRACE_DEBUG("fcn->ST_SignUpdate returned: 0x%x\n", rv); + TRACE_DEVEL("fcn->ST_SignUpdate returned: 0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -3969,7 +3969,7 @@ C_UnwrapKey(CK_SESSION_HANDLE hSession, rv = fcn->ST_UnwrapKey(&rSession, pMechanism, hUnwrappingKey, pWrappedKey, ulWrappedKeyLen, pTemplate, ulAttributeCount, phKey); - TRACE_DEBUG("fcn->ST_UnwrapKey returned: 0x%x\n", rv); + TRACE_DEVEL("fcn->ST_UnwrapKey returned: 0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -4024,7 +4024,7 @@ C_Verify(CK_SESSION_HANDLE hSession, // Map the Session to the slot session rv = fcn->ST_Verify(&rSession, pData, ulDataLen, pSignature, ulSignatureLen); - TRACE_DEBUG("fcn->ST_Verify returned: 0x%x\n", rv); + TRACE_DEVEL("fcn->ST_Verify returned: 0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -4073,7 +4073,7 @@ C_VerifyFinal(CK_SESSION_HANDLE hSession, if (fcn->ST_VerifyFinal) { // Map the Session to the slot session rv = fcn->ST_VerifyFinal(&rSession, pSignature, ulSignatureLen); - TRACE_DEBUG("fcn->ST_VerifyFinal returned: 0x%x\n", rv); + TRACE_DEVEL("fcn->ST_VerifyFinal returned: 0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -4124,7 +4124,7 @@ C_VerifyInit(CK_SESSION_HANDLE hSession, if (fcn->ST_VerifyInit) { // Map the Session to the slot session rv = fcn->ST_VerifyInit(&rSession, pMechanism, hKey); - TRACE_DEBUG("fcn->ST_VerifyInit returned: 0x%x\n", rv); + TRACE_DEVEL("fcn->ST_VerifyInit returned: 0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -4177,7 +4177,7 @@ C_VerifyRecover(CK_SESSION_HANDLE hSession, // Map the Session to the slot session rv = fcn->ST_VerifyRecover(&rSession, pSignature, ulSignatureLen, pData, pulDataLen); - TRACE_DEBUG("fcn->ST_VerifyRecover returned: 0x%x\n", rv); + TRACE_DEVEL("fcn->ST_VerifyRecover returned: 0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -4226,7 +4226,7 @@ C_VerifyRecoverInit(CK_SESSION_HANDLE hSession, if (fcn->ST_VerifyRecoverInit) { // Map the Session to the slot session rv = fcn->ST_VerifyRecoverInit(&rSession, pMechanism, hKey); - TRACE_DEBUG("fcn->ST_VerifyRecoverInit returned:0x%x\n", rv); + TRACE_DEVEL("fcn->ST_VerifyRecoverInit returned:0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -4271,7 +4271,7 @@ C_VerifyUpdate(CK_SESSION_HANDLE hSession, if (fcn->ST_VerifyUpdate) { // Map the Session to the slot session rv = fcn->ST_VerifyUpdate(&rSession, pPart, ulPartLen); - TRACE_DEBUG("fcn->ST_VerifyUpdate returned: 0x%x\n", rv); + TRACE_DEVEL("fcn->ST_VerifyUpdate returned: 0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; @@ -4373,7 +4373,7 @@ C_WaitForSlotEvent(CK_FLAGS flags, CK_SLOT_ID_PTR pSlot, CK_VOID_PTR pReserved) // for this process. According to the spec this behavior is undefined. // We will choose to fail the call. if (procp->blocking) { - TRACE_DEBUG("WaitForSlot event called by process twice.\n"); + TRACE_DEVEL("WaitForSlot event called by process twice.\n"); XProcUnLock(); // Unlock aftersetting TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_FAILED)); @@ -4463,7 +4463,7 @@ C_WrapKey(CK_SESSION_HANDLE hSession, // Map the Session to the slot session rv = fcn->ST_WrapKey(&rSession, pMechanism, hWrappingKey, hKey, pWrappedKey, pulWrappedKeyLen); - TRACE_DEBUG("fcn->ST_WrapKey returned: 0x%x\n", rv); + TRACE_DEVEL("fcn->ST_WrapKey returned: 0x%x\n", rv); } else { TRACE_ERROR("%s\n", ock_err(ERR_FUNCTION_NOT_SUPPORTED)); rv = CKR_FUNCTION_NOT_SUPPORTED; diff --git a/usr/lib/pkcs11/api/apiutil.c b/usr/lib/pkcs11/api/apiutil.c index afbaafe9..ee4d74a1 100755 --- a/usr/lib/pkcs11/api/apiutil.c +++ b/usr/lib/pkcs11/api/apiutil.c @@ -354,7 +354,7 @@ CK_RV XProcLock(void) if (xplfd != -1) flock(xplfd, LOCK_EX); else - TRACE_DEBUG("No file descriptor to lock with.\n"); + TRACE_DEVEL("No file descriptor to lock with.\n"); return CKR_OK; } @@ -364,7 +364,7 @@ CK_RV XProcUnLock(void) if (xplfd != -1) flock(xplfd, LOCK_UN); else - TRACE_DEBUG("No file descriptor to unlock with.\n"); + TRACE_DEVEL("No file descriptor to unlock with.\n"); return CKR_OK; } @@ -572,7 +572,7 @@ void Terminate_All_Process_Sessions() CK_SLOT_ID id; CK_RV rv; - TRACE_DEVEL("Terminate_All_Process_Sessions\n"); + TRACE_DEBUG("Terminate_All_Process_Sessions\n"); for (id = 0; id < NUMBER_SLOTS_MANAGED; id++) { // Check if the slot is present in the slot manager // if not just skip it... @@ -585,7 +585,7 @@ void Terminate_All_Process_Sessions() // since we are terminating the session. // For now we will just log it if (rv != CKR_OK) { - TRACE_DEVEL("Terminate_All_Process_Sessions RV %x\n", + TRACE_DEBUG("Terminate_All_Process_Sessions RV %x\n", rv); } } @@ -677,7 +677,7 @@ int API_Register() Anchor->MgrProcIndex = indx; - TRACE_DEBUG("API_Register MgrProcIndc %d pid %d \n", procp->proc_id, + TRACE_DEVEL("API_Register MgrProcIndc %d pid %d \n", procp->proc_id, Anchor->MgrProcIndex); //??? What to do about the Mutex and cond variable @@ -764,7 +764,7 @@ DLL_Load_t *dllload; for (i = 0; i < NUMBER_SLOTS_MANAGED; i++) { if (dllload[i].dll_name != NULL) { - TRACE_DEVEL("DL_LOADED Looking for index %d name %s\n", + TRACE_DEBUG("DL_LOADED Looking for index %d name %s\n", i, dllload[i].dll_name); if (strcmp(location, dllload[i].dll_name) == 0) { return i; // Return the index of the dll @@ -786,15 +786,15 @@ DLL_Load_t *dllload; { int i; - TRACE_DEVEL("DL_LOAD\n"); + TRACE_DEBUG("DL_LOAD\n"); for (i = 0; i < NUMBER_SLOTS_MANAGED; i++) { if (dllload[i].dll_name == NULL) { - TRACE_DEVEL("Empty slot at %d \n", i); + TRACE_DEBUG("Empty slot at %d \n", i); break; } } if (i == NUMBER_SLOTS_MANAGED) { - TRACE_DEVEL("No empty slots.\n"); + TRACE_DEBUG("No empty slots.\n"); return 0; // Failed to find it.. } @@ -813,7 +813,7 @@ DLL_Load_t *dllload; OCK_SYSLOG(LOG_ERR, "%s: dlopen() failed for [%s]; dlerror = [%s]\n", __FUNCTION__, sinfp->dll_location, e); - TRACE_DEBUG("DL_Load of %s failed, dlerror: %s\n", + TRACE_DEVEL("DL_Load of %s failed, dlerror: %s\n", sinfp->dll_location, e); sltp->dlop_p = NULL; return 0; @@ -877,7 +877,7 @@ int DL_Load_and_Init(API_Slot_t *sltp, CK_SLOT_ID slotID) sltp->dll_information = &dllload[dl_index]; sltp->dlop_p = dllload[dl_index].dlop_p; } else { - TRACE_DEVEL("DL_Load_and_Init dll_location %s\n", + TRACE_DEBUG("DL_Load_and_Init dll_location %s\n", sinfp->dll_location); DL_Load(sinfp, sltp, dllload); } @@ -886,7 +886,7 @@ int DL_Load_and_Init(API_Slot_t *sltp, CK_SLOT_ID slotID) } if (!sltp->dlop_p) { - TRACE_DEVEL("DL_Load_and_Init pointer %x\n", sltp->dlop_p); + TRACE_DEBUG("DL_Load_and_Init pointer %x\n", sltp->dlop_p); return FALSE; } @@ -899,7 +899,7 @@ int DL_Load_and_Init(API_Slot_t *sltp, CK_SLOT_ID slotID) } // Returns true or false rv = pSTinit(&(sltp->FcnList), slotID, sinfp->confname, trace); - TRACE_DEVEL("return from STDDLL Init = %x\n", rv); + TRACE_DEBUG("return from STDDLL Init = %x\n", rv); if (rv != CKR_OK) { // clean up and unload diff --git a/usr/lib/pkcs11/cca_stdll/cca_specific.c b/usr/lib/pkcs11/cca_stdll/cca_specific.c index 6fbaa270..75762a23 100644 --- a/usr/lib/pkcs11/cca_stdll/cca_specific.c +++ b/usr/lib/pkcs11/cca_stdll/cca_specific.c @@ -359,7 +359,7 @@ token_specific_des_cbc(CK_BYTE *in_data, * Else, memcpy the data back to the user's buffer */ if ((local_out != out_data) && ((CK_ULONG)length > *out_data_len)) { - TRACE_DEBUG("CKR_BUFFER_TOO_SMALL: %ld bytes to write into %ld " + TRACE_DEVEL("CKR_BUFFER_TOO_SMALL: %ld bytes to write into %ld " "bytes space", length, *out_data_len); TRACE_ERROR("%s\n", ock_err(ERR_BUFFER_TOO_SMALL)); free(local_out); @@ -466,33 +466,33 @@ token_create_keypair_object(TEMPLATE *tmpl, CK_ULONG tok_len, CK_BYTE *tok) /* That's right, n is stored in the private key area. Get it there */ if ((rv = cca_inttok_privkey_get_n(&tok[CCA_RSA_INTTOK_PRIVKEY_OFFSET], &n_len, n))) { - TRACE_DEBUG("cca_inttok_privkey_get_n() failed. rv=0x%lx", rv); + TRACE_DEVEL("cca_inttok_privkey_get_n() failed. rv=0x%lx", rv); return rv; } /* Get e */ if ((rv = cca_inttok_pubkey_get_e(&tok[pubkey_offset], &e_len, e))) { - TRACE_DEBUG("cca_inttok_pubkey_get_e() failed. rv=0x%lx", rv); + TRACE_DEVEL("cca_inttok_pubkey_get_e() failed. rv=0x%lx", rv); return rv; } /* Add n's value to the template */ if ((rv = build_attribute(CKA_MODULUS, n, n_len, &modulus))) { - TRACE_DEBUG("build_attribute for n failed. rv=0x%lx", rv); + TRACE_DEVEL("build_attribute for n failed. rv=0x%lx", rv); return rv; } template_update_attribute(tmpl, modulus); /* Add e's value to the template */ if ((rv = build_attribute(CKA_PUBLIC_EXPONENT, e, e_len, &pub_exp))) { - TRACE_DEBUG("build_attribute for e failed. rv=0x%lx", rv); + TRACE_DEVEL("build_attribute for e failed. rv=0x%lx", rv); return rv; } template_update_attribute(tmpl, pub_exp); /* Add the opaque key object to the template */ if ((rv = build_attribute(CKA_IBM_OPAQUE, tok, tok_len, &opaque_key))) { - TRACE_DEBUG("build_attribute for opaque key failed. rv=0x%lx", + TRACE_DEVEL("build_attribute for opaque key failed. rv=0x%lx", rv); return rv; } @@ -513,7 +513,7 @@ token_create_priv_key(TEMPLATE *priv_tmpl, CK_ULONG tok_len, CK_BYTE *tok) /* That's right, n is stored in the private key area. Get it there */ if ((rv = cca_inttok_privkey_get_n(&tok[CCA_RSA_INTTOK_PRIVKEY_OFFSET], &n_len, n))) { - TRACE_DEBUG("cca_inttok_privkey_get_n() failed. rv=0x%lx", rv); + TRACE_DEVEL("cca_inttok_privkey_get_n() failed. rv=0x%lx", rv); return rv; } @@ -522,14 +522,14 @@ token_create_priv_key(TEMPLATE *priv_tmpl, CK_ULONG tok_len, CK_BYTE *tok) * sizes against the size of the CKA_MODULUS attribute of whatever * key object it gets */ if ((rv = build_attribute(CKA_MODULUS, n, n_len, &modulus))) { - TRACE_DEBUG("build_attribute for n failed. rv=0x%lx", rv); + TRACE_DEVEL("build_attribute for n failed. rv=0x%lx", rv); return rv; } template_update_attribute(priv_tmpl, modulus); /* Add the opaque key object to the template */ if ((rv = build_attribute(CKA_IBM_OPAQUE, tok, tok_len, &opaque_key))) { - TRACE_DEBUG("build_attribute for opaque key failed. rv=0x%lx", + TRACE_DEVEL("build_attribute for opaque key failed. rv=0x%lx", rv); return rv; } @@ -690,20 +690,20 @@ token_specific_rsa_generate_keypair(TEMPLATE *publ_tmpl, return CKR_FUNCTION_FAILED; } - TRACE_DEBUG("RSA secure key token generated. size: %ld\n", + TRACE_DEVEL("RSA secure key token generated. size: %ld\n", generated_key_token_length); rv = token_create_keypair_object(publ_tmpl, generated_key_token_length, generated_key_token); if (rv != CKR_OK) { - TRACE_DEBUG("token_create_keypair_object failed. rv: %lu", rv); + TRACE_DEVEL("token_create_keypair_object failed. rv: %lu", rv); return rv; } rv = token_create_keypair_object(priv_tmpl, generated_key_token_length, generated_key_token); if (rv != CKR_OK) - TRACE_DEBUG("token_create_keypair_object failed. rv: %lu", rv); + TRACE_DEVEL("token_create_keypair_object failed. rv: %lu", rv); return rv; } @@ -891,7 +891,7 @@ token_specific_rsa_verify(CK_BYTE * in_data, if (return_code == 4 && reason_code == 429) { return CKR_SIGNATURE_INVALID; } else if (return_code != CCA_SUCCESS) { - TRACE_DEBUG("CSNDDSV (RSA VERIFY) failed. return: %ld, " + TRACE_DEVEL("CSNDDSV (RSA VERIFY) failed. return: %ld, " "reason: %ld\n", return_code, reason_code); return CKR_FUNCTION_FAILED; } @@ -943,7 +943,7 @@ token_specific_aes_key_gen(CK_BYTE *aes_key, CK_ULONG len, CK_ULONG key_size) #ifdef DEBUG { uint32_t j; - TRACE_DEVEL("Rule Array:"); + TRACE_DEBUG("Rule Array:"); for ( j = 0; j < 32; j++) printf("%c", rule_array[j]); printf("\n"); @@ -1203,7 +1203,7 @@ token_specific_dh_pkcs_derive(CK_BYTE *z, CK_BYTE *p, CK_ULONG p_len) { - TRACE_DEBUG("Unsupported function reached."); + TRACE_DEVEL("Unsupported function reached."); return CKR_FUNCTION_NOT_SUPPORTED; } @@ -1211,7 +1211,7 @@ CK_RV token_specific_dh_pkcs_key_pair_gen(TEMPLATE *publ_tmpl, TEMPLATE *priv_tmpl ) { - TRACE_DEBUG("Unsupported function reached."); + TRACE_DEVEL("Unsupported function reached."); return CKR_FUNCTION_NOT_SUPPORTED; } /* End code contributed by Corrent corp. */ @@ -1269,7 +1269,7 @@ build_update_attribute(TEMPLATE *tmpl, CK_ATTRIBUTE *attr; CK_RV rv; if (rv = build_attribute(type, data, data_len, &attr)) { - TRACE_DEBUG("Build attribute for type=%d failed rv=0x%lx\n", + TRACE_DEVEL("Build attribute for type=%d failed rv=0x%lx\n", type, rv); return rv; } @@ -1351,7 +1351,7 @@ token_create_ec_keypair(TEMPLATE *publ_tmpl, if ((rv = build_update_attribute(publ_tmpl, CKA_EC_POINT, q, q_len))) { - TRACE_DEBUG("build_update_attribute for q failed rv=0x%lx\n", + TRACE_DEVEL("build_update_attribute for q failed rv=0x%lx\n", rv); return rv; } @@ -1364,7 +1364,7 @@ token_create_ec_keypair(TEMPLATE *publ_tmpl, if ((rv = build_update_attribute(priv_tmpl, CKA_ECDSA_PARAMS, attr->pValue, attr->ulValueLen))) { - TRACE_DEBUG("build_update_attribute for der data failed " + TRACE_DEVEL("build_update_attribute for der data failed " "rv=0x%lx\n", rv); return rv; } @@ -1373,13 +1373,13 @@ token_create_ec_keypair(TEMPLATE *publ_tmpl, * Save the CKA_IBM_OPAQUE for both keys. */ if ((rv = build_update_attribute(publ_tmpl, CKA_IBM_OPAQUE, tok, tok_len))) { - TRACE_DEBUG("build_update_attribute for tok failed rv=0x%lx\n", + TRACE_DEVEL("build_update_attribute for tok failed rv=0x%lx\n", rv); return rv; } if ((rv = build_update_attribute(priv_tmpl, CKA_IBM_OPAQUE, tok, tok_len))) { - TRACE_DEBUG("build_update_attribute for tok failed rv=0x%lx\n", + TRACE_DEVEL("build_update_attribute for tok failed rv=0x%lx\n", rv); return rv; } @@ -1503,13 +1503,13 @@ token_specific_ec_generate_keypair(TEMPLATE *publ_tmpl, return CKR_FUNCTION_FAILED; } - TRACE_DEBUG("ECC secure key token generated. size: %ld\n", + TRACE_DEVEL("ECC secure key token generated. size: %ld\n", generated_key_token_length); rv = token_create_ec_keypair(publ_tmpl, priv_tmpl, generated_key_token_length, generated_key_token); if (rv != CKR_OK) { - TRACE_DEBUG("token_create_ec_keypair failed. rv: %lu", rv); + TRACE_DEVEL("token_create_ec_keypair failed. rv: %lu", rv); return rv; } @@ -1918,7 +1918,7 @@ CK_RV cca_sha_final(DIGEST_CONTEXT *ctx, CK_BYTE *out_data, return CKR_MECHANISM_INVALID; } - TRACE_DEVEL("tail_len: %lu, tail: %p, cvl: %lu, sl: %lu\n", + TRACE_DEBUG("tail_len: %lu, tail: %p, cvl: %lu, sl: %lu\n", cca_ctx->tail_len, cca_ctx->tail ? cca_ctx->tail : dummy_buf, cca_ctx->chain_vector_len, cca_ctx->hash_len); @@ -2156,12 +2156,12 @@ CK_RV rsa_import_privkey_crt(TEMPLATE *priv_tmpl) /* Add the key object to the template */ if ((rc = build_attribute(CKA_IBM_OPAQUE, target_key_token, target_key_token_length, &opaque_key))) { - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); return rc; } rc = template_update_attribute(priv_tmpl, opaque_key); if (rc != CKR_OK) { - TRACE_DEBUG("template_update_attribute failed\n"); + TRACE_DEVEL("template_update_attribute failed\n"); return rc; } @@ -2268,13 +2268,13 @@ rsa_import_pubkey(TEMPLATE *publ_tmpl) // Add the key object to the template. if ((rc = build_attribute(CKA_IBM_OPAQUE, key_token, key_token_length, &opaque_key))) { - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); return rc; } rc = template_update_attribute(publ_tmpl, opaque_key); if (rc != CKR_OK) { - TRACE_DEBUG("template_update_attribute failed\n"); + TRACE_DEVEL("template_update_attribute failed\n"); return rc; } @@ -2298,7 +2298,7 @@ token_specific_object_add(OBJECT *object) rc = template_attribute_find(object->template, CKA_KEY_TYPE, &attr); if (rc == FALSE) { // not a key, so nothing to do. Just return. - TRACE_DEBUG("object not a key, no need to import."); + TRACE_DEVEL("object not a key, no need to import."); return CKR_OK; } @@ -2329,7 +2329,7 @@ token_specific_object_add(OBJECT *object) } if (rc != CKR_OK) { - TRACE_DEBUG("rsa import failed\n"); + TRACE_DEVEL("rsa import failed\n"); return rc; } } @@ -2365,7 +2365,7 @@ get_ecsiglen(OBJECT *key_obj, CK_ULONG *size) *size = (*size / 8) * 2; else *size = ((*size / 8) + 1) * 2; - TRACE_DEBUG("getlen, curve = %d, size = %d\n", der_ec_supported[i].len_bits, *size); + TRACE_DEVEL("getlen, curve = %d, size = %d\n", der_ec_supported[i].len_bits, *size); return CKR_OK; } } diff --git a/usr/lib/pkcs11/common/asn1.c b/usr/lib/pkcs11/common/asn1.c index caabce6f..5c638618 100755 --- a/usr/lib/pkcs11/common/asn1.c +++ b/usr/lib/pkcs11/common/asn1.c @@ -837,7 +837,7 @@ ber_encode_PrivateKeyInfo( CK_BBOOL length_only, rc = ber_encode_INTEGER( TRUE, NULL, &total, version, sizeof(version) ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_INTEGER failed\n"); + TRACE_DEVEL("ber_encode_INTEGER failed\n"); return rc; } else @@ -847,7 +847,7 @@ ber_encode_PrivateKeyInfo( CK_BBOOL length_only, rc = ber_encode_OCTET_STRING( TRUE, NULL, &total, priv_key, priv_key_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_OCTET_STRING failed\n"); + TRACE_DEVEL("ber_encode_OCTET_STRING failed\n"); return rc; } else @@ -862,7 +862,7 @@ ber_encode_PrivateKeyInfo( CK_BBOOL length_only, if (rc == CKR_OK) *data_len = total; if (rc != CKR_OK) - TRACE_DEBUG("ber_encode_SEQUENCE failed\n"); + TRACE_DEVEL("ber_encode_SEQUENCE failed\n"); return rc; } @@ -874,7 +874,7 @@ ber_encode_PrivateKeyInfo( CK_BBOOL length_only, len = 0; rc = ber_encode_INTEGER( FALSE, &tmp, &total, version, sizeof(version) ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_INTEGER failed\n"); + TRACE_DEVEL("ber_encode_INTEGER failed\n"); goto error; } memcpy( buf+len, tmp, total ); @@ -886,7 +886,7 @@ ber_encode_PrivateKeyInfo( CK_BBOOL length_only, rc = ber_encode_OCTET_STRING( FALSE, &tmp, &total, priv_key, priv_key_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_OCTET_STRING failed\n"); + TRACE_DEVEL("ber_encode_OCTET_STRING failed\n"); goto error; } memcpy( buf+len, tmp, total ); @@ -895,7 +895,7 @@ ber_encode_PrivateKeyInfo( CK_BBOOL length_only, rc = ber_encode_SEQUENCE( FALSE, data, data_len, buf, len ); if (rc != CKR_OK) - TRACE_DEBUG("ber_encode_SEQUENCE failed\n"); + TRACE_DEVEL("ber_encode_SEQUENCE failed\n"); error: free( buf ); @@ -924,7 +924,7 @@ ber_decode_PrivateKeyInfo( CK_BYTE * data, } rc = ber_decode_SEQUENCE( data, &buf, &buf_len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_SEQUENCE failed\n"); + TRACE_DEVEL("ber_decode_SEQUENCE failed\n"); return rc; } // version -- we just ignore this @@ -932,7 +932,7 @@ ber_decode_PrivateKeyInfo( CK_BYTE * data, offset = 0; rc = ber_decode_INTEGER( buf+offset, &ver, &len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_INTEGER failed\n"); + TRACE_DEVEL("ber_decode_INTEGER failed\n"); return rc; } offset += field_len; @@ -941,7 +941,7 @@ ber_decode_PrivateKeyInfo( CK_BYTE * data, // rc = ber_decode_SEQUENCE( buf+offset, &alg, &len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_SEQUENCE failed\n"); + TRACE_DEVEL("ber_decode_SEQUENCE failed\n"); return rc; } *algorithm = alg; @@ -949,7 +949,7 @@ ber_decode_PrivateKeyInfo( CK_BYTE * data, rc = ber_decode_OCTET_STRING( alg + len, priv_key, &buf_len, &field_len ); if (rc != CKR_OK) - TRACE_DEBUG("ber_decode_OCTET_STRING failed\n"); + TRACE_DEVEL("ber_decode_OCTET_STRING failed\n"); return rc; } @@ -1009,13 +1009,13 @@ ber_encode_RSAPrivateKey( CK_BBOOL length_only, } if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_INTEGER failed\n"); + TRACE_DEVEL("ber_encode_INTEGER failed\n"); return CKR_FUNCTION_FAILED; } if (length_only == TRUE) { rc = ber_encode_SEQUENCE( TRUE, NULL, &len, NULL, offset ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_SEQUENCE failed\n"); + TRACE_DEVEL("ber_encode_SEQUENCE failed\n"); return rc; } rc = ber_encode_PrivateKeyInfo( TRUE, @@ -1023,7 +1023,7 @@ ber_encode_RSAPrivateKey( CK_BBOOL length_only, NULL, ber_AlgIdRSAEncryptionLen, NULL, len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_PrivateKeyInfo failed\n"); + TRACE_DEVEL("ber_encode_PrivateKeyInfo failed\n"); return rc; } return rc; @@ -1039,7 +1039,7 @@ ber_encode_RSAPrivateKey( CK_BBOOL length_only, rc = ber_encode_INTEGER( FALSE, &buf2, &len, version, sizeof(version) ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_INTEGER failed\n"); + TRACE_DEVEL("ber_encode_INTEGER failed\n"); goto error; } memcpy( buf+offset, buf2, len ); @@ -1048,7 +1048,7 @@ ber_encode_RSAPrivateKey( CK_BBOOL length_only, rc = ber_encode_INTEGER( FALSE, &buf2, &len, (CK_BYTE *)modulus + sizeof(CK_ATTRIBUTE), modulus->ulValueLen ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_INTEGER failed\n"); + TRACE_DEVEL("ber_encode_INTEGER failed\n"); goto error; } memcpy( buf+offset, buf2, len ); @@ -1057,7 +1057,7 @@ ber_encode_RSAPrivateKey( CK_BBOOL length_only, rc = ber_encode_INTEGER( FALSE, &buf2, &len, (CK_BYTE *)publ_exp + sizeof(CK_ATTRIBUTE), publ_exp->ulValueLen ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_INTEGER failed\n"); + TRACE_DEVEL("ber_encode_INTEGER failed\n"); goto error; } memcpy( buf+offset, buf2, len ); @@ -1068,7 +1068,7 @@ ber_encode_RSAPrivateKey( CK_BBOOL length_only, // the CKA_IBM_OPAQUE attrib rc = ber_encode_OCTET_STRING( FALSE, &buf2, &len, (CK_BYTE *)opaque + sizeof(CK_ATTRIBUTE), opaque->ulValueLen ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_OCTET_STRING failed\n"); + TRACE_DEVEL("ber_encode_OCTET_STRING failed\n"); goto error; } memcpy( buf+offset, buf2, len ); @@ -1077,7 +1077,7 @@ ber_encode_RSAPrivateKey( CK_BBOOL length_only, } else { rc = ber_encode_INTEGER( FALSE, &buf2, &len, (CK_BYTE *)priv_exp + sizeof(CK_ATTRIBUTE), priv_exp->ulValueLen ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_INTEGER failed\n"); + TRACE_DEVEL("ber_encode_INTEGER failed\n"); goto error; } memcpy( buf+offset, buf2, len ); @@ -1086,7 +1086,7 @@ ber_encode_RSAPrivateKey( CK_BBOOL length_only, rc = ber_encode_INTEGER( FALSE, &buf2, &len, (CK_BYTE *)prime1 + sizeof(CK_ATTRIBUTE), prime1->ulValueLen ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_INTEGER failed\n"); + TRACE_DEVEL("ber_encode_INTEGER failed\n"); goto error; } memcpy( buf+offset, buf2, len ); @@ -1095,7 +1095,7 @@ ber_encode_RSAPrivateKey( CK_BBOOL length_only, rc = ber_encode_INTEGER( FALSE, &buf2, &len, (CK_BYTE *)prime2 + sizeof(CK_ATTRIBUTE), prime2->ulValueLen ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_INTEGER failed\n"); + TRACE_DEVEL("ber_encode_INTEGER failed\n"); goto error; } memcpy( buf+offset, buf2, len ); @@ -1104,7 +1104,7 @@ ber_encode_RSAPrivateKey( CK_BBOOL length_only, rc = ber_encode_INTEGER( FALSE, &buf2, &len, (CK_BYTE *)exponent1 + sizeof(CK_ATTRIBUTE), exponent1->ulValueLen ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_INTEGER failed\n"); + TRACE_DEVEL("ber_encode_INTEGER failed\n"); goto error; } memcpy( buf+offset, buf2, len ); @@ -1113,7 +1113,7 @@ ber_encode_RSAPrivateKey( CK_BBOOL length_only, rc = ber_encode_INTEGER( FALSE, &buf2, &len, (CK_BYTE *)exponent2 + sizeof(CK_ATTRIBUTE), exponent2->ulValueLen ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_INTEGER failed\n"); + TRACE_DEVEL("ber_encode_INTEGER failed\n"); goto error; } memcpy( buf+offset, buf2, len ); @@ -1122,7 +1122,7 @@ ber_encode_RSAPrivateKey( CK_BBOOL length_only, rc = ber_encode_INTEGER( FALSE, &buf2, &len, (CK_BYTE *)coeff + sizeof(CK_ATTRIBUTE), coeff->ulValueLen ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_INTEGER failed\n"); + TRACE_DEVEL("ber_encode_INTEGER failed\n"); goto error; } memcpy( buf+offset, buf2, len ); @@ -1132,7 +1132,7 @@ ber_encode_RSAPrivateKey( CK_BBOOL length_only, rc = ber_encode_SEQUENCE( FALSE, &buf2, &len, buf, offset ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_SEQUENCE failed\n"); + TRACE_DEVEL("ber_encode_SEQUENCE failed\n"); goto error; } rc = ber_encode_PrivateKeyInfo( FALSE, @@ -1184,7 +1184,7 @@ ber_decode_RSAPrivateKey( CK_BYTE * data, rc = ber_decode_PrivateKeyInfo( data, data_len, &alg, &len, &rsa_priv_key ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_PrivateKeyInfo failed\n"); + TRACE_DEVEL("ber_decode_PrivateKeyInfo failed\n"); return rc; } // make sure we're dealing with an RSA key @@ -1205,7 +1205,7 @@ ber_decode_RSAPrivateKey( CK_BYTE * data, // rc = ber_decode_INTEGER( buf+offset, &tmp, &len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_INTEGER failed\n"); + TRACE_DEVEL("ber_decode_INTEGER failed\n"); goto cleanup; } offset += field_len; @@ -1214,7 +1214,7 @@ ber_decode_RSAPrivateKey( CK_BYTE * data, // rc = ber_decode_INTEGER( buf+offset, &tmp, &len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_INTEGER failed\n"); + TRACE_DEVEL("ber_decode_INTEGER failed\n"); goto cleanup; } offset += field_len; @@ -1223,7 +1223,7 @@ ber_decode_RSAPrivateKey( CK_BYTE * data, // rc = ber_decode_INTEGER( buf+offset, &tmp, &len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_INTEGER failed\n"); + TRACE_DEVEL("ber_decode_INTEGER failed\n"); goto cleanup; } offset += field_len; @@ -1233,7 +1233,7 @@ ber_decode_RSAPrivateKey( CK_BYTE * data, // rc = ber_decode_OCTET_STRING( buf+offset, &tmp, &len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_OCTET_STRING failed\n"); + TRACE_DEVEL("ber_decode_OCTET_STRING failed\n"); goto cleanup; } offset += field_len; @@ -1243,7 +1243,7 @@ ber_decode_RSAPrivateKey( CK_BYTE * data, // rc = ber_decode_INTEGER( buf+offset, &tmp, &len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_INTEGER failed\n"); + TRACE_DEVEL("ber_decode_INTEGER failed\n"); goto cleanup; } offset += field_len; @@ -1252,7 +1252,7 @@ ber_decode_RSAPrivateKey( CK_BYTE * data, // rc = ber_decode_INTEGER( buf+offset, &tmp, &len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_INTEGER failed\n"); + TRACE_DEVEL("ber_decode_INTEGER failed\n"); goto cleanup; } offset += field_len; @@ -1261,7 +1261,7 @@ ber_decode_RSAPrivateKey( CK_BYTE * data, // rc = ber_decode_INTEGER( buf+offset, &tmp, &len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_INTEGER failed\n"); + TRACE_DEVEL("ber_decode_INTEGER failed\n"); goto cleanup; } offset += field_len; @@ -1270,7 +1270,7 @@ ber_decode_RSAPrivateKey( CK_BYTE * data, // rc = ber_decode_INTEGER( buf+offset, &tmp, &len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_INTEGER failed\n"); + TRACE_DEVEL("ber_decode_INTEGER failed\n"); goto cleanup; } offset += field_len; @@ -1279,7 +1279,7 @@ ber_decode_RSAPrivateKey( CK_BYTE * data, // rc = ber_decode_INTEGER( buf+offset, &tmp, &len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_INTEGER failed\n"); + TRACE_DEVEL("ber_decode_INTEGER failed\n"); goto cleanup; } offset += field_len; @@ -1288,7 +1288,7 @@ ber_decode_RSAPrivateKey( CK_BYTE * data, // rc = ber_decode_INTEGER( buf+offset, &tmp, &len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_INTEGER failed\n"); + TRACE_DEVEL("ber_decode_INTEGER failed\n"); goto cleanup; } offset += field_len; @@ -1309,7 +1309,7 @@ ber_decode_RSAPrivateKey( CK_BYTE * data, // rc = ber_decode_INTEGER( buf+offset, &tmp, &len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_INTEGER failed\n"); + TRACE_DEVEL("ber_decode_INTEGER failed\n"); goto cleanup; } offset += field_len; @@ -1318,13 +1318,13 @@ ber_decode_RSAPrivateKey( CK_BYTE * data, // rc = ber_decode_INTEGER( buf+offset, &tmp, &len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_INTEGER failed\n"); + TRACE_DEVEL("ber_decode_INTEGER failed\n"); goto cleanup; } else { rc = build_attribute( CKA_MODULUS, tmp, len, &n_attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto cleanup; } offset += field_len; @@ -1334,13 +1334,13 @@ ber_decode_RSAPrivateKey( CK_BYTE * data, // rc = ber_decode_INTEGER( buf+offset, &tmp, &len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_INTEGER failed\n"); + TRACE_DEVEL("ber_decode_INTEGER failed\n"); goto cleanup; } else { rc = build_attribute( CKA_PUBLIC_EXPONENT, tmp, len, &e_attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto cleanup; } offset += field_len; @@ -1351,13 +1351,13 @@ ber_decode_RSAPrivateKey( CK_BYTE * data, // rc = ber_decode_OCTET_STRING( buf+offset, &tmp, &len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_OCTET_STRING failed\n"); + TRACE_DEVEL("ber_decode_OCTET_STRING failed\n"); goto cleanup; } else { rc = build_attribute( CKA_IBM_OPAQUE, tmp, len, &o_attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto cleanup; } offset += field_len; @@ -1368,13 +1368,13 @@ ber_decode_RSAPrivateKey( CK_BYTE * data, // rc = ber_decode_INTEGER( buf+offset, &tmp, &len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_INTEGER failed\n"); + TRACE_DEVEL("ber_decode_INTEGER failed\n"); goto cleanup; } else { rc = build_attribute( CKA_PRIVATE_EXPONENT, tmp, len, &d_attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto cleanup; } offset += field_len; @@ -1384,13 +1384,13 @@ ber_decode_RSAPrivateKey( CK_BYTE * data, // rc = ber_decode_INTEGER( buf+offset, &tmp, &len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_INTEGER failed\n"); + TRACE_DEVEL("ber_decode_INTEGER failed\n"); goto cleanup; } else { rc = build_attribute( CKA_PRIME_1, tmp, len, &p_attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto cleanup; } offset += field_len; @@ -1400,13 +1400,13 @@ ber_decode_RSAPrivateKey( CK_BYTE * data, // rc = ber_decode_INTEGER( buf+offset, &tmp, &len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_INTEGER failed\n"); + TRACE_DEVEL("ber_decode_INTEGER failed\n"); goto cleanup; } else { rc = build_attribute( CKA_PRIME_2, tmp, len, &q_attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto cleanup; } offset += field_len; @@ -1416,13 +1416,13 @@ ber_decode_RSAPrivateKey( CK_BYTE * data, // rc = ber_decode_INTEGER( buf+offset, &tmp, &len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_INTEGER failed\n"); + TRACE_DEVEL("ber_decode_INTEGER failed\n"); goto cleanup; } else { rc = build_attribute( CKA_EXPONENT_1, tmp, len, &e1_attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto cleanup; } offset += field_len; @@ -1432,13 +1432,13 @@ ber_decode_RSAPrivateKey( CK_BYTE * data, // rc = ber_decode_INTEGER( buf+offset, &tmp, &len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_INTEGER failed\n"); + TRACE_DEVEL("ber_decode_INTEGER failed\n"); goto cleanup; } else { rc = build_attribute( CKA_EXPONENT_2, tmp, len, &e2_attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto cleanup; } offset += field_len; @@ -1448,13 +1448,13 @@ ber_decode_RSAPrivateKey( CK_BYTE * data, // rc = ber_decode_INTEGER( buf+offset, &tmp, &len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_INTEGER failed\n"); + TRACE_DEVEL("ber_decode_INTEGER failed\n"); goto cleanup; } else { rc = build_attribute( CKA_COEFFICIENT, tmp, len, &coeff_attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto cleanup; } offset += len; @@ -1530,18 +1530,18 @@ ber_encode_DSAPrivateKey( CK_BBOOL length_only, rc |= ber_encode_INTEGER( TRUE, NULL, &len, NULL, base->ulValueLen ); offset += len; if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_INTEGER failed\n"); + TRACE_DEVEL("ber_encode_INTEGER failed\n"); return CKR_FUNCTION_FAILED; } if (length_only == TRUE) { rc = ber_encode_SEQUENCE( TRUE, NULL, ¶m_len, NULL, offset ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_SEQUENCE failed\n"); + TRACE_DEVEL("ber_encode_SEQUENCE failed\n"); return rc; } rc = ber_encode_INTEGER( TRUE, NULL, &len, NULL, priv_key->ulValueLen ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_INTEGER failed\n"); + TRACE_DEVEL("ber_encode_INTEGER failed\n"); return rc; } rc = ber_encode_PrivateKeyInfo( TRUE, @@ -1549,7 +1549,7 @@ ber_encode_DSAPrivateKey( CK_BBOOL length_only, NULL, ber_idDSALen + param_len, NULL, len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_PrivateKeyInfo failed\n"); + TRACE_DEVEL("ber_encode_PrivateKeyInfo failed\n"); } return rc; } @@ -1566,7 +1566,7 @@ ber_encode_DSAPrivateKey( CK_BBOOL length_only, rc = ber_encode_INTEGER( FALSE, &tmp, &len, (CK_BYTE *)prime1 + sizeof(CK_ATTRIBUTE), prime1->ulValueLen ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_INTEGER failed\n"); + TRACE_DEVEL("ber_encode_INTEGER failed\n"); goto error; } memcpy( buf+offset, tmp, len ); @@ -1576,7 +1576,7 @@ ber_encode_DSAPrivateKey( CK_BBOOL length_only, rc = ber_encode_INTEGER( FALSE, &tmp, &len, (CK_BYTE *)prime2 + sizeof(CK_ATTRIBUTE), prime2->ulValueLen ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_INTEGER failed\n"); + TRACE_DEVEL("ber_encode_INTEGER failed\n"); goto error; } memcpy( buf+offset, tmp, len ); @@ -1586,7 +1586,7 @@ ber_encode_DSAPrivateKey( CK_BBOOL length_only, rc = ber_encode_INTEGER( FALSE, &tmp, &len, (CK_BYTE *)base + sizeof(CK_ATTRIBUTE), base->ulValueLen ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_INTEGER failed\n"); + TRACE_DEVEL("ber_encode_INTEGER failed\n"); goto error; } memcpy( buf+offset, tmp, len ); @@ -1596,7 +1596,7 @@ ber_encode_DSAPrivateKey( CK_BBOOL length_only, rc = ber_encode_SEQUENCE( FALSE, ¶m, ¶m_len, buf, offset ); if (rc != CKR_OK) { - TRACE_DEBUG("ber_encode_SEQUENCE failed\n"); + TRACE_DEVEL("ber_encode_SEQUENCE failed\n"); free(buf); return rc; } @@ -1625,7 +1625,7 @@ ber_encode_DSAPrivateKey( CK_BBOOL length_only, rc = ber_encode_SEQUENCE( FALSE, &alg, &alg_len, buf, len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_SEQUENCE failed\n"); + TRACE_DEVEL("ber_encode_SEQUENCE failed\n"); goto error; } free( buf ); @@ -1635,7 +1635,7 @@ ber_encode_DSAPrivateKey( CK_BBOOL length_only, // rc = ber_encode_INTEGER( FALSE, &buf, &len, (CK_BYTE *)priv_key + sizeof(CK_ATTRIBUTE), priv_key->ulValueLen ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_INTEGER failed\n"); + TRACE_DEVEL("ber_encode_INTEGER failed\n"); goto error; } @@ -1644,7 +1644,7 @@ ber_encode_DSAPrivateKey( CK_BBOOL length_only, alg, alg_len, buf, len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_PrivateKeyInfo failed\n"); + TRACE_DEVEL("ber_encode_PrivateKeyInfo failed\n"); goto error; } @@ -1682,7 +1682,7 @@ ber_decode_DSAPrivateKey( CK_BYTE * data, rc = ber_decode_PrivateKeyInfo( data, data_len, &alg, &len, &dsakey ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_PrivateKeyInfo failed\n"); + TRACE_DEVEL("ber_decode_PrivateKeyInfo failed\n"); return rc; } @@ -1698,7 +1698,7 @@ ber_decode_DSAPrivateKey( CK_BYTE * data, // rc = ber_decode_SEQUENCE( alg + ber_idDSALen, &buf, &buf_len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_SEQUENCE failed\n"); + TRACE_DEVEL("ber_decode_SEQUENCE failed\n"); return rc; } offset = 0; @@ -1707,7 +1707,7 @@ ber_decode_DSAPrivateKey( CK_BYTE * data, // rc = ber_decode_INTEGER( buf+offset, &tmp, &len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_INTEGER failed\n"); + TRACE_DEVEL("ber_decode_INTEGER failed\n"); goto cleanup; } offset += field_len; @@ -1716,7 +1716,7 @@ ber_decode_DSAPrivateKey( CK_BYTE * data, // rc = ber_decode_INTEGER( buf+offset, &tmp, &len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_INTEGER failed\n"); + TRACE_DEVEL("ber_decode_INTEGER failed\n"); goto cleanup; } offset += field_len; @@ -1725,7 +1725,7 @@ ber_decode_DSAPrivateKey( CK_BYTE * data, // rc = ber_decode_INTEGER( buf+offset, &tmp, &len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_INTEGER failed\n"); + TRACE_DEVEL("ber_decode_INTEGER failed\n"); goto cleanup; } offset += field_len; @@ -1744,13 +1744,13 @@ ber_decode_DSAPrivateKey( CK_BYTE * data, // rc = ber_decode_INTEGER( buf+offset, &tmp, &len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_INTEGER failed\n"); + TRACE_DEVEL("ber_decode_INTEGER failed\n"); goto cleanup; } else { rc = build_attribute( CKA_PRIME, tmp, len, &p_attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto cleanup; } offset += field_len; @@ -1760,13 +1760,13 @@ ber_decode_DSAPrivateKey( CK_BYTE * data, // rc = ber_decode_INTEGER( buf+offset, &tmp, &len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_INTEGER failed\n"); + TRACE_DEVEL("ber_decode_INTEGER failed\n"); goto cleanup; } else { rc = build_attribute( CKA_SUBPRIME, tmp, len, &q_attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto cleanup; } offset += field_len; @@ -1776,13 +1776,13 @@ ber_decode_DSAPrivateKey( CK_BYTE * data, // rc = ber_decode_INTEGER( buf+offset, &tmp, &len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_INTEGER failed\n"); + TRACE_DEVEL("ber_decode_INTEGER failed\n"); goto cleanup; } else { rc = build_attribute( CKA_BASE, tmp, len, &g_attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto cleanup; } offset += field_len; @@ -1792,13 +1792,13 @@ ber_decode_DSAPrivateKey( CK_BYTE * data, // rc = ber_decode_INTEGER( dsakey, &tmp, &len, &field_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_INTEGER failed\n"); + TRACE_DEVEL("ber_decode_INTEGER failed\n"); goto cleanup; } else { rc = build_attribute( CKA_VALUE, tmp, len, &x_attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto cleanup; } offset += field_len; diff --git a/usr/lib/pkcs11/common/dig_mgr.c b/usr/lib/pkcs11/common/dig_mgr.c index 10d7c3f2..19cd49b2 100755 --- a/usr/lib/pkcs11/common/dig_mgr.c +++ b/usr/lib/pkcs11/common/dig_mgr.c @@ -696,7 +696,7 @@ digest_mgr_digest_key( SESSION * sess, attr->pValue, attr->ulValueLen ); if (rc != CKR_OK){ - TRACE_DEBUG("digest_mgr_digest_update failed\n"); + TRACE_DEVEL("digest_mgr_digest_update failed\n"); } out: diff --git a/usr/lib/pkcs11/common/key.c b/usr/lib/pkcs11/common/key.c index 3c3d7e60..274bc904 100755 --- a/usr/lib/pkcs11/common/key.c +++ b/usr/lib/pkcs11/common/key.c @@ -567,7 +567,7 @@ publ_key_set_default_attributes( TEMPLATE *tmpl, CK_ULONG mode ) rc = key_object_set_default_attributes( tmpl, mode ); if (rc != CKR_OK){ - TRACE_DEBUG("key_object_set_default_attributes failed\n"); + TRACE_DEVEL("key_object_set_default_attributes failed\n"); return rc; } // add the default CKO_PUBLIC_KEY attributes @@ -697,7 +697,7 @@ priv_key_set_default_attributes( TEMPLATE *tmpl, CK_ULONG mode ) rc = key_object_set_default_attributes( tmpl, mode ); if (rc != CKR_OK){ - TRACE_DEBUG("key_object_set_default_attributes failed\n"); + TRACE_DEVEL("key_object_set_default_attributes failed\n"); return rc; } // add the default CKO_PUBLIC_KEY attributes @@ -832,7 +832,7 @@ priv_key_unwrap( TEMPLATE *tmpl, } if (rc != CKR_OK) { - TRACE_DEBUG("priv unwrap failed\n"); + TRACE_DEVEL("priv unwrap failed\n"); return rc; } @@ -844,27 +844,27 @@ priv_key_unwrap( TEMPLATE *tmpl, // rc = build_attribute( CKA_LOCAL, &false, 1, &local ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto cleanup; } rc = build_attribute( CKA_ALWAYS_SENSITIVE, &false, 1, &always_sens ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto cleanup; } rc = build_attribute( CKA_SENSITIVE, &false, 1, &sensitive ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto cleanup; } rc = build_attribute( CKA_EXTRACTABLE, &true, 1, &extractable ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto cleanup; } rc = build_attribute( CKA_NEVER_EXTRACTABLE, &false, 1, &never_extract ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto cleanup; } template_update_attribute( tmpl, local ); @@ -1174,27 +1174,27 @@ secret_key_unwrap( TEMPLATE *tmpl, // rc = build_attribute( CKA_LOCAL, &false, 1, &local ); if (rc != CKR_OK){ - TRACE_DEBUG("build attribute failed\n"); + TRACE_DEVEL("build attribute failed\n"); goto cleanup; } rc = build_attribute( CKA_ALWAYS_SENSITIVE, &false, 1, &always_sens ); if (rc != CKR_OK){ - TRACE_DEBUG("build attribute failed\n"); + TRACE_DEVEL("build attribute failed\n"); goto cleanup; } rc = build_attribute( CKA_SENSITIVE, &false, 1, &sensitive ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto cleanup; } rc = build_attribute( CKA_EXTRACTABLE, &true, 1, &extractable ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto cleanup; } rc = build_attribute( CKA_NEVER_EXTRACTABLE, &false, 1, &never_extract ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto cleanup; } template_update_attribute( tmpl, local ); @@ -1769,7 +1769,7 @@ FALSE){ publ_exp, priv_exp, prime1, prime2, exponent1, exponent2, coeff, opaque); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_RSAPrivateKey failed\n"); + TRACE_DEVEL("ber_encode_RSAPrivateKey failed\n"); } return rc; } @@ -1808,7 +1808,7 @@ rsa_priv_unwrap( TEMPLATE *tmpl, isopaque ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_RSAPrivateKey failed\n"); + TRACE_DEVEL("ber_decode_RSAPrivateKey failed\n"); return rc; } p11_attribute_trim( modulus ); @@ -2253,7 +2253,7 @@ dsa_priv_wrap_get_data( TEMPLATE *tmpl, rc = ber_encode_DSAPrivateKey( length_only, data, data_len, prime, subprime, base, value ); if (rc != CKR_OK) - TRACE_DEBUG("ber_encode_DSAPrivateKe failed\n"); + TRACE_DEVEL("ber_encode_DSAPrivateKe failed\n"); return rc; } @@ -2276,7 +2276,7 @@ dsa_priv_unwrap( TEMPLATE *tmpl, &prime, &subprime, &base, &value ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_DSAPrivateKey failed\n"); + TRACE_DEVEL("ber_decode_DSAPrivateKey failed\n"); return rc; } p11_attribute_trim( prime ); @@ -3322,13 +3322,13 @@ generic_secret_unwrap( TEMPLATE *tmpl, rc = build_attribute( CKA_VALUE, ptr, data_len, &value_attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto error; } if (data_len != len) { rc = build_attribute( CKA_VALUE_LEN, (CK_BYTE *)&data_len, sizeof(CK_ULONG), &value_len_attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto error; } } diff --git a/usr/lib/pkcs11/common/key_mgr.c b/usr/lib/pkcs11/common/key_mgr.c index cc54d519..1c19ad9c 100755 --- a/usr/lib/pkcs11/common/key_mgr.c +++ b/usr/lib/pkcs11/common/key_mgr.c @@ -427,7 +427,7 @@ key_mgr_generate_key( SESSION * sess, CKO_SECRET_KEY, subclass, &key_obj ); if (rc != CKR_OK){ - TRACE_DEBUG("object_mgr_create_skel failed.\n"); + TRACE_DEVEL("object_mgr_create_skel failed.\n"); goto error; } @@ -479,7 +479,7 @@ key_mgr_generate_key( SESSION * sess, rc = build_attribute( CKA_ALWAYS_SENSITIVE, &flag, sizeof(CK_BBOOL), &new_attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build attribute failed.\n"); + TRACE_DEVEL("build attribute failed.\n"); goto error; } template_update_attribute( key_obj->template, new_attr ); @@ -497,7 +497,7 @@ key_mgr_generate_key( SESSION * sess, rc = build_attribute( CKA_NEVER_EXTRACTABLE, &true, sizeof(CK_BBOOL), &new_attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto error; } if (flag == TRUE) @@ -517,7 +517,7 @@ key_mgr_generate_key( SESSION * sess, // rc = object_mgr_create_final( sess, key_obj, handle ); if (rc != CKR_OK){ - TRACE_DEBUG("object_mgr_create_final failed.\n"); + TRACE_DEVEL("object_mgr_create_final failed.\n"); goto error; } return rc; @@ -657,7 +657,7 @@ key_mgr_generate_key_pair( SESSION * sess, CKO_PUBLIC_KEY, subclass, &publ_key_obj ); if (rc != CKR_OK){ - TRACE_DEBUG("object_mgr_create_skel failed.\n"); + TRACE_DEVEL("object_mgr_create_skel failed.\n"); goto error; } rc = object_mgr_create_skel( sess, @@ -666,7 +666,7 @@ key_mgr_generate_key_pair( SESSION * sess, CKO_PRIVATE_KEY, subclass, &priv_key_obj ); if (rc != CKR_OK){ - TRACE_DEBUG("object_mgr_create_skel failed.\n"); + TRACE_DEVEL("object_mgr_create_skel failed.\n"); goto error; } @@ -709,7 +709,7 @@ key_mgr_generate_key_pair( SESSION * sess, } if (rc != CKR_OK){ - TRACE_DEBUG("Key Generation failed.\n"); + TRACE_DEVEL("Key Generation failed.\n"); goto error; } @@ -723,7 +723,7 @@ key_mgr_generate_key_pair( SESSION * sess, rc = build_attribute( CKA_ALWAYS_SENSITIVE, &flag, sizeof(CK_BBOOL), &new_attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed.\n"); + TRACE_DEVEL("build_attribute failed.\n"); goto error; } template_update_attribute( priv_key_obj->template, new_attr ); @@ -741,7 +741,7 @@ key_mgr_generate_key_pair( SESSION * sess, rc = build_attribute( CKA_NEVER_EXTRACTABLE, &true, sizeof(CK_BBOOL), &new_attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed.\n"); + TRACE_DEVEL("build_attribute failed.\n"); goto error; } if (flag == TRUE) @@ -761,12 +761,12 @@ key_mgr_generate_key_pair( SESSION * sess, // rc = object_mgr_create_final( sess, publ_key_obj, publ_key_handle ); if (rc != CKR_OK){ - TRACE_DEBUG("object_mgr_create_final failed.\n"); + TRACE_DEVEL("object_mgr_create_final failed.\n"); goto error; } rc = object_mgr_create_final( sess, priv_key_obj, priv_key_handle ); if (rc != CKR_OK){ - TRACE_DEBUG("object_mgr_create_final failed.\n"); + TRACE_DEVEL("object_mgr_create_final failed.\n"); // just calling object_free in the error path below would lead to a double // free error on session close - KEY 09/26/07 object_mgr_destroy_object( sess, *publ_key_handle ); @@ -852,7 +852,7 @@ key_mgr_wrap_key( SESSION * sess, // rc = template_attribute_find( key2_obj->template, CKA_CLASS, &attr ); if (rc == FALSE) { - TRACE_DEBUG("CKA_CLASS is missing for key to be wrapped.\n"); + TRACE_DEVEL("CKA_CLASS is missing for key to be wrapped.\n"); return CKR_KEY_NOT_WRAPPABLE; } else @@ -929,7 +929,7 @@ key_mgr_wrap_key( SESSION * sess, case CKK_DES: rc = des_wrap_get_data( key2_obj->template, length_only, &data, &data_len ); if (rc != CKR_OK){ - TRACE_DEBUG("des_wrap_get_data failed.\n"); + TRACE_DEVEL("des_wrap_get_data failed.\n"); return rc; } break; @@ -937,7 +937,7 @@ key_mgr_wrap_key( SESSION * sess, case CKK_DES3: rc = des3_wrap_get_data( key2_obj->template, length_only, &data, &data_len ); if (rc != CKR_OK){ - TRACE_DEBUG("des3_wrap_get_data failed.\n"); + TRACE_DEVEL("des3_wrap_get_data failed.\n"); return rc; } break; @@ -945,7 +945,7 @@ key_mgr_wrap_key( SESSION * sess, case CKK_RSA: rc = rsa_priv_wrap_get_data( key2_obj->template, length_only, &data, &data_len ); if (rc != CKR_OK){ - TRACE_DEBUG("rsa_priv_wrap_get_data failed.\n"); + TRACE_DEVEL("rsa_priv_wrap_get_data failed.\n"); return rc; } break; @@ -954,7 +954,7 @@ key_mgr_wrap_key( SESSION * sess, case CKK_DSA: rc = dsa_priv_wrap_get_data( key2_obj->template, length_only, &data, &data_len ); if (rc != CKR_OK){ - TRACE_DEBUG("dsa_priv_wrap_get_data failed.\n"); + TRACE_DEVEL("dsa_priv_wrap_get_data failed.\n"); return rc; } break; @@ -963,7 +963,7 @@ key_mgr_wrap_key( SESSION * sess, case CKK_GENERIC_SECRET: rc = generic_secret_wrap_get_data( key2_obj->template, length_only, &data, &data_len ); if (rc != CKR_OK){ - TRACE_DEBUG("generic_secret_wrap_get_data failed.\n"); + TRACE_DEVEL("generic_secret_wrap_get_data failed.\n"); return rc; } break; @@ -971,7 +971,7 @@ key_mgr_wrap_key( SESSION * sess, case CKK_AES: rc = aes_wrap_get_data( key2_obj->template, length_only, &data, &data_len ); if (rc != CKR_OK){ - TRACE_DEBUG("aes_wrap_get_data failed.\n"); + TRACE_DEVEL("aes_wrap_get_data failed.\n"); return rc; } break; @@ -994,7 +994,7 @@ key_mgr_wrap_key( SESSION * sess, case CKM_DES3_CBC: rc = ckm_des_wrap_format( length_only, &data, &data_len ); if (rc != CKR_OK) { - TRACE_DEBUG("ckm_des_wrap_format failed.\n"); + TRACE_DEVEL("ckm_des_wrap_format failed.\n"); if (data) free( data ); return rc; } @@ -1009,7 +1009,7 @@ key_mgr_wrap_key( SESSION * sess, case CKM_AES_CFB128: rc = ckm_aes_wrap_format( length_only, &data, &data_len ); if (rc != CKR_OK) { - TRACE_DEBUG("ckm_aes_wrap_format failed.\n"); + TRACE_DEVEL("ckm_aes_wrap_format failed.\n"); if (data) free( data ); return rc; } @@ -1046,7 +1046,7 @@ key_mgr_wrap_key( SESSION * sess, // rc = encr_mgr_init( sess, ctx, OP_WRAP, mech, h_wrapping_key ); if (rc != CKR_OK){ - TRACE_DEBUG("encr_mgr_init failed.\n"); + TRACE_DEVEL("encr_mgr_init failed.\n"); return rc; } // do the encryption and clean up. at this point, 'value' may or may not @@ -1204,7 +1204,7 @@ key_mgr_unwrap_key( SESSION * sess, wrapped_key, wrapped_key_len, data, &data_len ); if (rc != CKR_OK){ - TRACE_DEBUG("decr_mgr_decrypt failed.\n"); + TRACE_DEVEL("decr_mgr_decrypt failed.\n"); goto error; } data = (CK_BYTE *)malloc(data_len); @@ -1224,7 +1224,7 @@ key_mgr_unwrap_key( SESSION * sess, free( ctx ); if (rc != CKR_OK){ - TRACE_DEBUG("decr_mgr_decrypt failed.\n"); + TRACE_DEVEL("decr_mgr_decrypt failed.\n"); goto error; } // if we use X.509, the data will be padded from the front with zeros. @@ -1243,7 +1243,7 @@ key_mgr_unwrap_key( SESSION * sess, if (keyclass == CKO_PRIVATE_KEY) { rc = key_mgr_get_private_key_type( data, data_len, &keytype ); if (rc != CKR_OK){ - TRACE_DEBUG("key_mgr_get_private_key_type failed.\n"); + TRACE_DEVEL("key_mgr_get_private_key_type failed.\n"); goto error; } } @@ -1259,7 +1259,7 @@ key_mgr_unwrap_key( SESSION * sess, keyclass, keytype, &key_obj ); if (rc != CKR_OK){ - TRACE_DEBUG("object_mgr_create_skel failed.\n"); + TRACE_DEVEL("object_mgr_create_skel failed.\n"); goto error; } // at this point, 'key_obj' should contain a skeleton key. depending on @@ -1284,7 +1284,7 @@ key_mgr_unwrap_key( SESSION * sess, } if (rc != CKR_OK){ - TRACE_DEBUG("key_unwrap failed.\n"); + TRACE_DEVEL("key_unwrap failed.\n"); goto error; } // at this point, the key should be fully constructed...assign @@ -1292,7 +1292,7 @@ key_mgr_unwrap_key( SESSION * sess, // rc = object_mgr_create_final( sess, key_obj, h_unwrapped_key ); if (rc != CKR_OK){ - TRACE_DEBUG("object_mgr_create_final failed.\n"); + TRACE_DEVEL("object_mgr_create_final failed.\n"); goto error; } if (data) free(data); @@ -1318,7 +1318,7 @@ key_mgr_get_private_key_type( CK_BYTE *keydata, rc = ber_decode_PrivateKeyInfo( keydata, keylen, &alg, &alg_len, &priv_key ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_decode_PrivateKeyInfo failed.\n"); + TRACE_DEVEL("ber_decode_PrivateKeyInfo failed.\n"); return rc; } // check the entire AlgorithmIdentifier for RSA diff --git a/usr/lib/pkcs11/common/loadsave.c b/usr/lib/pkcs11/common/loadsave.c index 27883849..bf21536a 100755 --- a/usr/lib/pkcs11/common/loadsave.c +++ b/usr/lib/pkcs11/common/loadsave.c @@ -428,7 +428,7 @@ static CK_RV encrypt_data(CK_BYTE *key, CK_ULONG keylen, const CK_BYTE *iv, rc = object_create_skel(key_tmpl, 3, MODE_CREATE, CKO_SECRET_KEY, keyType, &keyobj); if (rc != CKR_OK) { - TRACE_DEBUG("object_create_skel failed.\n"); + TRACE_DEVEL("object_create_skel failed.\n"); return rc; } @@ -542,7 +542,7 @@ static CK_RV decrypt_data(CK_BYTE *key, CK_ULONG keylen, const CK_BYTE *iv, rc = object_create_skel(key_tmpl, 3, MODE_CREATE, CKO_SECRET_KEY, keyType, &keyobj); if (rc != CKR_OK) { - TRACE_DEBUG("object_create_skel failed.\n"); + TRACE_DEVEL("object_create_skel failed.\n"); return rc; } @@ -651,7 +651,7 @@ void set_perm(int file) return; error: - TRACE_DEBUG("Unable to set permissions on file.\n"); + TRACE_DEVEL("Unable to set permissions on file.\n"); } // @@ -1238,7 +1238,7 @@ CK_RV restore_private_token_object(CK_BYTE * data, CK_ULONG len, OBJECT * pObj) // tampered with or the key was incorrect // if (rc != CKR_OK || (clear_len > len)) { - TRACE_DEBUG("strip_pkcs_padding failed.\n"); + TRACE_DEVEL("strip_pkcs_padding failed.\n"); rc = CKR_FUNCTION_FAILED; goto done; } @@ -1358,7 +1358,7 @@ CK_RV load_masterkey_so(void) cipher, cipher_len, clear, &clear_len); if (rc != CKR_OK) { - TRACE_DEBUG("decrypt_data_with_clear_key failed.\n"); + TRACE_DEVEL("decrypt_data_with_clear_key failed.\n"); goto done; } @@ -1464,7 +1464,7 @@ CK_RV load_masterkey_user(void) cipher, cipher_len, clear, &clear_len); if (rc != CKR_OK) { - TRACE_DEBUG("decrypt_data_with_clear_key failed.\n"); + TRACE_DEVEL("decrypt_data_with_clear_key failed.\n"); goto done; } diff --git a/usr/lib/pkcs11/common/mech_aes.c b/usr/lib/pkcs11/common/mech_aes.c index f5f17ec7..453253df 100644 --- a/usr/lib/pkcs11/common/mech_aes.c +++ b/usr/lib/pkcs11/common/mech_aes.c @@ -1763,7 +1763,7 @@ aes_ofb_encrypt( SESSION * sess, key_obj, ctx->mech.pParameter, 1); if (rc != CKR_OK) - TRACE_DEBUG("Token specific aes ofb encrypt failed.\n"); + TRACE_DEVEL("Token specific aes ofb encrypt failed.\n"); return rc; } @@ -1840,7 +1840,7 @@ aes_ofb_encrypt_update( SESSION * sess, memcpy( context->data, in_data + (in_data_len - remain), remain ); context->len = remain; } else - TRACE_DEBUG("Token specific aes ofb encrypt failed.\n"); + TRACE_DEVEL("Token specific aes ofb encrypt failed.\n"); free( cipher ); return rc; } @@ -1889,7 +1889,7 @@ aes_ofb_encrypt_final( SESSION *sess, key_obj, ctx->mech.pParameter, 1); if (rc != CKR_OK) - TRACE_DEBUG("Token specific aes ofb encrypt failed.\n"); + TRACE_DEVEL("Token specific aes ofb encrypt failed.\n"); *out_data_len = context->len; return rc; @@ -1933,7 +1933,7 @@ aes_ofb_decrypt( SESSION * sess, key_obj, ctx->mech.pParameter, 0); if (rc != CKR_OK) - TRACE_DEBUG("Token specific aes ofb decrypt failed.\n"); + TRACE_DEVEL("Token specific aes ofb decrypt failed.\n"); return rc; } @@ -2011,7 +2011,7 @@ aes_ofb_decrypt_update( SESSION * sess, memcpy( context->data, in_data + (in_data_len - remain), remain ); context->len = remain; } else - TRACE_DEBUG("Token specific aes ofb decrypt failed.\n"); + TRACE_DEVEL("Token specific aes ofb decrypt failed.\n"); free( cipher ); return rc; } @@ -2063,7 +2063,7 @@ aes_ofb_decrypt_final( SESSION *sess, key_obj, ctx->mech.pParameter, 0); if (rc != CKR_OK) - TRACE_DEBUG("Token specific aes ofb decrypt failed.\n"); + TRACE_DEVEL("Token specific aes ofb decrypt failed.\n"); *out_data_len = context->len; return rc; @@ -2108,7 +2108,7 @@ aes_cfb_encrypt( SESSION * sess, key_obj, ctx->mech.pParameter, cfb_len, 1); if (rc != CKR_OK) - TRACE_DEBUG("Token specific aes cfb encrypt failed.\n"); + TRACE_DEVEL("Token specific aes cfb encrypt failed.\n"); return rc; } @@ -2186,7 +2186,7 @@ aes_cfb_encrypt_update( SESSION * sess, memcpy( context->data, in_data + (in_data_len - remain), remain ); context->len = remain; } else - TRACE_DEBUG("Token specific aes cfb encrypt failed.\n"); + TRACE_DEVEL("Token specific aes cfb encrypt failed.\n"); free( cipher ); return rc; } @@ -2236,7 +2236,7 @@ aes_cfb_encrypt_final( SESSION *sess, key_obj, ctx->mech.pParameter, cfb_len, 1); if (rc != CKR_OK) - TRACE_DEBUG("Token specific aes cfb encrypt failed.\n"); + TRACE_DEVEL("Token specific aes cfb encrypt failed.\n"); *out_data_len = context->len; return rc; @@ -2281,7 +2281,7 @@ aes_cfb_decrypt( SESSION * sess, key_obj, ctx->mech.pParameter, cfb_len, 0); if (rc != CKR_OK) - TRACE_DEBUG("Token specific aes cfb decrypt failed.\n"); + TRACE_DEVEL("Token specific aes cfb decrypt failed.\n"); return rc; } @@ -2360,7 +2360,7 @@ aes_cfb_decrypt_update( SESSION * sess, context->len = remain; } else - TRACE_DEBUG("Token specific aes cfb decrypt failed.\n"); + TRACE_DEVEL("Token specific aes cfb decrypt failed.\n"); free( cipher ); return rc; } @@ -2410,7 +2410,7 @@ aes_cfb_decrypt_final( SESSION *sess, key_obj, ctx->mech.pParameter, cfb_len, 0); if (rc != CKR_OK) - TRACE_DEBUG("Token specific aes cfb decrypt failed.\n"); + TRACE_DEVEL("Token specific aes cfb decrypt failed.\n"); *out_data_len = context->len; return rc; @@ -2472,7 +2472,7 @@ aes_mac_sign( SESSION * sess, rc = token_specific.t_aes_mac(in_data, in_data_len, key_obj, ((AES_DATA_CONTEXT *)ctx->context)->iv); if (rc != CKR_OK) - TRACE_DEBUG("Token specific aes mac failed.\n"); + TRACE_DEVEL("Token specific aes mac failed.\n"); memcpy(out_data, ((AES_DATA_CONTEXT *)ctx->context)->iv, mac_len); *out_data_len = mac_len; @@ -2535,7 +2535,7 @@ aes_mac_sign_update ( SESSION * sess, memcpy( context->data, in_data + (in_data_len - remain), remain ); context->len = remain; } else - TRACE_DEBUG("Token specific aes mac failed.\n"); + TRACE_DEVEL("Token specific aes mac failed.\n"); free( cipher ); return rc; @@ -2595,7 +2595,7 @@ aes_mac_sign_final( SESSION * sess, rc = token_specific.t_aes_mac(context->data, AES_BLOCK_SIZE, key_obj, context->iv); if (rc != CKR_OK) { - TRACE_DEBUG("Token Specific aes mac failed.\n"); + TRACE_DEVEL("Token Specific aes mac failed.\n"); return rc; } } @@ -2652,7 +2652,7 @@ aes_mac_verify( SESSION * sess, key_obj, ((AES_DATA_CONTEXT *)ctx->context)->iv); if (rc != CKR_OK) - TRACE_DEBUG("Token specific aes mac failed.\n"); + TRACE_DEVEL("Token specific aes mac failed.\n"); if (memcmp( out_data, ((AES_DATA_CONTEXT *)ctx->context)->iv, out_data_len) == 0) { return CKR_OK; @@ -2718,7 +2718,7 @@ aes_mac_verify_update( SESSION * sess, context->len = remain; } else - TRACE_DEBUG("Token specific aes mac failed.\n"); + TRACE_DEVEL("Token specific aes mac failed.\n"); free( cipher ); return rc; @@ -2770,7 +2770,7 @@ aes_mac_verify_final( SESSION * sess, } rc = token_specific.t_aes_mac(context->data, AES_BLOCK_SIZE, key_obj, context->iv); if (rc != CKR_OK) { - TRACE_DEBUG("Token specific aes mac failed.\n"); + TRACE_DEVEL("Token specific aes mac failed.\n"); return rc; } } @@ -2938,7 +2938,7 @@ ckm_aes_ecb_encrypt( CK_BYTE * in_data, out_data,out_data_len, key, 1); if (rc != CKR_OK) - TRACE_DEBUG("Token specific aes ecb encrypt failed.\n"); + TRACE_DEVEL("Token specific aes ecb encrypt failed.\n"); return rc; } @@ -2972,7 +2972,7 @@ ckm_aes_ecb_decrypt( CK_BYTE * in_data, out_data,out_data_len, key, 0); if (rc != CKR_OK) - TRACE_DEBUG("token specific aes ecb decrypt failed.\n"); + TRACE_DEVEL("token specific aes ecb decrypt failed.\n"); return rc; } @@ -3009,7 +3009,7 @@ ckm_aes_cbc_encrypt( CK_BYTE * in_data, out_data,out_data_len, key, init_v, 1); if (rc != CKR_OK) - TRACE_DEBUG("Token specific aes cbc encrypt failed.\n"); + TRACE_DEVEL("Token specific aes cbc encrypt failed.\n"); return rc; } @@ -3044,7 +3044,7 @@ ckm_aes_cbc_decrypt( CK_BYTE * in_data, out_data, out_data_len, key, init_v,0); if (rc != CKR_OK) - TRACE_DEBUG("Token specific aes cbc decrypt failed.\n"); + TRACE_DEVEL("Token specific aes cbc decrypt failed.\n"); return rc; } // @@ -3082,7 +3082,7 @@ ckm_aes_ctr_encrypt( CK_BYTE *in_data, out_data, out_data_len, key, counterblock, counter_width, 1); if (rc != CKR_OK) - TRACE_DEBUG("Token specific aes ctr encrypt failed.\n"); + TRACE_DEVEL("Token specific aes ctr encrypt failed.\n"); return rc; } // diff --git a/usr/lib/pkcs11/common/mech_des.c b/usr/lib/pkcs11/common/mech_des.c index 07edb8b9..62fa356f 100755 --- a/usr/lib/pkcs11/common/mech_des.c +++ b/usr/lib/pkcs11/common/mech_des.c @@ -1621,7 +1621,7 @@ ckm_des_ecb_encrypt( CK_BYTE * in_data, out_data, out_data_len, key, 1); if (rc != CKR_OK) - TRACE_DEBUG("Token specific des_ecb encrypt failed.\n"); + TRACE_DEVEL("Token specific des_ecb encrypt failed.\n"); return rc; } diff --git a/usr/lib/pkcs11/common/mech_des3.c b/usr/lib/pkcs11/common/mech_des3.c index de3d5e41..479d1c38 100755 --- a/usr/lib/pkcs11/common/mech_des3.c +++ b/usr/lib/pkcs11/common/mech_des3.c @@ -1444,7 +1444,7 @@ des3_ofb_encrypt( SESSION * sess, rc = token_specific.t_tdes_ofb(in_data, out_data, in_data_len, key_obj, ctx->mech.pParameter, 1); if (rc != CKR_OK) - TRACE_DEBUG("Token specific des3 ofb encrypt failed.\n"); + TRACE_DEVEL("Token specific des3 ofb encrypt failed.\n"); return rc; } @@ -1521,7 +1521,7 @@ des3_ofb_encrypt_update( SESSION * sess, memcpy( context->data, in_data + (in_data_len - remain), remain ); context->len = remain; } else - TRACE_DEBUG("Token specific des3 ofb encrypt failed.\n"); + TRACE_DEVEL("Token specific des3 ofb encrypt failed.\n"); free( cipher ); return rc; } @@ -1569,7 +1569,7 @@ des3_ofb_encrypt_final( SESSION *sess, rc = token_specific.t_tdes_ofb(context->data, out_data, context->len, key_obj, ctx->mech.pParameter, 1); if (rc != CKR_OK) - TRACE_DEBUG("Token specific des3 ofb encrypt failed.\n"); + TRACE_DEVEL("Token specific des3 ofb encrypt failed.\n"); *out_data_len = context->len; return rc; @@ -1613,7 +1613,7 @@ des3_ofb_decrypt( SESSION * sess, key_obj, ctx->mech.pParameter, 0); if (rc != CKR_OK) - TRACE_DEBUG("Token specific des3 ofb decrypt failed.\n"); + TRACE_DEVEL("Token specific des3 ofb decrypt failed.\n"); return rc; } @@ -1691,7 +1691,7 @@ des3_ofb_decrypt_update( SESSION * sess, context->len = remain; } else - TRACE_DEBUG("Token specific des3 ofb decrypt failed.\n"); + TRACE_DEVEL("Token specific des3 ofb decrypt failed.\n"); free( cipher ); return rc; } @@ -1740,7 +1740,7 @@ des3_ofb_decrypt_final( SESSION *sess, key_obj, ctx->mech.pParameter, 0); if (rc != CKR_OK) - TRACE_DEBUG("Token specific des3 ofb decrypt failed.\n"); + TRACE_DEVEL("Token specific des3 ofb decrypt failed.\n"); *out_data_len = context->len; return rc; @@ -1785,7 +1785,7 @@ des3_cfb_encrypt( SESSION * sess, key_obj, ctx->mech.pParameter, cfb_len, 1); if (rc != CKR_OK) - TRACE_DEBUG("Token specific des3 cfb encrypt failed.\n"); + TRACE_DEVEL("Token specific des3 cfb encrypt failed.\n"); return rc; } @@ -1863,7 +1863,7 @@ des3_cfb_encrypt_update( SESSION * sess, context->len = remain; } else - TRACE_DEBUG("Token specific des3 cfb encrypt failed.\n"); + TRACE_DEVEL("Token specific des3 cfb encrypt failed.\n"); free( cipher ); return rc; } @@ -1913,7 +1913,7 @@ des3_cfb_encrypt_final( SESSION *sess, key_obj, ctx->mech.pParameter, cfb_len, 1); if (rc != CKR_OK) - TRACE_DEBUG("Token specific des3 cfb encrypt failed.\n"); + TRACE_DEVEL("Token specific des3 cfb encrypt failed.\n"); *out_data_len = context->len; return rc; @@ -1958,7 +1958,7 @@ des3_cfb_decrypt( SESSION * sess, key_obj, ctx->mech.pParameter, cfb_len, 0); if (rc != CKR_OK) - TRACE_DEBUG("Token specific des3 cfd decrypt failed.\n"); + TRACE_DEVEL("Token specific des3 cfd decrypt failed.\n"); return rc; } @@ -2037,7 +2037,7 @@ des3_cfb_decrypt_update( SESSION * sess, context->len = remain; } else - TRACE_DEBUG("Token specific des3 cfb decrypt failed.\n"); + TRACE_DEVEL("Token specific des3 cfb decrypt failed.\n"); free( cipher ); return rc; } @@ -2087,7 +2087,7 @@ des3_cfb_decrypt_final( SESSION *sess, key_obj, ctx->mech.pParameter, cfb_len, 0); if (rc != CKR_OK) - TRACE_DEBUG("Token specific des3 cfb decrypt failed.\n"); + TRACE_DEVEL("Token specific des3 cfb decrypt failed.\n"); *out_data_len = context->len; return rc; @@ -2147,7 +2147,7 @@ des3_mac_sign( SESSION * sess, ((DES_DATA_CONTEXT *)ctx->context)->iv); if (rc != CKR_OK) - TRACE_DEBUG("Token specific des3 mac failed.\n"); + TRACE_DEVEL("Token specific des3 mac failed.\n"); memcpy(out_data, ((DES_DATA_CONTEXT *)ctx->context)->iv, mac_len); *out_data_len = mac_len; @@ -2210,7 +2210,7 @@ des3_mac_sign_update ( SESSION * sess, context->len = remain; } else - TRACE_DEBUG("Token specific des3 mac failed.\n"); + TRACE_DEVEL("Token specific des3 mac failed.\n"); free( cipher ); return rc; @@ -2269,7 +2269,7 @@ des3_mac_sign_final( SESSION * sess, } rc = token_specific.t_tdes_mac(context->data, DES_BLOCK_SIZE, key_obj, context->iv); if (rc != CKR_OK) { - TRACE_DEBUG("Token specific des3 mac failed.\n"); + TRACE_DEVEL("Token specific des3 mac failed.\n"); return rc; } } @@ -2325,7 +2325,7 @@ des3_mac_verify( SESSION * sess, rc = token_specific.t_tdes_mac(in_data, in_data_len, key_obj, ((DES_DATA_CONTEXT *)ctx->context)->iv); if (rc != CKR_OK) - TRACE_DEBUG("Token specific des3 mac failed.\n"); + TRACE_DEVEL("Token specific des3 mac failed.\n"); if (memcmp( out_data, ((DES_DATA_CONTEXT *)ctx->context)->iv, out_data_len) == 0) { @@ -2390,7 +2390,7 @@ des3_mac_verify_update( SESSION * sess, context->len = remain; } else - TRACE_DEBUG("Token specific des3 mac failed.\n"); + TRACE_DEVEL("Token specific des3 mac failed.\n"); free( cipher ); return rc; @@ -2443,7 +2443,7 @@ des3_mac_verify_final( SESSION * sess, rc = token_specific.t_tdes_mac(context->data, DES_BLOCK_SIZE, key_obj, context->iv); if (rc != CKR_OK) { - TRACE_DEBUG("Token specific des3 mac failed.\n"); + TRACE_DEVEL("Token specific des3 mac failed.\n"); return rc; } } @@ -2595,7 +2595,7 @@ ckm_des3_ecb_encrypt( CK_BYTE * in_data, if (rc != CKR_OK) - TRACE_DEBUG("Token specific des3 ecb encrypt failed.\n"); + TRACE_DEVEL("Token specific des3 ecb encrypt failed.\n"); return rc; } @@ -2629,7 +2629,7 @@ ckm_des3_ecb_decrypt( CK_BYTE * in_data, out_data, out_data_len, key, 0); if (rc != CKR_OK) - TRACE_DEBUG("Token specific des3 ecb decrypt failed.\n"); + TRACE_DEVEL("Token specific des3 ecb decrypt failed.\n"); return rc; } @@ -2665,7 +2665,7 @@ ckm_des3_cbc_encrypt( CK_BYTE * in_data, out_data, out_data_len, key, init_v, 1); if (rc != CKR_OK) - TRACE_DEBUG("Token specific des3 cbc encrypt failed.\n"); + TRACE_DEVEL("Token specific des3 cbc encrypt failed.\n"); return rc; } @@ -2699,6 +2699,6 @@ ckm_des3_cbc_decrypt( CK_BYTE * in_data, out_data, out_data_len, key, init_v, 0); if (rc != CKR_OK) - TRACE_DEBUG("Token specific des3 cbc decrypt failed.\n"); + TRACE_DEVEL("Token specific des3 cbc decrypt failed.\n"); return rc; } diff --git a/usr/lib/pkcs11/common/mech_dh.c b/usr/lib/pkcs11/common/mech_dh.c index af200931..994f2aa5 100644 --- a/usr/lib/pkcs11/common/mech_dh.c +++ b/usr/lib/pkcs11/common/mech_dh.c @@ -384,7 +384,7 @@ dh_pkcs_derive( SESSION * sess, // Build the attribute from the vales that were returned back rc = build_attribute( CKA_VALUE, secret_key_value, secret_key_value_len, &new_attr ); if (rc != CKR_OK) { - TRACE_DEBUG("Failed to build the new attribute.\n"); + TRACE_DEVEL("Failed to build the new attribute.\n"); return rc ; } @@ -397,7 +397,7 @@ dh_pkcs_derive( SESSION * sess, keyclass, keytype, &temp_obj ); if (rc != CKR_OK){ - TRACE_DEBUG("Object Mgr create skeleton failed.\n"); + TRACE_DEVEL("Object Mgr create skeleton failed.\n"); return rc; } @@ -409,7 +409,7 @@ dh_pkcs_derive( SESSION * sess, // rc = object_mgr_create_final( sess, temp_obj, handle ); if (rc != CKR_OK) { - TRACE_DEBUG("Object Mgr create final failed.\n"); + TRACE_DEVEL("Object Mgr create final failed.\n"); object_free( temp_obj ); return rc; } @@ -480,7 +480,7 @@ ckm_dh_pkcs_derive( CK_VOID_PTR other_pubkey, rc = token_specific.t_dh_pkcs_derive(secret_value, secret_value_len, p_other_pubkey, other_pubkey_len, x, x_len, p, p_len ); if (rc != CKR_OK) - TRACE_DEBUG("Token specific dh pkcs derive failed.\n"); + TRACE_DEVEL("Token specific dh pkcs derive failed.\n"); return rc; } @@ -495,7 +495,7 @@ ckm_dh_pkcs_key_pair_gen( TEMPLATE * publ_tmpl, rc = token_specific.t_dh_pkcs_key_pair_gen(publ_tmpl,priv_tmpl); if (rc != CKR_OK) - TRACE_DEBUG("Token specific dh pkcs key pair gen failed.\n"); + TRACE_DEVEL("Token specific dh pkcs key pair gen failed.\n"); return rc; } diff --git a/usr/lib/pkcs11/common/mech_dsa.c b/usr/lib/pkcs11/common/mech_dsa.c index ebbcfa93..0e069962 100755 --- a/usr/lib/pkcs11/common/mech_dsa.c +++ b/usr/lib/pkcs11/common/mech_dsa.c @@ -461,7 +461,7 @@ ckm_dsa_key_pair_gen( TEMPLATE * publ_tmpl, rc = token_specific.t_dsa_generate_keypair(publ_tmpl,priv_tmpl); if (rc != CKR_OK) - TRACE_DEBUG("Tpken specific dsa keypair generation failed.\n"); + TRACE_DEVEL("Tpken specific dsa keypair generation failed.\n"); return rc; } @@ -504,7 +504,7 @@ ckm_dsa_sign( CK_BYTE * in_data, rc = token_specific.t_dsa_sign(in_data, signature, priv_key); if (rc != CKR_OK) - TRACE_DEBUG("Token specific dsa sign failed.\n"); + TRACE_DEVEL("Token specific dsa sign failed.\n"); return rc; } @@ -546,7 +546,7 @@ ckm_dsa_verify( CK_BYTE * signature, } rc = token_specific.t_dsa_verify(signature, data, publ_key); if (rc != CKR_OK) - TRACE_DEBUG("Token specific dsa verify failed.\n"); + TRACE_DEVEL("Token specific dsa verify failed.\n"); return rc; } diff --git a/usr/lib/pkcs11/common/mech_ec.c b/usr/lib/pkcs11/common/mech_ec.c index bedca701..b4c96fe4 100644 --- a/usr/lib/pkcs11/common/mech_ec.c +++ b/usr/lib/pkcs11/common/mech_ec.c @@ -60,7 +60,7 @@ ckm_ec_sign( CK_BYTE *in_data, rc = token_specific.t_ec_sign(in_data, in_data_len, out_data, out_data_len, key_obj); if (rc != CKR_OK) - TRACE_DEBUG("EC Sign failed.\n"); + TRACE_DEVEL("EC Sign failed.\n"); return rc; } @@ -95,7 +95,7 @@ ec_sign( SESSION *sess, rc = get_ecsiglen(key_obj, &plen); if (rc != CKR_OK) { - TRACE_DEBUG("get_ecsiglen failed.\n"); + TRACE_DEVEL("get_ecsiglen failed.\n"); return rc; } @@ -173,7 +173,7 @@ ec_verify(SESSION *sess, rc = get_ecsiglen(key_obj, &plen); if (rc != CKR_OK) { - TRACE_DEBUG("get_ecsiglen failed.\n"); + TRACE_DEVEL("get_ecsiglen failed.\n"); return rc; } @@ -219,13 +219,13 @@ ec_hash_sign( SESSION * sess, rc = digest_mgr_init( sess, &digest_ctx, &digest_mech ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Mgr Init failed.\n"); + TRACE_DEVEL("Digest Mgr Init failed.\n"); return rc; } hash_len = sizeof(hash); rc = digest_mgr_digest( sess, length_only, &digest_ctx, in_data, in_data_len, hash, &hash_len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Mgr Digest failed.\n"); + TRACE_DEVEL("Digest Mgr Digest failed.\n"); return rc; } @@ -235,13 +235,13 @@ ec_hash_sign( SESSION * sess, rc = sign_mgr_init( sess, &sign_ctx, &sign_mech, FALSE, ctx->key ); if (rc != CKR_OK){ - TRACE_DEBUG("Sign Mgr Init failed.\n"); + TRACE_DEVEL("Sign Mgr Init failed.\n"); goto error; } rc = sign_mgr_sign( sess, length_only, &sign_ctx, hash, hash_len, signature, sig_len ); if (rc != CKR_OK) - TRACE_DEBUG("Sign Mgr Sign failed.\n"); + TRACE_DEVEL("Sign Mgr Sign failed.\n"); error: sign_mgr_cleanup( &sign_ctx ); @@ -271,7 +271,7 @@ ec_hash_sign_update( SESSION * sess, rc = digest_mgr_init( sess, &context->hash_context, &digest_mech ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Mgr Init failed.\n"); + TRACE_DEVEL("Digest Mgr Init failed.\n"); return rc; } context->flag = TRUE; @@ -279,7 +279,7 @@ ec_hash_sign_update( SESSION * sess, rc = digest_mgr_digest_update( sess, &context->hash_context, in_data, in_data_len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Mgr Update failed.\n"); + TRACE_DEVEL("Digest Mgr Update failed.\n"); return rc; } return CKR_OK; @@ -311,7 +311,7 @@ ec_hash_sign_final( SESSION * sess, hash_len = sizeof(hash); rc = digest_mgr_digest_final( sess, length_only, &context->hash_context, hash, &hash_len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Mgr Final failed.\n"); + TRACE_DEVEL("Digest Mgr Final failed.\n"); return rc; } @@ -321,14 +321,14 @@ ec_hash_sign_final( SESSION * sess, rc = sign_mgr_init( sess, &sign_ctx, &sign_mech, FALSE, ctx->key ); if (rc != CKR_OK){ - TRACE_DEBUG("Sign Mgr Init failed.\n"); + TRACE_DEVEL("Sign Mgr Init failed.\n"); goto done; } //rc = sign_mgr_sign( sess, length_only, &sign_ctx, ber_data, ber_data_len, signature, sig_len ); rc = sign_mgr_sign( sess, length_only, &sign_ctx, hash, hash_len, signature, sig_len ); if (rc != CKR_OK) - TRACE_DEBUG("Sign Mgr Sign failed.\n"); + TRACE_DEVEL("Sign Mgr Sign failed.\n"); if (length_only == TRUE || rc == CKR_BUFFER_TOO_SMALL) { sign_mgr_cleanup( &sign_ctx ); @@ -369,13 +369,13 @@ ec_hash_verify( SESSION * sess, rc = digest_mgr_init( sess, &digest_ctx, &digest_mech ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Mgr Init failed.\n"); + TRACE_DEVEL("Digest Mgr Init failed.\n"); return rc; } hash_len = sizeof(hash); rc = digest_mgr_digest( sess, FALSE, &digest_ctx, in_data, in_data_len, hash, &hash_len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Mgr Digest failed.\n"); + TRACE_DEVEL("Digest Mgr Digest failed.\n"); return rc; } @@ -387,14 +387,14 @@ ec_hash_verify( SESSION * sess, rc = verify_mgr_init( sess, &verify_ctx, &verify_mech, FALSE, ctx->key ); if (rc != CKR_OK){ - TRACE_DEBUG("Verify Mgr Init failed.\n"); + TRACE_DEVEL("Verify Mgr Init failed.\n"); goto done; } //rc = verify_mgr_verify( sess, &verify_ctx, ber_data, ber_data_len, signature, sig_len ); rc = verify_mgr_verify( sess, &verify_ctx, hash, hash_len, signature, sig_len ); if (rc != CKR_OK) - TRACE_DEBUG("Verify Mgr Verify failed.\n"); + TRACE_DEVEL("Verify Mgr Verify failed.\n"); done: sign_mgr_cleanup( &verify_ctx ); return rc; @@ -424,7 +424,7 @@ ec_hash_verify_update( SESSION * sess, rc = digest_mgr_init( sess, &context->hash_context, &digest_mech ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Mgr Init failed.\n"); + TRACE_DEVEL("Digest Mgr Init failed.\n"); return rc; } context->flag = TRUE; @@ -432,7 +432,7 @@ ec_hash_verify_update( SESSION * sess, rc = digest_mgr_digest_update( sess, &context->hash_context, in_data, in_data_len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Mgr Update failed.\n"); + TRACE_DEVEL("Digest Mgr Update failed.\n"); return rc; } return CKR_OK; @@ -462,7 +462,7 @@ ec_hash_verify_final( SESSION * sess, hash_len = sizeof(hash); rc = digest_mgr_digest_final( sess, FALSE, &context->hash_context, hash, &hash_len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Mgr Final failed.\n"); + TRACE_DEVEL("Digest Mgr Final failed.\n"); return rc; } verify_mech.mechanism = CKM_ECDSA; @@ -471,13 +471,13 @@ ec_hash_verify_final( SESSION * sess, rc = verify_mgr_init( sess, &verify_ctx, &verify_mech, FALSE, ctx->key ); if (rc != CKR_OK){ - TRACE_DEBUG("Verify Mgr Init failed.\n"); + TRACE_DEVEL("Verify Mgr Init failed.\n"); goto done; } rc = verify_mgr_verify( sess, &verify_ctx, hash, hash_len, signature, sig_len ); if (rc != CKR_OK) - TRACE_DEBUG("Verify Mgr Verify failed.\n"); + TRACE_DEVEL("Verify Mgr Verify failed.\n"); done: verify_mgr_cleanup( &verify_ctx ); return rc; diff --git a/usr/lib/pkcs11/common/mech_md2.c b/usr/lib/pkcs11/common/mech_md2.c index 493fba1d..07a9d9b6 100755 --- a/usr/lib/pkcs11/common/mech_md2.c +++ b/usr/lib/pkcs11/common/mech_md2.c @@ -376,7 +376,7 @@ md2_hash( SESSION * sess, rc = md2_hash_update( sess, ctx, in_data, in_data_len ); if (rc != CKR_OK){ - TRACE_DEBUG("md2_hash_update failed.\n"); + TRACE_DEVEL("md2_hash_update failed.\n"); return CKR_FUNCTION_FAILED; } return md2_hash_final( sess, FALSE, @@ -511,7 +511,7 @@ md2_hmac_sign( SESSION * sess, rc = digest_mgr_init( sess, &digest_ctx, &digest_mech ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Mgr Init failed.\n"); + TRACE_DEVEL("Digest Mgr Init failed.\n"); return rc; } hash_len = sizeof(hash); @@ -519,7 +519,7 @@ md2_hmac_sign( SESSION * sess, attr->pValue, attr->ulValueLen, hash, &hash_len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Mgr Digest failed.\n"); + TRACE_DEVEL("Digest Mgr Digest failed.\n"); return rc; } memset( &digest_ctx, 0x0, sizeof(DIGEST_CONTEXT) ); @@ -556,23 +556,23 @@ md2_hmac_sign( SESSION * sess, // rc = digest_mgr_init( sess, &digest_ctx, &digest_mech ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Mgr Init failed.\n"); + TRACE_DEVEL("Digest Mgr Init failed.\n"); return rc; } rc = digest_mgr_digest_update( sess, &digest_ctx, k_ipad, MD2_BLOCK_SIZE ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Mgr Update failed.\n"); + TRACE_DEVEL("Digest Mgr Update failed.\n"); return rc; } rc = digest_mgr_digest_update( sess, &digest_ctx, in_data, in_data_len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Mgr Update failed.\n"); + TRACE_DEVEL("Digest Mgr Update failed.\n"); return rc; } hash_len = sizeof(hash); rc = digest_mgr_digest_final( sess, FALSE, &digest_ctx, hash, &hash_len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Mgr Final failed.\n"); + TRACE_DEVEL("Digest Mgr Final failed.\n"); return rc; } memset( &digest_ctx, 0x0, sizeof(DIGEST_CONTEXT) ); @@ -582,23 +582,23 @@ md2_hmac_sign( SESSION * sess, // rc = digest_mgr_init( sess, &digest_ctx, &digest_mech ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Mgr Init failed.\n"); + TRACE_DEVEL("Digest Mgr Init failed.\n"); return rc; } rc = digest_mgr_digest_update( sess, &digest_ctx, k_opad, MD2_BLOCK_SIZE ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Mgr Update failed.\n"); + TRACE_DEVEL("Digest Mgr Update failed.\n"); return rc; } rc = digest_mgr_digest_update( sess, &digest_ctx, hash, hash_len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Mgr Update failed.\n"); + TRACE_DEVEL("Digest Mgr Update failed.\n"); return rc; } hash_len = sizeof(hash); rc = digest_mgr_digest_final( sess, FALSE, &digest_ctx, hash, &hash_len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Mgr Final failed.\n"); + TRACE_DEVEL("Digest Mgr Final failed.\n"); return rc; } memcpy( out_data, hash, hmac_len ); @@ -636,7 +636,7 @@ md2_hmac_verify( SESSION * sess, rc = sign_mgr_init( sess, &hmac_ctx, &ctx->mech, FALSE, ctx->key ); if (rc != CKR_OK){ - TRACE_DEBUG("Sign Mgr Init failed.\n"); + TRACE_DEVEL("Sign Mgr Init failed.\n"); return rc; } len = sizeof(hmac); @@ -644,7 +644,7 @@ md2_hmac_verify( SESSION * sess, in_data, in_data_len, hmac, &len ); if (rc != CKR_OK){ - TRACE_DEBUG("Sign Mgr Sign failed.\n"); + TRACE_DEVEL("Sign Mgr Sign failed.\n"); return rc; } if ((len != hmac_len) || (len != sig_len)){ diff --git a/usr/lib/pkcs11/common/mech_md5.c b/usr/lib/pkcs11/common/mech_md5.c index 5910c4ce..919a647f 100755 --- a/usr/lib/pkcs11/common/mech_md5.c +++ b/usr/lib/pkcs11/common/mech_md5.c @@ -345,7 +345,7 @@ md5_hash( SESSION * sess, rc = md5_hash_update( sess, ctx, in_data, in_data_len ); if (rc != CKR_OK){ - TRACE_DEBUG("md5_hash_update failed\n"); + TRACE_DEVEL("md5_hash_update failed\n"); return rc; } return md5_hash_final( sess, FALSE, @@ -519,21 +519,21 @@ md5_hmac_sign( SESSION * sess, rc = digest_mgr_init( sess, &digest_ctx, &digest_mech ); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Init failed.\n"); + TRACE_DEVEL("Digest Mgr Init failed.\n"); return rc; } rc = digest_mgr_digest_update( sess, &digest_ctx, k_ipad, MD5_BLOCK_SIZE ); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Update failed.\n"); + TRACE_DEVEL("Digest Mgr Update failed.\n"); return rc; } rc = digest_mgr_digest_update( sess, &digest_ctx, in_data, in_data_len ); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Update failed.\n"); + TRACE_DEVEL("Digest Mgr Update failed.\n"); return rc; } @@ -541,7 +541,7 @@ md5_hmac_sign( SESSION * sess, rc = digest_mgr_digest_final( sess, FALSE, &digest_ctx, hash, &hash_len ); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Final failed.\n"); + TRACE_DEVEL("Digest Mgr Final failed.\n"); return rc; } @@ -553,21 +553,21 @@ md5_hmac_sign( SESSION * sess, rc = digest_mgr_init( sess, &digest_ctx, &digest_mech ); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Init failed.\n"); + TRACE_DEVEL("Digest Mgr Init failed.\n"); return rc; } rc = digest_mgr_digest_update( sess, &digest_ctx, k_opad, MD5_BLOCK_SIZE ); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Update failed.\n"); + TRACE_DEVEL("Digest Mgr Update failed.\n"); return rc; } rc = digest_mgr_digest_update( sess, &digest_ctx, hash, hash_len ); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Update failed.\n"); + TRACE_DEVEL("Digest Mgr Update failed.\n"); return rc; } @@ -575,7 +575,7 @@ md5_hmac_sign( SESSION * sess, rc = digest_mgr_digest_final( sess, FALSE, &digest_ctx, hash, &hash_len ); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Final failed.\n"); + TRACE_DEVEL("Digest Mgr Final failed.\n"); return rc; } diff --git a/usr/lib/pkcs11/common/mech_rng.c b/usr/lib/pkcs11/common/mech_rng.c index 0130b76a..9aaf68c8 100755 --- a/usr/lib/pkcs11/common/mech_rng.c +++ b/usr/lib/pkcs11/common/mech_rng.c @@ -349,6 +349,6 @@ rng_generate( CK_BYTE *output, CK_ULONG bytes ) rc = local_rng(output, bytes); if (rc != CKR_OK) - TRACE_DEBUG("Token specific rng failed.\n"); + TRACE_DEVEL("Token specific rng failed.\n"); return rc; } diff --git a/usr/lib/pkcs11/common/mech_rsa.c b/usr/lib/pkcs11/common/mech_rsa.c index 7b749bad..60cac63e 100755 --- a/usr/lib/pkcs11/common/mech_rsa.c +++ b/usr/lib/pkcs11/common/mech_rsa.c @@ -426,7 +426,7 @@ rsa_format_block( CK_BYTE * in_data, for (i = 2; i < (padding_len + 2); i++) { rc = rng_generate(&out_data[i], 1); if (rc != CKR_OK) { - TRACE_DEBUG("rng_generate failed.\n"); + TRACE_DEVEL("rng_generate failed.\n"); return rc; } if (out_data[i] == (CK_BYTE)0) { @@ -475,7 +475,7 @@ rsa_parse_block( CK_BYTE * in_data, } if (in_data_len <= 11) { - TRACE_DEBUG("%s\n", ock_err(ERR_FUNCTION_FAILED)); + TRACE_DEVEL("%s\n", ock_err(ERR_FUNCTION_FAILED)); rc = CKR_FUNCTION_FAILED; return rc; } @@ -650,7 +650,7 @@ rsa_pkcs_encrypt( SESSION *sess, rc = rsa_get_key_info(key_obj, &modulus_bytes, &keyclass); if (rc != CKR_OK) { - TRACE_DEBUG("rsa_get_key_info failed.\n"); + TRACE_DEVEL("rsa_get_key_info failed.\n"); return rc; } @@ -686,7 +686,7 @@ rsa_pkcs_encrypt( SESSION *sess, rc = token_specific.t_rsa_encrypt(in_data, in_data_len, out_data, out_data_len, key_obj); if (rc != CKR_OK) - TRACE_DEBUG("Token Specific rsa encrypt failed.\n"); + TRACE_DEVEL("Token Specific rsa encrypt failed.\n"); return rc; } @@ -720,7 +720,7 @@ rsa_pkcs_decrypt( SESSION *sess, rc = rsa_get_key_info(key_obj, &modulus_bytes, &keyclass); if (rc != CKR_OK) { - TRACE_DEBUG("rsa_get_key_info failed.\n"); + TRACE_DEVEL("rsa_get_key_info failed.\n"); return rc; } @@ -763,7 +763,7 @@ rsa_pkcs_decrypt( SESSION *sess, TRACE_ERROR("%s\n", ock_err(ERR_ENCRYPTED_DATA_LEN_RANGE)); return CKR_ENCRYPTED_DATA_LEN_RANGE; } - TRACE_DEBUG("Token Specific rsa decrypt failed.\n"); + TRACE_DEVEL("Token Specific rsa decrypt failed.\n"); } return rc; @@ -793,7 +793,7 @@ CK_RV rsa_oaep_crypt(SESSION *sess, CK_BBOOL length_only, rc = rsa_get_key_info(key_obj, &modulus_bytes, &keyclass); if (rc != CKR_OK) { - TRACE_DEBUG("rsa_get_key_info failed.\n"); + TRACE_DEVEL("rsa_get_key_info failed.\n"); return CKR_FUNCTION_FAILED; } @@ -893,7 +893,7 @@ CK_RV rsa_oaep_crypt(SESSION *sess, CK_BBOOL length_only, } if (rc != CKR_OK) - TRACE_DEBUG("Token Specific rsa oaep decrypt failed.\n"); + TRACE_DEVEL("Token Specific rsa oaep decrypt failed.\n"); return rc; } @@ -928,7 +928,7 @@ rsa_pkcs_sign( SESSION *sess, rc = rsa_get_key_info(key_obj, &modulus_bytes, &keyclass); if (rc != CKR_OK) { - TRACE_DEBUG("rsa_get_key_info failed.\n"); + TRACE_DEVEL("rsa_get_key_info failed.\n"); return rc; } @@ -965,7 +965,7 @@ rsa_pkcs_sign( SESSION *sess, rc = token_specific.t_rsa_sign(in_data, in_data_len, out_data, out_data_len, key_obj); if (rc != CKR_OK) - TRACE_DEBUG("Token Specific rsa sign failed.\n"); + TRACE_DEVEL("Token Specific rsa sign failed.\n"); return rc; } @@ -997,7 +997,7 @@ rsa_pkcs_verify( SESSION * sess, rc = rsa_get_key_info(key_obj, &modulus_bytes, &keyclass); if (rc != CKR_OK) { - TRACE_DEBUG("rsa_get_key_info failed.\n"); + TRACE_DEVEL("rsa_get_key_info failed.\n"); return rc; } @@ -1023,7 +1023,7 @@ rsa_pkcs_verify( SESSION * sess, rc = token_specific.t_rsa_verify(in_data, in_data_len, signature, sig_len, key_obj); if (rc != CKR_OK) - TRACE_DEBUG("Token Specific rsa verify failed.\n"); + TRACE_DEVEL("Token Specific rsa verify failed.\n"); return rc; } @@ -1061,7 +1061,7 @@ rsa_pkcs_verify_recover( SESSION * sess, rc = rsa_get_key_info(key_obj, &modulus_bytes, &keyclass); if (rc != CKR_OK) { - TRACE_DEBUG("rsa_get_key_info failed.\n"); + TRACE_DEVEL("rsa_get_key_info failed.\n"); return rc; } @@ -1090,7 +1090,7 @@ rsa_pkcs_verify_recover( SESSION * sess, rc = token_specific.t_rsa_verify_recover(signature, sig_len, out_data, out_data_len, key_obj); if (rc != CKR_OK) - TRACE_DEBUG("Token Specific rsa verify failed.\n"); + TRACE_DEVEL("Token Specific rsa verify failed.\n"); return rc; } @@ -1124,7 +1124,7 @@ rsa_x509_encrypt( SESSION *sess, rc = rsa_get_key_info(key_obj, &modulus_bytes, &keyclass); if (rc != CKR_OK) { - TRACE_DEBUG("rsa_get_key_info failed.\n"); + TRACE_DEVEL("rsa_get_key_info failed.\n"); return rc; } @@ -1159,7 +1159,7 @@ rsa_x509_encrypt( SESSION *sess, rc = token_specific.t_rsa_x509_encrypt(in_data, in_data_len, out_data, out_data_len, key_obj); if (rc != CKR_OK) - TRACE_DEBUG("Token Specific rsa x509 encrypt failed.\n"); + TRACE_DEVEL("Token Specific rsa x509 encrypt failed.\n"); return rc; } @@ -1193,7 +1193,7 @@ rsa_x509_decrypt( SESSION *sess, rc = rsa_get_key_info(key_obj, &modulus_bytes, &keyclass); if (rc != CKR_OK) { - TRACE_DEBUG("rsa_get_key_info failed.\n"); + TRACE_DEVEL("rsa_get_key_info failed.\n"); return rc; } @@ -1276,7 +1276,7 @@ rsa_x509_sign( SESSION *sess, rc = rsa_get_key_info(key_obj, &modulus_bytes, &keyclass); if (rc != CKR_OK) { - TRACE_DEBUG("rsa_get_key_info failed.\n"); + TRACE_DEVEL("rsa_get_key_info failed.\n"); return rc; } @@ -1310,7 +1310,7 @@ rsa_x509_sign( SESSION *sess, } rc = token_specific.t_rsa_x509_sign(in_data, in_data_len, out_data, out_data_len, key_obj); if (rc != CKR_OK) - TRACE_DEBUG("Token Specific rsa x509 sign failed.\n"); + TRACE_DEVEL("Token Specific rsa x509 sign failed.\n"); return rc; } @@ -1343,7 +1343,7 @@ rsa_x509_verify( SESSION * sess, rc = rsa_get_key_info(key_obj, &modulus_bytes, &keyclass); if (rc != CKR_OK) { - TRACE_DEBUG("rsa_get_key_info failed.\n"); + TRACE_DEVEL("rsa_get_key_info failed.\n"); return rc; } @@ -1407,7 +1407,7 @@ rsa_x509_verify_recover( SESSION * sess, rc = rsa_get_key_info(key_obj, &modulus_bytes, &keyclass); if (rc != CKR_OK) { - TRACE_DEBUG("rsa_get_key_info failed.\n"); + TRACE_DEVEL("rsa_get_key_info failed.\n"); return rc; } @@ -1479,7 +1479,7 @@ CK_RV rsa_pss_sign(SESSION *sess, CK_BBOOL length_only, /* get modulus and key class */ rc = rsa_get_key_info(key_obj, &modulus_bytes, &keyclass); if (rc != CKR_OK) { - TRACE_DEBUG("rsa_get_key_info failed.\n"); + TRACE_DEVEL("rsa_get_key_info failed.\n"); return rc; } @@ -1526,7 +1526,7 @@ CK_RV rsa_pss_sign(SESSION *sess, CK_BBOOL length_only, rc = token_specific.t_rsa_pss_sign(ctx, in_data, in_data_len, out_data, out_data_len); if (rc != CKR_OK) - TRACE_DEBUG("Token Specific rsa pss sign failed.\n"); + TRACE_DEVEL("Token Specific rsa pss sign failed.\n"); return rc; } @@ -1552,7 +1552,7 @@ CK_RV rsa_pss_verify(SESSION *sess, SIGN_VERIFY_CONTEXT *ctx, CK_BYTE *in_data, /* get modulus and key class */ rc = rsa_get_key_info(key_obj, &modulus_bytes, &keyclass); if (rc != CKR_OK) { - TRACE_DEBUG("rsa_get_key_info failed.\n"); + TRACE_DEVEL("rsa_get_key_info failed.\n"); return rc; } @@ -1628,14 +1628,14 @@ CK_RV rsa_hash_pss_sign(SESSION *sess, CK_BBOOL length_only, rc = digest_mgr_init(sess, &digest_ctx, &digest_mech); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Init failed.\n"); + TRACE_DEVEL("Digest Mgr Init failed.\n"); return rc; } rc = digest_mgr_digest(sess, length_only, &digest_ctx, in_data, in_data_len, hash, &hlen); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Digest failed.\n"); + TRACE_DEVEL("Digest Mgr Digest failed.\n"); return rc; } @@ -1646,14 +1646,14 @@ CK_RV rsa_hash_pss_sign(SESSION *sess, CK_BBOOL length_only, rc = sign_mgr_init(sess, &sign_ctx, &sign_mech, FALSE, ctx->key); if (rc != CKR_OK) { - TRACE_DEBUG("Sign Mgr Init failed.\n"); + TRACE_DEVEL("Sign Mgr Init failed.\n"); goto done; } rc = sign_mgr_sign(sess, length_only, &sign_ctx, hash, hlen, sig, sig_len); if (rc != CKR_OK) - TRACE_DEBUG("Sign Mgr Sign failed.\n"); + TRACE_DEVEL("Sign Mgr Sign failed.\n"); done: sign_mgr_cleanup(&sign_ctx); @@ -1697,14 +1697,14 @@ CK_RV rsa_hash_pss_update(SESSION *sess, SIGN_VERIFY_CONTEXT *ctx, rc = digest_mgr_init(sess, digest_ctx, &digest_mech); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Init failed.\n"); + TRACE_DEVEL("Digest Mgr Init failed.\n"); return rc; } } rc = digest_mgr_digest_update(sess, digest_ctx, in_data, in_data_len); if (rc != CKR_OK) - TRACE_DEBUG("Digest Mgr Update failed.\n"); + TRACE_DEVEL("Digest Mgr Update failed.\n"); return rc; } @@ -1738,7 +1738,7 @@ CK_RV rsa_hash_pss_sign_final(SESSION *sess, CK_BBOOL length_only, rc = digest_mgr_digest_final(sess, length_only, digest_ctx, hash, &hlen); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Final failed.\n"); + TRACE_DEVEL("Digest Mgr Final failed.\n"); return rc; } @@ -1749,14 +1749,14 @@ CK_RV rsa_hash_pss_sign_final(SESSION *sess, CK_BBOOL length_only, rc = sign_mgr_init(sess, &sign_ctx, &sign_mech, FALSE, ctx->key); if (rc != CKR_OK) { - TRACE_DEBUG("Sign Mgr Init failed.\n"); + TRACE_DEVEL("Sign Mgr Init failed.\n"); goto done; } rc = sign_mgr_sign(sess, length_only, &sign_ctx, hash, hlen, signature, sig_len); if (rc != CKR_OK) - TRACE_DEBUG("Sign Mgr Sign failed.\n"); + TRACE_DEVEL("Sign Mgr Sign failed.\n"); done: sign_mgr_cleanup(&sign_ctx); @@ -1809,14 +1809,14 @@ CK_RV rsa_hash_pss_verify(SESSION *sess, SIGN_VERIFY_CONTEXT *ctx, rc = digest_mgr_init(sess, &digest_ctx, &digest_mech); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Init failed.\n"); + TRACE_DEVEL("Digest Mgr Init failed.\n"); return rc; } rc = digest_mgr_digest(sess, FALSE, &digest_ctx, in_data, in_data_len, hash, &hlen); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Digest failed.\n"); + TRACE_DEVEL("Digest Mgr Digest failed.\n"); return rc; } @@ -1827,14 +1827,14 @@ CK_RV rsa_hash_pss_verify(SESSION *sess, SIGN_VERIFY_CONTEXT *ctx, rc = verify_mgr_init(sess, &verify_ctx, &verify_mech, FALSE, ctx->key); if (rc != CKR_OK) { - TRACE_DEBUG("Verify Mgr Init failed.\n"); + TRACE_DEVEL("Verify Mgr Init failed.\n"); goto done; } rc = verify_mgr_verify(sess, &verify_ctx, hash, hlen, signature, sig_len); if (rc != CKR_OK) - TRACE_DEBUG("Verify Mgr Verify failed.\n"); + TRACE_DEVEL("Verify Mgr Verify failed.\n"); done: verify_mgr_cleanup(&verify_ctx); @@ -1868,7 +1868,7 @@ CK_RV rsa_hash_pss_verify_final(SESSION *sess, SIGN_VERIFY_CONTEXT *ctx, rc = digest_mgr_digest_final(sess, FALSE, digest_ctx, hash, &hlen); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Final failed.\n"); + TRACE_DEVEL("Digest Mgr Final failed.\n"); return rc; } @@ -1879,14 +1879,14 @@ CK_RV rsa_hash_pss_verify_final(SESSION *sess, SIGN_VERIFY_CONTEXT *ctx, rc = verify_mgr_init(sess, &verify_ctx, &verify_mech, FALSE, ctx->key); if (rc != CKR_OK) { - TRACE_DEBUG("Verify Mgr Init failed.\n"); + TRACE_DEVEL("Verify Mgr Init failed.\n"); goto done; } rc = verify_mgr_verify(sess, &verify_ctx, hash, hlen, signature, sig_len); if (rc != CKR_OK) - TRACE_DEBUG("Verify Mgr Verify failed.\n"); + TRACE_DEVEL("Verify Mgr Verify failed.\n"); done: verify_mgr_cleanup(&verify_ctx); @@ -1963,20 +1963,20 @@ rsa_hash_pkcs_sign( SESSION * sess, rc = digest_mgr_init( sess, &digest_ctx, &digest_mech ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Mgr Init failed.\n"); + TRACE_DEVEL("Digest Mgr Init failed.\n"); return rc; } hash_len = sizeof(hash); rc = digest_mgr_digest( sess, length_only, &digest_ctx, in_data, in_data_len, hash, &hash_len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Mgr Digest failed.\n"); + TRACE_DEVEL("Digest Mgr Digest failed.\n"); return rc; } // build the BER-encodings rc = ber_encode_OCTET_STRING( FALSE, &octet_str, &octet_str_len, hash, hash_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_OCTET_STRING failed.\n"); + TRACE_DEVEL("ber_encode_OCTET_STRING failed.\n"); goto error; } tmp = (CK_BYTE *)buf1; @@ -1985,7 +1985,7 @@ rsa_hash_pkcs_sign( SESSION * sess, rc = ber_encode_SEQUENCE( FALSE, &ber_data, &ber_data_len, tmp, (oid_len + octet_str_len) ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_SEQUENCE failed.\n"); + TRACE_DEVEL("ber_encode_SEQUENCE failed.\n"); goto error; } // sign the BER-encoded data block @@ -1997,12 +1997,12 @@ rsa_hash_pkcs_sign( SESSION * sess, rc = sign_mgr_init( sess, &sign_ctx, &sign_mech, FALSE, ctx->key ); if (rc != CKR_OK){ - TRACE_DEBUG("Sign Mgr Init failed.\n"); + TRACE_DEVEL("Sign Mgr Init failed.\n"); goto error; } rc = sign_mgr_sign( sess, length_only, &sign_ctx, ber_data, ber_data_len, signature, sig_len ); if (rc != CKR_OK) - TRACE_DEBUG("Sign Mgr Sign failed.\n"); + TRACE_DEVEL("Sign Mgr Sign failed.\n"); error: if (octet_str) free( octet_str ); @@ -2049,7 +2049,7 @@ rsa_hash_pkcs_sign_update( SESSION * sess, rc = digest_mgr_init( sess, &context->hash_context, &digest_mech ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Mgr Init failed.\n"); + TRACE_DEVEL("Digest Mgr Init failed.\n"); return rc; } context->flag = TRUE; @@ -2057,7 +2057,7 @@ rsa_hash_pkcs_sign_update( SESSION * sess, rc = digest_mgr_digest_update( sess, &context->hash_context, in_data, in_data_len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Mgr Digest failed.\n"); + TRACE_DEVEL("Digest Mgr Digest failed.\n"); return rc; } return CKR_OK; @@ -2132,13 +2132,13 @@ rsa_hash_pkcs_verify( SESSION * sess, rc = digest_mgr_init( sess, &digest_ctx, &digest_mech ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Mgr Init failed.\n"); + TRACE_DEVEL("Digest Mgr Init failed.\n"); return rc; } hash_len = sizeof(hash); rc = digest_mgr_digest( sess, FALSE, &digest_ctx, in_data, in_data_len, hash, &hash_len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Mgr Digest failed.\n"); + TRACE_DEVEL("Digest Mgr Digest failed.\n"); return rc; } @@ -2146,7 +2146,7 @@ rsa_hash_pkcs_verify( SESSION * sess, // rc = ber_encode_OCTET_STRING( FALSE, &octet_str, &octet_str_len, hash, hash_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_OCTET_STRING failed.\n"); + TRACE_DEVEL("ber_encode_OCTET_STRING failed.\n"); goto done; } tmp = (CK_BYTE *)buf1; @@ -2155,7 +2155,7 @@ rsa_hash_pkcs_verify( SESSION * sess, rc = ber_encode_SEQUENCE( FALSE, &ber_data, &ber_data_len, tmp, (oid_len + octet_str_len) ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_SEQUENCE failed.\n"); + TRACE_DEVEL("ber_encode_SEQUENCE failed.\n"); goto done; } // Verify the Signed BER-encoded Data block @@ -2166,12 +2166,12 @@ rsa_hash_pkcs_verify( SESSION * sess, rc = verify_mgr_init( sess, &verify_ctx, &verify_mech, FALSE, ctx->key ); if (rc != CKR_OK){ - TRACE_DEBUG("Verify Mgr Init failed.\n"); + TRACE_DEVEL("Verify Mgr Init failed.\n"); goto done; } rc = verify_mgr_verify( sess, &verify_ctx, ber_data, ber_data_len, signature, sig_len ); if (rc != CKR_OK) - TRACE_DEBUG("Verify Mgr Verify failed.\n"); + TRACE_DEVEL("Verify Mgr Verify failed.\n"); done: if (octet_str) free( octet_str ); if (ber_data) free( ber_data ); @@ -2216,7 +2216,7 @@ rsa_hash_pkcs_verify_update( SESSION * sess, rc = digest_mgr_init( sess, &context->hash_context, &digest_mech ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Mgr Init failed.\n"); + TRACE_DEVEL("Digest Mgr Init failed.\n"); return rc; } context->flag = TRUE; @@ -2224,7 +2224,7 @@ rsa_hash_pkcs_verify_update( SESSION * sess, rc = digest_mgr_digest_update( sess, &context->hash_context, in_data, in_data_len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Mgr Update failed.\n"); + TRACE_DEVEL("Digest Mgr Update failed.\n"); return rc; } return CKR_OK; @@ -2291,14 +2291,14 @@ rsa_hash_pkcs_sign_final( SESSION * sess, hash_len = sizeof(hash); rc = digest_mgr_digest_final( sess, length_only, &context->hash_context, hash, &hash_len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Mgr Final failed.\n"); + TRACE_DEVEL("Digest Mgr Final failed.\n"); return rc; } // Build the BER Encoded Data block // rc = ber_encode_OCTET_STRING( FALSE, &octet_str, &octet_str_len, hash, hash_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_OCTET_STRING failed.\n"); + TRACE_DEVEL("ber_encode_OCTET_STRING failed.\n"); return rc; } tmp = (CK_BYTE *)buf1; @@ -2307,7 +2307,7 @@ rsa_hash_pkcs_sign_final( SESSION * sess, rc = ber_encode_SEQUENCE( FALSE, &ber_data, &ber_data_len, tmp, (oid_len + octet_str_len) ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_SEQUENCE failed.\n"); + TRACE_DEVEL("ber_encode_SEQUENCE failed.\n"); goto done; } // sign the BER-encoded data block @@ -2319,12 +2319,12 @@ rsa_hash_pkcs_sign_final( SESSION * sess, rc = sign_mgr_init( sess, &sign_ctx, &sign_mech, FALSE, ctx->key ); if (rc != CKR_OK){ - TRACE_DEBUG("Sign Mgr Init failed.\n"); + TRACE_DEVEL("Sign Mgr Init failed.\n"); goto done; } rc = sign_mgr_sign( sess, length_only, &sign_ctx, ber_data, ber_data_len, signature, sig_len ); if (rc != CKR_OK) - TRACE_DEBUG("Sign Mgr Sign failed.\n"); + TRACE_DEVEL("Sign Mgr Sign failed.\n"); if (length_only == TRUE || rc == CKR_BUFFER_TOO_SMALL) { sign_mgr_cleanup( &sign_ctx ); @@ -2396,14 +2396,14 @@ rsa_hash_pkcs_verify_final( SESSION * sess, hash_len = sizeof(hash); rc = digest_mgr_digest_final( sess, FALSE, &context->hash_context, hash, &hash_len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Mgr Final failed.\n"); + TRACE_DEVEL("Digest Mgr Final failed.\n"); return rc; } // Build the BER encoding // rc = ber_encode_OCTET_STRING( FALSE, &octet_str, &octet_str_len, hash, hash_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_OCTET_STRING failed.\n"); + TRACE_DEVEL("ber_encode_OCTET_STRING failed.\n"); goto done; } tmp = (CK_BYTE *)buf1; @@ -2412,7 +2412,7 @@ rsa_hash_pkcs_verify_final( SESSION * sess, rc = ber_encode_SEQUENCE( FALSE, &ber_data, &ber_data_len, tmp, (oid_len + octet_str_len) ); if (rc != CKR_OK){ - TRACE_DEBUG("ber_encode_SEQUENCE failed.\n"); + TRACE_DEVEL("ber_encode_SEQUENCE failed.\n"); goto done; } // verify the signed BER-encoded data block @@ -2424,12 +2424,12 @@ rsa_hash_pkcs_verify_final( SESSION * sess, rc = verify_mgr_init( sess, &verify_ctx, &verify_mech, FALSE, ctx->key ); if (rc != CKR_OK){ - TRACE_DEBUG("Verify Mgr Init failed.\n"); + TRACE_DEVEL("Verify Mgr Init failed.\n"); goto done; } rc = verify_mgr_verify( sess, &verify_ctx, ber_data, ber_data_len, signature, sig_len ); if (rc != CKR_OK) - TRACE_DEBUG("Verify Mgr Verify failed.\n"); + TRACE_DEVEL("Verify Mgr Verify failed.\n"); done: if (octet_str) free( octet_str ); if (ber_data) free( ber_data ); @@ -2460,7 +2460,7 @@ ckm_rsa_key_pair_gen( TEMPLATE * publ_tmpl, rc = token_specific.t_rsa_generate_keypair(publ_tmpl, priv_tmpl); if (rc != CKR_OK) - TRACE_DEBUG("Token specific rsa generate keypair failed.\n"); + TRACE_DEVEL("Token specific rsa generate keypair failed.\n"); return rc; } @@ -2921,7 +2921,7 @@ CK_RV check_pss_params(CK_MECHANISM *mech, CK_ULONG modlen) */ rc = get_mgf_mech(pssParams->mgf, &mgf_mech); if (rc != CKR_OK) { - TRACE_DEBUG("MGF mechanism is invalid.\n"); + TRACE_DEVEL("MGF mechanism is invalid.\n"); return rc; } diff --git a/usr/lib/pkcs11/common/mech_sha.c b/usr/lib/pkcs11/common/mech_sha.c index 441f2bf3..36d36fae 100755 --- a/usr/lib/pkcs11/common/mech_sha.c +++ b/usr/lib/pkcs11/common/mech_sha.c @@ -1013,7 +1013,7 @@ CK_RV sha1_hmac_sign(SESSION *sess, CK_BBOOL length_only, rc = digest_mgr_init(sess, &digest_ctx, &digest_mech); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Init failed.\n"); + TRACE_DEVEL("Digest Mgr Init failed.\n"); return rc; } @@ -1021,7 +1021,7 @@ CK_RV sha1_hmac_sign(SESSION *sess, CK_BBOOL length_only, rc = digest_mgr_digest(sess, FALSE, &digest_ctx, attr->pValue, attr->ulValueLen, hash, &hash_len); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Digest failed.\n"); + TRACE_DEVEL("Digest Mgr Digest failed.\n"); return rc; } @@ -1054,27 +1054,27 @@ CK_RV sha1_hmac_sign(SESSION *sess, CK_BBOOL length_only, // rc = digest_mgr_init(sess, &digest_ctx, &digest_mech); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Init failed.\n"); + TRACE_DEVEL("Digest Mgr Init failed.\n"); return rc; } rc = digest_mgr_digest_update(sess, &digest_ctx, k_ipad, SHA1_BLOCK_SIZE); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Update failed.\n"); + TRACE_DEVEL("Digest Mgr Update failed.\n"); return rc; } rc = digest_mgr_digest_update(sess, &digest_ctx, in_data, in_data_len); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Update failed.\n"); + TRACE_DEVEL("Digest Mgr Update failed.\n"); return rc; } hash_len = sizeof(hash); rc = digest_mgr_digest_final(sess, FALSE, &digest_ctx, hash, &hash_len); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Final failed.\n"); + TRACE_DEVEL("Digest Mgr Final failed.\n"); return rc; } @@ -1084,27 +1084,27 @@ CK_RV sha1_hmac_sign(SESSION *sess, CK_BBOOL length_only, // rc = digest_mgr_init(sess, &digest_ctx, &digest_mech); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Init failed.\n"); + TRACE_DEVEL("Digest Mgr Init failed.\n"); return rc; } rc = digest_mgr_digest_update(sess, &digest_ctx, k_opad, SHA1_BLOCK_SIZE); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Update failed.\n"); + TRACE_DEVEL("Digest Mgr Update failed.\n"); return rc; } rc = digest_mgr_digest_update(sess, &digest_ctx, hash, hash_len); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Update failed.\n"); + TRACE_DEVEL("Digest Mgr Update failed.\n"); return rc; } hash_len = sizeof(hash); rc = digest_mgr_digest_final(sess, FALSE, &digest_ctx, hash, &hash_len); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Final failed.\n"); + TRACE_DEVEL("Digest Mgr Final failed.\n"); return rc; } @@ -1180,7 +1180,7 @@ CK_RV sha2_hmac_sign(SESSION *sess, CK_BBOOL length_only, rc = digest_mgr_init(sess, &digest_ctx, &digest_mech); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Init failed.\n"); + TRACE_DEVEL("Digest Mgr Init failed.\n"); return rc; } @@ -1188,7 +1188,7 @@ CK_RV sha2_hmac_sign(SESSION *sess, CK_BBOOL length_only, rc = digest_mgr_digest(sess, FALSE, &digest_ctx, attr->pValue, attr->ulValueLen, hash, &hash_len); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Digest failed.\n"); + TRACE_DEVEL("Digest Mgr Digest failed.\n"); return rc; } @@ -1221,26 +1221,26 @@ CK_RV sha2_hmac_sign(SESSION *sess, CK_BBOOL length_only, // rc = digest_mgr_init(sess, &digest_ctx, &digest_mech); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Init failed.\n"); + TRACE_DEVEL("Digest Mgr Init failed.\n"); return rc; } rc = digest_mgr_digest_update(sess, &digest_ctx, k_ipad, SHA2_BLOCK_SIZE); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Update failed.\n"); + TRACE_DEVEL("Digest Mgr Update failed.\n"); return rc; } rc = digest_mgr_digest_update(sess, &digest_ctx, in_data, in_data_len); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Update failed.\n"); + TRACE_DEVEL("Digest Mgr Update failed.\n"); return rc; } hash_len = sizeof(hash); rc = digest_mgr_digest_final(sess, FALSE, &digest_ctx, hash, &hash_len); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Final failed.\n"); + TRACE_DEVEL("Digest Mgr Final failed.\n"); return rc; } @@ -1250,26 +1250,26 @@ CK_RV sha2_hmac_sign(SESSION *sess, CK_BBOOL length_only, // rc = digest_mgr_init(sess, &digest_ctx, &digest_mech); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Init failed.\n"); + TRACE_DEVEL("Digest Mgr Init failed.\n"); return rc; } rc = digest_mgr_digest_update(sess, &digest_ctx, k_opad, SHA2_BLOCK_SIZE); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Update failed.\n"); + TRACE_DEVEL("Digest Mgr Update failed.\n"); return rc; } rc = digest_mgr_digest_update(sess, &digest_ctx, hash, hash_len); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Update failed.\n"); + TRACE_DEVEL("Digest Mgr Update failed.\n"); return rc; } hash_len = sizeof(hash); rc = digest_mgr_digest_final(sess, FALSE, &digest_ctx, hash, &hash_len); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Final failed.\n"); + TRACE_DEVEL("Digest Mgr Final failed.\n"); return rc; } @@ -1345,7 +1345,7 @@ CK_RV sha3_hmac_sign(SESSION *sess, CK_BBOOL length_only, rc = digest_mgr_init(sess, &digest_ctx, &digest_mech); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Init failed.\n"); + TRACE_DEVEL("Digest Mgr Init failed.\n"); return rc; } @@ -1353,7 +1353,7 @@ CK_RV sha3_hmac_sign(SESSION *sess, CK_BBOOL length_only, rc = digest_mgr_digest(sess, FALSE, &digest_ctx, attr->pValue, attr->ulValueLen, hash, &hash_len); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Digest failed.\n"); + TRACE_DEVEL("Digest Mgr Digest failed.\n"); return rc; } @@ -1386,26 +1386,26 @@ CK_RV sha3_hmac_sign(SESSION *sess, CK_BBOOL length_only, // rc = digest_mgr_init(sess, &digest_ctx, &digest_mech); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Init failed.\n"); + TRACE_DEVEL("Digest Mgr Init failed.\n"); return rc; } rc = digest_mgr_digest_update(sess, &digest_ctx, k_ipad, SHA3_BLOCK_SIZE); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Update failed.\n"); + TRACE_DEVEL("Digest Mgr Update failed.\n"); return rc; } rc = digest_mgr_digest_update(sess, &digest_ctx, in_data, in_data_len); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Update failed.\n"); + TRACE_DEVEL("Digest Mgr Update failed.\n"); return rc; } hash_len = sizeof(hash); rc = digest_mgr_digest_final(sess, FALSE, &digest_ctx, hash, &hash_len); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Final failed.\n"); + TRACE_DEVEL("Digest Mgr Final failed.\n"); return rc; } @@ -1415,26 +1415,26 @@ CK_RV sha3_hmac_sign(SESSION *sess, CK_BBOOL length_only, // rc = digest_mgr_init(sess, &digest_ctx, &digest_mech); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Init failed.\n"); + TRACE_DEVEL("Digest Mgr Init failed.\n"); return rc; } rc = digest_mgr_digest_update(sess, &digest_ctx, k_opad, SHA3_BLOCK_SIZE); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Update failed.\n"); + TRACE_DEVEL("Digest Mgr Update failed.\n"); return rc; } rc = digest_mgr_digest_update(sess, &digest_ctx, hash, hash_len); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Update failed.\n"); + TRACE_DEVEL("Digest Mgr Update failed.\n"); return rc; } hash_len = sizeof(hash); rc = digest_mgr_digest_final(sess, FALSE, &digest_ctx, hash, &hash_len); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Final failed.\n"); + TRACE_DEVEL("Digest Mgr Final failed.\n"); return rc; } @@ -1510,7 +1510,7 @@ CK_RV sha5_hmac_sign(SESSION *sess, CK_BBOOL length_only, rc = digest_mgr_init(sess, &digest_ctx, &digest_mech); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Init failed.\n"); + TRACE_DEVEL("Digest Mgr Init failed.\n"); return rc; } @@ -1518,7 +1518,7 @@ CK_RV sha5_hmac_sign(SESSION *sess, CK_BBOOL length_only, rc = digest_mgr_digest(sess, FALSE, &digest_ctx, attr->pValue, attr->ulValueLen, hash, &hash_len); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Digest failed.\n"); + TRACE_DEVEL("Digest Mgr Digest failed.\n"); return rc; } @@ -1551,26 +1551,26 @@ CK_RV sha5_hmac_sign(SESSION *sess, CK_BBOOL length_only, // rc = digest_mgr_init(sess, &digest_ctx, &digest_mech); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Init failed.\n"); + TRACE_DEVEL("Digest Mgr Init failed.\n"); return rc; } rc = digest_mgr_digest_update(sess, &digest_ctx, k_ipad, SHA5_BLOCK_SIZE); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Update failed.\n"); + TRACE_DEVEL("Digest Mgr Update failed.\n"); return rc; } rc = digest_mgr_digest_update(sess, &digest_ctx, in_data, in_data_len); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Update failed.\n"); + TRACE_DEVEL("Digest Mgr Update failed.\n"); return rc; } hash_len = sizeof(hash); rc = digest_mgr_digest_final(sess, FALSE, &digest_ctx, hash, &hash_len); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Final failed.\n"); + TRACE_DEVEL("Digest Mgr Final failed.\n"); return rc; } @@ -1580,26 +1580,26 @@ CK_RV sha5_hmac_sign(SESSION *sess, CK_BBOOL length_only, // rc = digest_mgr_init(sess, &digest_ctx, &digest_mech); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Init failed.\n"); + TRACE_DEVEL("Digest Mgr Init failed.\n"); return rc; } rc = digest_mgr_digest_update(sess, &digest_ctx, k_opad, SHA5_BLOCK_SIZE); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Update failed.\n"); + TRACE_DEVEL("Digest Mgr Update failed.\n"); return rc; } rc = digest_mgr_digest_update(sess, &digest_ctx, hash, hash_len); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Update failed.\n"); + TRACE_DEVEL("Digest Mgr Update failed.\n"); return rc; } hash_len = sizeof(hash); rc = digest_mgr_digest_final(sess, FALSE, &digest_ctx, hash, &hash_len); if (rc != CKR_OK) { - TRACE_DEBUG("Digest Mgr Final failed.\n"); + TRACE_DEVEL("Digest Mgr Final failed.\n"); return rc; } @@ -1632,14 +1632,14 @@ CK_RV sha1_hmac_verify(SESSION *sess, SIGN_VERIFY_CONTEXT *ctx, rc = sign_mgr_init(sess, &hmac_ctx, &ctx->mech, FALSE, ctx->key); if (rc != CKR_OK) { - TRACE_DEBUG("Sign Mgr Init failed.\n"); + TRACE_DEVEL("Sign Mgr Init failed.\n"); goto done; } len = sizeof(hmac); rc = sign_mgr_sign(sess, FALSE, &hmac_ctx, in_data, in_data_len, hmac, &len); if (rc != CKR_OK) { - TRACE_DEBUG("Sign Mgr Sign failed.\n"); + TRACE_DEVEL("Sign Mgr Sign failed.\n"); goto done; } if ((len != hmac_len) || (len != sig_len)) { @@ -1681,7 +1681,7 @@ CK_RV sha2_hmac_verify(SESSION *sess, SIGN_VERIFY_CONTEXT *ctx, rc = sign_mgr_init(sess, &hmac_ctx, &ctx->mech, FALSE, ctx->key); if (rc != CKR_OK) { - TRACE_DEBUG("Sign Mgr Init failed.\n"); + TRACE_DEVEL("Sign Mgr Init failed.\n"); goto done; } @@ -1689,7 +1689,7 @@ CK_RV sha2_hmac_verify(SESSION *sess, SIGN_VERIFY_CONTEXT *ctx, rc = sign_mgr_sign(sess, FALSE, &hmac_ctx, in_data, in_data_len, hmac, &len); if (rc != CKR_OK) { - TRACE_DEBUG("Sign Mgr Sign failed.\n"); + TRACE_DEVEL("Sign Mgr Sign failed.\n"); goto done; } @@ -1731,14 +1731,14 @@ CK_RV sha3_hmac_verify(SESSION *sess, SIGN_VERIFY_CONTEXT *ctx, rc = sign_mgr_init(sess, &hmac_ctx, &ctx->mech, FALSE, ctx->key); if (rc != CKR_OK) { - TRACE_DEBUG("Sign Mgr Init failed.\n"); + TRACE_DEVEL("Sign Mgr Init failed.\n"); goto done; } len = sizeof(hmac); rc = sign_mgr_sign(sess, FALSE, &hmac_ctx, in_data, in_data_len, hmac, &len); if (rc != CKR_OK) { - TRACE_DEBUG("Sign Mgr Sign failed.\n"); + TRACE_DEVEL("Sign Mgr Sign failed.\n"); goto done; } if ((len != hmac_len) || (len != sig_len)) { @@ -1778,14 +1778,14 @@ CK_RV sha5_hmac_verify(SESSION *sess, SIGN_VERIFY_CONTEXT *ctx, rc = sign_mgr_init(sess, &hmac_ctx, &ctx->mech, FALSE, ctx->key); if (rc != CKR_OK) { - TRACE_DEBUG("Sign Mgr Init failed.\n"); + TRACE_DEVEL("Sign Mgr Init failed.\n"); goto done; } len = sizeof(hmac); rc = sign_mgr_sign(sess, FALSE, &hmac_ctx, in_data, in_data_len, hmac, &len); if (rc != CKR_OK) { - TRACE_DEBUG("Sign Mgr Sign failed.\n"); + TRACE_DEVEL("Sign Mgr Sign failed.\n"); goto done; } if ((len != hmac_len) || (len != sig_len)) { diff --git a/usr/lib/pkcs11/common/mech_ssl3.c b/usr/lib/pkcs11/common/mech_ssl3.c index 9e17374d..8b1afe77 100755 --- a/usr/lib/pkcs11/common/mech_ssl3.c +++ b/usr/lib/pkcs11/common/mech_ssl3.c @@ -409,12 +409,12 @@ ssl3_mac_sign( SESSION * sess, // rc = digest_mgr_init( sess, &digest_ctx, &digest_mech ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Init failed.\n"); + TRACE_DEVEL("Digest Init failed.\n"); return rc; } rc = digest_mgr_digest_update( sess, &digest_ctx, key_data, key_bytes ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest update failed.\n"); + TRACE_DEVEL("Digest update failed.\n"); return rc; } if (ctx->mech.mechanism == CKM_SSL3_MD5_MAC){ @@ -424,18 +424,18 @@ ssl3_mac_sign( SESSION * sess, rc = digest_mgr_digest_update( sess, &digest_ctx, inner, 40 ); } if (rc != CKR_OK){ - TRACE_DEBUG("Digest update failed.\n"); + TRACE_DEVEL("Digest update failed.\n"); return rc; } rc = digest_mgr_digest_update( sess, &digest_ctx, in_data, in_data_len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest update failed.\n"); + TRACE_DEVEL("Digest update failed.\n"); return rc; } hash_len = sizeof(hash); rc = digest_mgr_digest_final( sess, FALSE, &digest_ctx, hash, &hash_len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest final failed.\n"); + TRACE_DEVEL("Digest final failed.\n"); return rc; } memset( &digest_ctx, 0x0, sizeof(DIGEST_CONTEXT) ); @@ -445,12 +445,12 @@ ssl3_mac_sign( SESSION * sess, // rc = digest_mgr_init( sess, &digest_ctx, &digest_mech ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Init failed.\n"); + TRACE_DEVEL("Digest Init failed.\n"); return rc; } rc = digest_mgr_digest_update( sess, &digest_ctx, key_data, key_bytes ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest update failed.\n"); + TRACE_DEVEL("Digest update failed.\n"); return rc; } if (ctx->mech.mechanism == CKM_SSL3_MD5_MAC) @@ -458,18 +458,18 @@ ssl3_mac_sign( SESSION * sess, else rc = digest_mgr_digest_update( sess, &digest_ctx, outer, 40 ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest update failed.\n"); + TRACE_DEVEL("Digest update failed.\n"); return rc; } rc = digest_mgr_digest_update( sess, &digest_ctx, hash, hash_len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest update failed.\n"); + TRACE_DEVEL("Digest update failed.\n"); return rc; } hash_len = sizeof(hash); rc = digest_mgr_digest_final( sess, FALSE, &digest_ctx, hash, &hash_len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest final failed.\n"); + TRACE_DEVEL("Digest final failed.\n"); return rc; } memcpy( out_data, hash, mac_len ); @@ -540,12 +540,12 @@ ssl3_mac_sign_update( SESSION * sess, // rc = digest_mgr_init( sess, &context->hash_context, &digest_mech ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Init failed.\n"); + TRACE_DEVEL("Digest Init failed.\n"); return rc; } rc = digest_mgr_digest_update( sess, &context->hash_context, key_data, key_bytes ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest update failed.\n"); + TRACE_DEVEL("Digest update failed.\n"); return rc; } if (ctx->mech.mechanism == CKM_SSL3_MD5_MAC) @@ -553,7 +553,7 @@ ssl3_mac_sign_update( SESSION * sess, else rc = digest_mgr_digest_update( sess, &context->hash_context, inner, 40 ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest update failed.\n"); + TRACE_DEVEL("Digest update failed.\n"); return rc; } context->flag = TRUE; @@ -562,7 +562,7 @@ ssl3_mac_sign_update( SESSION * sess, rc = digest_mgr_digest_update( sess, &context->hash_context, in_data, in_data_len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest update failed.\n"); + TRACE_DEVEL("Digest update failed.\n"); return rc; } @@ -633,7 +633,7 @@ ssl3_mac_sign_final( SESSION * sess, hash_len = sizeof(hash); rc = digest_mgr_digest_final( sess, FALSE, &context->hash_context, hash, &hash_len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Final failed.\n"); + TRACE_DEVEL("Digest Final failed.\n"); return rc; } // now, do the outer hash @@ -652,12 +652,12 @@ ssl3_mac_sign_final( SESSION * sess, rc = digest_mgr_init( sess, &context->hash_context, &digest_mech ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Init failed.\n"); + TRACE_DEVEL("Digest Init failed.\n"); return rc; } rc = digest_mgr_digest_update( sess, &context->hash_context, key_data, key_bytes ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Update failed.\n"); + TRACE_DEVEL("Digest Update failed.\n"); return rc; } if (ctx->mech.mechanism == CKM_SSL3_MD5_MAC) @@ -666,18 +666,18 @@ ssl3_mac_sign_final( SESSION * sess, rc = digest_mgr_digest_update( sess, &context->hash_context, outer, 40 ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Update failed.\n"); + TRACE_DEVEL("Digest Update failed.\n"); return rc; } rc = digest_mgr_digest_update( sess, &context->hash_context, hash, hash_len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Update failed.\n"); + TRACE_DEVEL("Digest Update failed.\n"); return rc; } hash_len = sizeof(hash); rc = digest_mgr_digest_final( sess, FALSE, &context->hash_context, hash, &hash_len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Final failed.\n"); + TRACE_DEVEL("Digest Final failed.\n"); return rc; } memcpy( out_data, hash, mac_len ); @@ -713,7 +713,7 @@ ssl3_mac_verify( SESSION * sess, rc = sign_mgr_init( sess, &mac_ctx, &ctx->mech, FALSE, ctx->key ); if (rc != CKR_OK){ - TRACE_DEBUG("Sign Init failed.\n"); + TRACE_DEVEL("Sign Init failed.\n"); goto error; } len = sizeof(mac); @@ -721,7 +721,7 @@ ssl3_mac_verify( SESSION * sess, in_data, in_data_len, mac, &len ); if (rc != CKR_OK){ - TRACE_DEBUG("Sign failed.\n"); + TRACE_DEVEL("Sign failed.\n"); goto error; } if ((len != mac_len) || (len != sig_len)) { @@ -801,12 +801,12 @@ ssl3_mac_verify_update( SESSION * sess, // rc = digest_mgr_init( sess, &context->hash_context, &digest_mech ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Init failed.\n"); + TRACE_DEVEL("Digest Init failed.\n"); return rc; } rc = digest_mgr_digest_update( sess, &context->hash_context, key_data, key_bytes ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Update failed.\n"); + TRACE_DEVEL("Digest Update failed.\n"); return rc; } if (ctx->mech.mechanism == CKM_SSL3_MD5_MAC) @@ -814,7 +814,7 @@ ssl3_mac_verify_update( SESSION * sess, else rc = digest_mgr_digest_update( sess, &context->hash_context, inner, 40 ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Update failed.\n"); + TRACE_DEVEL("Digest Update failed.\n"); return rc; } context->flag = TRUE; @@ -822,7 +822,7 @@ ssl3_mac_verify_update( SESSION * sess, rc = digest_mgr_digest_update( sess, &context->hash_context, in_data, in_data_len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Update failed.\n"); + TRACE_DEVEL("Digest Update failed.\n"); return rc; } @@ -881,7 +881,7 @@ ssl3_mac_verify_final( SESSION * sess, hash_len = sizeof(hash); rc = digest_mgr_digest_final( sess, FALSE, &context->hash_context, hash, &hash_len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Final failed.\n"); + TRACE_DEVEL("Digest Final failed.\n"); return rc; } // now, do the outer hash @@ -900,12 +900,12 @@ ssl3_mac_verify_final( SESSION * sess, rc = digest_mgr_init( sess, &context->hash_context, &digest_mech ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Init failed.\n"); + TRACE_DEVEL("Digest Init failed.\n"); return rc; } rc = digest_mgr_digest_update( sess, &context->hash_context, key_data, key_bytes ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Update failed.\n"); + TRACE_DEVEL("Digest Update failed.\n"); return rc; } if (ctx->mech.mechanism == CKM_SSL3_MD5_MAC) @@ -914,18 +914,18 @@ ssl3_mac_verify_final( SESSION * sess, rc = digest_mgr_digest_update( sess, &context->hash_context, outer, 40 ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Update failed.\n"); + TRACE_DEVEL("Digest Update failed.\n"); return rc; } rc = digest_mgr_digest_update( sess, &context->hash_context, hash, hash_len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Update failed.\n"); + TRACE_DEVEL("Digest Update failed.\n"); return rc; } hash_len = sizeof(hash); rc = digest_mgr_digest_final( sess, FALSE, &context->hash_context, hash, &hash_len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Final failed.\n"); + TRACE_DEVEL("Digest Final failed.\n"); return rc; } if ((mac_len != sig_len) || (mac_len > hash_len)){ @@ -960,7 +960,7 @@ ckm_ssl3_pre_master_key_gen( TEMPLATE * tmpl, rc = rng_generate( key, 48 ); if (rc != CKR_OK){ - TRACE_DEBUG("rng_generate failed.\n"); + TRACE_DEVEL("rng_generate failed.\n"); return rc; } value_attr = (CK_ATTRIBUTE *)malloc(sizeof(CK_ATTRIBUTE) + 48 ); @@ -1056,7 +1056,7 @@ ssl3_sha_then_md5( SESSION * sess, rc = digest_mgr_init( sess, &digest_ctx, &digest_mech ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Init failed.\n"); + TRACE_DEVEL("Digest Init failed.\n"); return rc; } rc = digest_mgr_digest_update( sess, @@ -1064,12 +1064,12 @@ ssl3_sha_then_md5( SESSION * sess, variableData, variableDataLen ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Update failed.\n"); + TRACE_DEVEL("Digest Update failed.\n"); return rc; } rc = digest_mgr_digest_update( sess, &digest_ctx, secret, 48 ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Update failed.\n"); + TRACE_DEVEL("Digest Update failed.\n"); return rc; } rc = digest_mgr_digest_update( sess, @@ -1077,7 +1077,7 @@ ssl3_sha_then_md5( SESSION * sess, firstRandom, firstRandomLen ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Update failed.\n"); + TRACE_DEVEL("Digest Update failed.\n"); return rc; } rc = digest_mgr_digest_update( sess, @@ -1085,13 +1085,13 @@ ssl3_sha_then_md5( SESSION * sess, secondRandom, secondRandomLen ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Update failed.\n"); + TRACE_DEVEL("Digest Update failed.\n"); return rc; } len = sizeof(hash); rc = digest_mgr_digest_final( sess, FALSE, &digest_ctx, hash, &len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Final failed.\n"); + TRACE_DEVEL("Digest Final failed.\n"); return rc; } @@ -1104,17 +1104,17 @@ ssl3_sha_then_md5( SESSION * sess, rc = digest_mgr_init( sess, &digest_ctx, &digest_mech ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Init failed.\n"); + TRACE_DEVEL("Digest Init failed.\n"); return rc; } rc = digest_mgr_digest_update( sess, &digest_ctx, secret, 48 ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Update failed.\n"); + TRACE_DEVEL("Digest Update failed.\n"); return rc; } rc = digest_mgr_digest_update( sess, &digest_ctx, hash, len ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Update failed.\n"); + TRACE_DEVEL("Digest Update failed.\n"); return rc; } len = sizeof(hash); @@ -1124,7 +1124,7 @@ ssl3_sha_then_md5( SESSION * sess, memcpy( outBuff, hash, len ); } else - TRACE_DEBUG("Digest Final failed.\n"); + TRACE_DEVEL("Digest Final failed.\n"); return rc; } @@ -1162,7 +1162,7 @@ ssl3_md5_only( SESSION * sess, rc = digest_mgr_init( sess, &digest_ctx, &digest_mech ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Init failed.\n"); + TRACE_DEVEL("Digest Init failed.\n"); return rc; } if (firstString != NULL) { @@ -1171,7 +1171,7 @@ ssl3_md5_only( SESSION * sess, firstString, firstStringLen ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Update failed.\n"); + TRACE_DEVEL("Digest Update failed.\n"); return rc; } } @@ -1181,7 +1181,7 @@ ssl3_md5_only( SESSION * sess, secondString, secondStringLen ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Update failed.\n"); + TRACE_DEVEL("Digest Update failed.\n"); return rc; } rc = digest_mgr_digest_update( sess, @@ -1189,14 +1189,14 @@ ssl3_md5_only( SESSION * sess, thirdString, thirdStringLen ); if (rc != CKR_OK){ - TRACE_DEBUG("Digest Update failed.\n"); + TRACE_DEVEL("Digest Update failed.\n"); return rc; } len = sizeof(hash); rc = digest_mgr_digest_final( sess, FALSE, &digest_ctx, hash, &len ); if (rc == CKR_OK){ - TRACE_DEBUG("Digest Final failed.\n"); + TRACE_DEVEL("Digest Final failed.\n"); memcpy( outBuff, hash, len ); } @@ -1313,7 +1313,7 @@ ssl3_master_key_derive( SESSION * sess, key_data ); if (rc != CKR_OK){ - TRACE_DEBUG("ssl3_sha_then_md5 failed.\n"); + TRACE_DEVEL("ssl3_sha_then_md5 failed.\n"); goto error; } rc = ssl3_sha_then_md5( sess, @@ -1326,7 +1326,7 @@ ssl3_master_key_derive( SESSION * sess, 2, &key_data[16] ); if (rc != CKR_OK){ - TRACE_DEBUG("ssl3_sha_then_md5 failed.\n"); + TRACE_DEVEL("ssl3_sha_then_md5 failed.\n"); goto error; } rc = ssl3_sha_then_md5( sess, @@ -1339,7 +1339,7 @@ ssl3_master_key_derive( SESSION * sess, 3, &key_data[32] ); if (rc != CKR_OK){ - TRACE_DEBUG("ssl3_sha_then_md5 failed.\n"); + TRACE_DEVEL("ssl3_sha_then_md5 failed.\n"); goto error; } // build the key skeleton @@ -1350,18 +1350,18 @@ ssl3_master_key_derive( SESSION * sess, CKO_SECRET_KEY, CKK_GENERIC_SECRET, &derived_key_obj ); if (rc != CKR_OK){ - TRACE_DEBUG("Object Mgr Create Skeleton failed.\n"); + TRACE_DEVEL("Object Mgr Create Skeleton failed.\n"); goto error; } rc = build_attribute( CKA_VALUE, key_data, 48, &value_attr ); if (rc != CKR_OK){ - TRACE_DEBUG("Failed to build CKA_VALUE attribute.\n"); + TRACE_DEVEL("Failed to build CKA_VALUE attribute.\n"); goto error; } rc = build_attribute( CKA_VALUE_LEN, (CK_BYTE *)&base_key_len, sizeof(CK_ULONG), &value_len_attr ); if (rc != CKR_OK){ - TRACE_DEBUG("Failed to build CKA_VALUE_LEN attribute.\n"); + TRACE_DEVEL("Failed to build CKA_VALUE_LEN attribute.\n"); goto error; } @@ -1393,7 +1393,7 @@ ssl3_master_key_derive( SESSION * sess, rc = build_attribute( CKA_ALWAYS_SENSITIVE, &flag, sizeof(CK_BBOOL), &always_sens_attr ); if (rc != CKR_OK){ - TRACE_DEBUG("Failed to build CKA_ALWAYS_SENSITIVE attribute.\n"); + TRACE_DEVEL("Failed to build CKA_ALWAYS_SENSITIVE attribute.\n"); goto error; } @@ -1402,7 +1402,7 @@ ssl3_master_key_derive( SESSION * sess, // rc = template_attribute_find( base_key_obj->template, CKA_NEVER_EXTRACTABLE, &attr ); if (rc == FALSE) { - TRACE_DEBUG("Failed to build CKA_NEVER_EXTRACTABLE attribute.\n"); + TRACE_DEVEL("Failed to build CKA_NEVER_EXTRACTABLE attribute.\n"); rc = CKR_FUNCTION_FAILED; goto error; } @@ -1411,7 +1411,7 @@ ssl3_master_key_derive( SESSION * sess, if (flag == TRUE) { rc = template_attribute_find( derived_key_obj->template, CKA_EXTRACTABLE, &attr ); if (rc == FALSE) { - TRACE_DEBUG("Failed to build CKA_EXTRACTABLE attribute.\n"); + TRACE_DEVEL("Failed to build CKA_EXTRACTABLE attribute.\n"); rc = CKR_FUNCTION_FAILED; goto error; } @@ -1423,7 +1423,7 @@ ssl3_master_key_derive( SESSION * sess, rc = build_attribute( CKA_NEVER_EXTRACTABLE, &flag, sizeof(CK_BBOOL), &extract_attr ); if (rc != CKR_OK){ - TRACE_DEBUG("Failed to build CKA_NEVER_EXTRACTABLE attribute.\n"); + TRACE_DEVEL("Failed to build CKA_NEVER_EXTRACTABLE attribute.\n"); goto error; } template_update_attribute( derived_key_obj->template, value_attr ); @@ -1436,7 +1436,7 @@ ssl3_master_key_derive( SESSION * sess, // rc = object_mgr_create_final( sess, derived_key_obj, handle ); if (rc != CKR_OK) { - TRACE_DEBUG("Object Mgr create final failed.\n"); + TRACE_DEVEL("Object Mgr create final failed.\n"); object_free( derived_key_obj ); return rc; // do NOT goto error } @@ -1614,7 +1614,7 @@ ssl3_key_and_mac_derive( SESSION * sess, // we stop at 'ZZZZ....' presumably this is enough for all cases? // if (key_material_loop_count > 26 * 16){ - TRACE_DEBUG("key_material_loop_count is too big.\n"); + TRACE_DEVEL("key_material_loop_count is too big.\n"); return CKR_FUNCTION_FAILED; } key_material_loop_count = (key_material_loop_count + 15) / 16; @@ -1634,7 +1634,7 @@ ssl3_key_and_mac_derive( SESSION * sess, i+1, &(key_block[i*16]) ); if (rc != CKR_OK){ - TRACE_DEBUG("ssl3_sha_then_md5 failed.\n"); + TRACE_DEVEL("ssl3_sha_then_md5 failed.\n"); goto error; } } @@ -1668,7 +1668,7 @@ ssl3_key_and_mac_derive( SESSION * sess, params->RandomInfo.ulServerRandomLen, &(key_block[16*26]) ); if (rc != CKR_OK){ - TRACE_DEBUG("ssl3_md5_only failed.\n"); + TRACE_DEVEL("ssl3_md5_only failed.\n"); goto error; } client_write_key_value = &(key_block[16*26]); @@ -1682,7 +1682,7 @@ ssl3_key_and_mac_derive( SESSION * sess, params->RandomInfo.ulClientRandomLen, &(key_block[16*26+16]) ); if (rc != CKR_OK){ - TRACE_DEBUG("ssl3_md5_only failed.\n"); + TRACE_DEVEL("ssl3_md5_only failed.\n"); goto error; } server_write_key_value = &(key_block[16*26+16]); @@ -1698,7 +1698,7 @@ ssl3_key_and_mac_derive( SESSION * sess, params->RandomInfo.ulServerRandomLen, &(key_block[16*26+2*16]) ); if (rc != CKR_OK){ - TRACE_DEBUG("ssl3_md5_only failed.\n"); + TRACE_DEVEL("ssl3_md5_only failed.\n"); goto error; } client_IV = &(key_block[16*26+2*16]); @@ -1712,7 +1712,7 @@ ssl3_key_and_mac_derive( SESSION * sess, params->RandomInfo.ulClientRandomLen, &(key_block[16*26+3*16]) ); if (rc != CKR_OK){ - TRACE_DEBUG("ssl3_md5_only failed.\n"); + TRACE_DEVEL("ssl3_md5_only failed.\n"); goto error; } server_IV = &(key_block[16*26+3*16]); @@ -1725,7 +1725,7 @@ ssl3_key_and_mac_derive( SESSION * sess, &server_MAC_handle, server_MAC_key_value, MAC_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ssl3_kmd_process_mac_keys failed.\n"); + TRACE_DEVEL("ssl3_kmd_process_mac_keys failed.\n"); goto error; } @@ -1734,7 +1734,7 @@ ssl3_key_and_mac_derive( SESSION * sess, &server_write_handle, server_write_key_value, write_len ); if (rc != CKR_OK){ - TRACE_DEBUG("ssl3_kmd_process_write_keys failed.\n"); + TRACE_DEVEL("ssl3_kmd_process_write_keys failed.\n"); goto error; } @@ -1872,7 +1872,7 @@ ssl3_kmd_process_mac_keys( SESSION * sess, CKK_GENERIC_SECRET, &client_obj ); if (rc != CKR_OK){ - TRACE_DEBUG("Object Mgr Create Skeleton failed.\n"); + TRACE_DEVEL("Object Mgr Create Skeleton failed.\n"); goto error; } rc = object_mgr_create_skel( sess, @@ -1882,7 +1882,7 @@ ssl3_kmd_process_mac_keys( SESSION * sess, CKK_GENERIC_SECRET, &server_obj ); if (rc != CKR_OK){ - TRACE_DEBUG("Object Mgr Create Skeleton failed.\n"); + TRACE_DEVEL("Object Mgr Create Skeleton failed.\n"); goto error; } for (i=0; i < ulCount; i++) @@ -1893,22 +1893,22 @@ ssl3_kmd_process_mac_keys( SESSION * sess, rc = build_attribute( CKA_VALUE, client_value, mac_len, &client_val_attr ); if (rc != CKR_OK){ - TRACE_DEBUG("Failed to build CKA_VALUE attribute.\n"); + TRACE_DEVEL("Failed to build CKA_VALUE attribute.\n"); goto error; } rc = build_attribute( CKA_VALUE, server_value, mac_len, &server_val_attr ); if (rc != CKR_OK){ - TRACE_DEBUG("Failed to build CKA_VALUE attribute.\n"); + TRACE_DEVEL("Failed to build CKA_VALUE attribute.\n"); goto error; } rc = build_attribute( CKA_VALUE_LEN, (CK_BYTE *)&mac_len, sizeof(CK_ULONG), &client_val_len_attr ); if (rc != CKR_OK){ - TRACE_DEBUG("Failed to build CKA_VALUE_LEN attribute.\n"); + TRACE_DEVEL("Failed to build CKA_VALUE_LEN attribute.\n"); goto error; } rc = build_attribute( CKA_VALUE_LEN, (CK_BYTE *)&mac_len, sizeof(CK_ULONG), &server_val_len_attr ); if (rc != CKR_OK){ - TRACE_DEBUG("Failed to build CKA_VALUE_LEN attribute.\n"); + TRACE_DEVEL("Failed to build CKA_VALUE_LEN attribute.\n"); goto error; } template_update_attribute( client_obj->template, client_val_attr ); @@ -1919,12 +1919,12 @@ ssl3_kmd_process_mac_keys( SESSION * sess, rc = object_mgr_create_final( sess, client_obj, client_handle ); if (rc != CKR_OK){ - TRACE_DEBUG("Object Mgr Create Final failed.\n"); + TRACE_DEVEL("Object Mgr Create Final failed.\n"); goto error; } rc = object_mgr_create_final( sess, server_obj, server_handle ); if (rc != CKR_OK){ - TRACE_DEBUG("Object Mgr Create Final failed.\n"); + TRACE_DEVEL("Object Mgr Create Final failed.\n"); goto error; } @@ -2057,7 +2057,7 @@ ssl3_kmd_process_write_keys( SESSION * sess, keytype, &client_obj ); if (rc != CKR_OK){ - TRACE_DEBUG("Object Mgr Create Skeleton failed.\n"); + TRACE_DEVEL("Object Mgr Create Skeleton failed.\n"); goto error; } rc = object_mgr_create_skel( sess, @@ -2067,7 +2067,7 @@ ssl3_kmd_process_write_keys( SESSION * sess, keytype, &server_obj ); if (rc != CKR_OK){ - TRACE_DEBUG("Object Mgr Create Skeleton failed.\n"); + TRACE_DEVEL("Object Mgr Create Skeleton failed.\n"); goto error; } for (i=0; i < ulCount; i++) { @@ -2081,7 +2081,7 @@ ssl3_kmd_process_write_keys( SESSION * sess, rc = build_attribute( CKA_VALUE, client_value, write_len, &client_val_attr ); rc |= build_attribute( CKA_VALUE, server_value, write_len, &server_val_attr ); if (rc != CKR_OK){ - TRACE_DEBUG("Failed to build CKA_VALUE attribute.\n"); + TRACE_DEVEL("Failed to build CKA_VALUE attribute.\n"); goto error; } switch (keytype) { @@ -2099,7 +2099,7 @@ ssl3_kmd_process_write_keys( SESSION * sess, rc = build_attribute( CKA_VALUE_LEN, (CK_BYTE *)&write_len, sizeof(CK_ULONG), &client_val_len_attr ); rc |= build_attribute( CKA_VALUE_LEN, (CK_BYTE *)&write_len, sizeof(CK_ULONG), &server_val_len_attr ); if (rc != CKR_OK){ - TRACE_DEBUG("Failed to build CKA_VALUE_LEN attribute.\n"); + TRACE_DEVEL("Failed to build CKA_VALUE_LEN attribute.\n"); goto error; } rc = template_validate_attribute( client_obj->template, @@ -2128,7 +2128,7 @@ ssl3_kmd_process_write_keys( SESSION * sess, keytype, MODE_CREATE ); if (rc != CKR_OK){ - TRACE_DEBUG("template_validate_attribute failed.\n"); + TRACE_DEVEL("template_validate_attribute failed.\n"); goto error; } template_update_attribute( client_obj->template, client_val_attr ); @@ -2158,7 +2158,7 @@ ssl3_kmd_process_write_keys( SESSION * sess, keytype, MODE_CREATE ); if (rc != CKR_OK){ - TRACE_DEBUG("template_validate_attribute failed.\n"); + TRACE_DEVEL("template_validate_attribute failed.\n"); goto error; } template_update_attribute( client_obj->template, client_val_attr ); @@ -2176,12 +2176,12 @@ ssl3_kmd_process_write_keys( SESSION * sess, // rc = object_mgr_create_final( sess, client_obj, client_handle ); if (rc != CKR_OK){ - TRACE_DEBUG("Object Mgr Create Final failed.\n"); + TRACE_DEVEL("Object Mgr Create Final failed.\n"); goto error; } rc = object_mgr_create_final( sess, server_obj, server_handle ); if (rc != CKR_OK){ - TRACE_DEBUG("Object Mgr Create Final failed.\n"); + TRACE_DEVEL("Object Mgr Create Final failed.\n"); goto error; } return CKR_OK; diff --git a/usr/lib/pkcs11/common/new_host.c b/usr/lib/pkcs11/common/new_host.c index 02892f29..b452858a 100755 --- a/usr/lib/pkcs11/common/new_host.c +++ b/usr/lib/pkcs11/common/new_host.c @@ -463,7 +463,7 @@ CK_RV ST_Initialize(void **FunctionList, CK_SLOT_ID SlotNumber, char *conf_name, rc = token_specific.t_init(SlotNumber, conf_name); if (rc != 0) { *FunctionList = NULL; - TRACE_DEBUG("Token Specific Init failed.\n"); + TRACE_DEVEL("Token Specific Init failed.\n"); goto done; } } @@ -471,7 +471,7 @@ CK_RV ST_Initialize(void **FunctionList, CK_SLOT_ID SlotNumber, char *conf_name, rc = load_token_data(SlotNumber); if (rc != CKR_OK) { *FunctionList = NULL; - TRACE_DEBUG("Failed to load token data.\n"); + TRACE_DEVEL("Failed to load token data.\n"); goto done; } @@ -730,7 +730,7 @@ CK_RV SC_InitToken(CK_SLOT_ID sid, CK_CHAR_PTR pPin, CK_ULONG ulPinLen, rc = save_token_data(sid); if (rc != CKR_OK) { - TRACE_DEBUG("Failed to save token data.\n"); + TRACE_DEVEL("Failed to save token data.\n"); goto done; } done: @@ -788,7 +788,7 @@ CK_RV SC_InitPIN(ST_SESSION_HANDLE *sSession, CK_CHAR_PTR pPin, rc = save_token_data(sess->session_info.slotID); if (rc != CKR_OK) - TRACE_DEBUG("Failed to save token data.\n"); + TRACE_DEVEL("Failed to save token data.\n"); } goto done; } @@ -818,12 +818,12 @@ CK_RV SC_InitPIN(ST_SESSION_HANDLE *sSession, CK_CHAR_PTR pPin, memcpy(user_pin_md5, hash_md5, MD5_HASH_SIZE); rc = save_token_data(sess->session_info.slotID); if (rc != CKR_OK) { - TRACE_DEBUG("Failed to save token data.\n"); + TRACE_DEVEL("Failed to save token data.\n"); goto done; } rc = save_masterkey_user(); if (rc != CKR_OK) - TRACE_DEBUG("Failed to save user's masterkey.\n"); + TRACE_DEVEL("Failed to save user's masterkey.\n"); done: TRACE_INFO("C_InitPin: rc = 0x%08x, session = %d\n", @@ -906,7 +906,7 @@ CK_RV SC_SetPIN(ST_SESSION_HANDLE *sSession, CK_CHAR_PTR pOldPin, } rc = XProcLock(); if (rc != CKR_OK) { - TRACE_DEBUG("Failed to get process lock.\n"); + TRACE_DEVEL("Failed to get process lock.\n"); goto done; } memcpy(nv_token_data->user_pin_sha, new_hash_sha, @@ -917,7 +917,7 @@ CK_RV SC_SetPIN(ST_SESSION_HANDLE *sSession, CK_CHAR_PTR pOldPin, XProcUnLock(); rc = save_token_data(sess->session_info.slotID); if (rc != CKR_OK) { - TRACE_DEBUG("Failed to save token data.\n"); + TRACE_DEVEL("Failed to save token data.\n"); goto done; } rc = save_masterkey_user(); @@ -946,7 +946,7 @@ CK_RV SC_SetPIN(ST_SESSION_HANDLE *sSession, CK_CHAR_PTR pOldPin, } rc = XProcLock(); if (rc != CKR_OK) { - TRACE_DEBUG("Failed to get process lock.\n"); + TRACE_DEVEL("Failed to get process lock.\n"); goto done; } memcpy(nv_token_data->so_pin_sha, new_hash_sha, SHA1_HASH_SIZE); @@ -955,12 +955,12 @@ CK_RV SC_SetPIN(ST_SESSION_HANDLE *sSession, CK_CHAR_PTR pOldPin, XProcUnLock(); rc = save_token_data(sess->session_info.slotID); if (rc != CKR_OK) { - TRACE_DEBUG("Failed to save token data.\n"); + TRACE_DEVEL("Failed to save token data.\n"); goto done; } rc = save_masterkey_so(); if (rc != CKR_OK) - TRACE_DEBUG("Failed to save SO's masterkey.\n"); + TRACE_DEVEL("Failed to save SO's masterkey.\n"); } else { TRACE_ERROR("%s\n", ock_err(ERR_SESSION_READ_ONLY)); rc = CKR_SESSION_READ_ONLY; @@ -1011,7 +1011,7 @@ CK_RV SC_OpenSession(CK_SLOT_ID sid, CK_FLAGS flags, locked = FALSE; rc = session_mgr_new(flags, sid, phSession); if (rc != CKR_OK) { - TRACE_DEBUG("session_mgr_new() failed\n"); + TRACE_DEVEL("session_mgr_new() failed\n"); goto done; } done: @@ -1050,7 +1050,7 @@ CK_RV SC_CloseAllSessions(CK_SLOT_ID sid) } rc = session_mgr_close_all_sessions(); if (rc != CKR_OK) - TRACE_DEBUG("session_mgr_close_all_sessions() failed.\n"); + TRACE_DEVEL("session_mgr_close_all_sessions() failed.\n"); done: TRACE_INFO("C_CloseAllSessions: rc = 0x%08x slot = %d\n", rc, sid); return rc; @@ -1120,7 +1120,7 @@ CK_RV SC_GetOperationState(ST_SESSION_HANDLE *sSession, rc = session_mgr_get_op_state(sess, length_only, pOperationState, pulOperationStateLen); if (rc != CKR_OK) - TRACE_DEBUG("session_mgr_get_op_state() failed.\n"); + TRACE_DEVEL("session_mgr_get_op_state() failed.\n"); done: TRACE_INFO("C_GetOperationState: rc = 0x%08x, session = %d\n", rc, sSession->sessionh); @@ -1160,7 +1160,7 @@ CK_RV SC_SetOperationState(ST_SESSION_HANDLE *sSession, pOperationState, ulOperationStateLen); if (rc != CKR_OK) - TRACE_DEBUG("session_mgr_set_op_state() failed.\n"); + TRACE_DEVEL("session_mgr_set_op_state() failed.\n"); done: TRACE_INFO("C_SetOperationState: rc = 0x%08x, session = %d\n", rc, sSession->sessionh); @@ -1294,7 +1294,7 @@ CK_RV SC_Login(ST_SESSION_HANDLE *sSession, CK_USER_TYPE userType, rc = load_masterkey_user(); if (rc != CKR_OK){ - TRACE_DEBUG("Failed to load user's masterkey.\n"); + TRACE_DEVEL("Failed to load user's masterkey.\n"); goto done; } @@ -1346,14 +1346,14 @@ CK_RV SC_Login(ST_SESSION_HANDLE *sSession, CK_USER_TYPE userType, rc = load_masterkey_so(); if (rc != CKR_OK) - TRACE_DEBUG("Failed to load SO's masterkey.\n"); + TRACE_DEVEL("Failed to load SO's masterkey.\n"); } done: if (rc == CKR_OK) { rc = session_mgr_login_all(userType); if (rc != CKR_OK) - TRACE_DEBUG("session_mgr_login_all failed.\n"); + TRACE_DEVEL("session_mgr_login_all failed.\n"); } TRACE_INFO("C_Login: rc = 0x%08x\n", rc); @@ -1390,7 +1390,7 @@ CK_RV SC_Logout(ST_SESSION_HANDLE *sSession) rc = session_mgr_logout_all(); if (rc != CKR_OK) - TRACE_DEBUG("session_mgr_logout_all failed.\n"); + TRACE_DEVEL("session_mgr_logout_all failed.\n"); /* Check if token has a specific handler for this, otherwise fall back * to default behaviour. @@ -1439,7 +1439,7 @@ CK_RV SC_CreateObject(ST_SESSION_HANDLE *sSession, CK_ATTRIBUTE_PTR pTemplate, rc = object_mgr_add(sess, pTemplate, ulCount, phObject); if (rc != CKR_OK) - TRACE_DEBUG("object_mgr_add() failed.\n"); + TRACE_DEVEL("object_mgr_add() failed.\n"); done: TRACE_INFO("C_CreateObject: rc = 0x%08x\n", rc); @@ -1487,7 +1487,7 @@ CK_RV SC_CopyObject(ST_SESSION_HANDLE *sSession, CK_OBJECT_HANDLE hObject, rc = object_mgr_copy(sess, pTemplate, ulCount, hObject, phNewObject); if (rc != CKR_OK) - TRACE_DEBUG("object_mgr_copy() failed\n"); + TRACE_DEVEL("object_mgr_copy() failed\n"); done: TRACE_INFO("C_CopyObject:rc = 0x%08x,old handle = %d,new handle = %d\n", @@ -1522,7 +1522,7 @@ CK_RV SC_DestroyObject(ST_SESSION_HANDLE *sSession, CK_OBJECT_HANDLE hObject) rc = object_mgr_destroy_object(sess, hObject); if (rc != CKR_OK) - TRACE_DEBUG("object_mgr_destroy_object() failed\n"); + TRACE_DEVEL("object_mgr_destroy_object() failed\n"); done: TRACE_INFO("C_DestroyObject: rc = 0x%08x, handle = %d\n", rc, hObject); return rc; @@ -1583,7 +1583,7 @@ CK_RV SC_GetAttributeValue(ST_SESSION_HANDLE *sSession, rc = object_mgr_get_attribute_values(sess, hObject, pTemplate, ulCount); if (rc != CKR_OK) - TRACE_DEBUG("object_mgr_get_attribute_value() failed.\n"); + TRACE_DEVEL("object_mgr_get_attribute_value() failed.\n"); done: TRACE_INFO("C_GetAttributeValue: rc = 0x%08x, handle = %d\n", @@ -1630,7 +1630,7 @@ CK_RV SC_SetAttributeValue(ST_SESSION_HANDLE *sSession, rc = object_mgr_set_attribute_values(sess, hObject, pTemplate, ulCount); if (rc != CKR_OK) - TRACE_DEBUG("object_mgr_set_attribute_values() failed.\n"); + TRACE_DEVEL("object_mgr_set_attribute_values() failed.\n"); done: TRACE_INFO("C_SetAttributeValue: rc = 0x%08x, handle = %d\n", @@ -1742,7 +1742,7 @@ CK_RV SC_FindObjects(ST_SESSION_HANDLE *sSession, CK_OBJECT_HANDLE_PTR phObject, } if (!sess->find_list) { - TRACE_DEBUG("sess->find_list is NULL.\n"); + TRACE_DEVEL("sess->find_list is NULL.\n"); rc = CKR_FUNCTION_FAILED; goto done; } @@ -1893,7 +1893,7 @@ CK_RV SC_Encrypt(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pData, rc = encr_mgr_encrypt(sess, length_only, &sess->encr_ctx, pData, ulDataLen, pEncryptedData, pulEncryptedDataLen); if (rc != CKR_OK) - TRACE_DEBUG("encr_mgr_encrypt() failed.\n"); + TRACE_DEVEL("encr_mgr_encrypt() failed.\n"); done: if (rc != CKR_BUFFER_TOO_SMALL && (rc != CKR_OK || length_only != TRUE)) @@ -1946,7 +1946,7 @@ CK_RV SC_EncryptUpdate(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pPart, pPart, ulPartLen, pEncryptedPart, pulEncryptedPartLen); if (rc != CKR_OK) - TRACE_DEBUG("encr_mgr_encrypt_update() failed.\n"); + TRACE_DEVEL("encr_mgr_encrypt_update() failed.\n"); done: if (rc != CKR_OK && rc != CKR_BUFFER_TOO_SMALL) @@ -2076,7 +2076,7 @@ CK_RV SC_DecryptInit(ST_SESSION_HANDLE *sSession, CK_MECHANISM_PTR pMechanism, rc = decr_mgr_init(sess, &sess->decr_ctx, OP_DECRYPT_INIT, pMechanism, hKey); if (rc != CKR_OK) - TRACE_DEBUG("decr_mgr_init() failed.\n"); + TRACE_DEVEL("decr_mgr_init() failed.\n"); done: TRACE_INFO("C_DecryptInit: rc = 0x%08x, sess = %d, mech = 0x%x\n", @@ -2127,7 +2127,7 @@ CK_RV SC_Decrypt(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pEncryptedData, pEncryptedData, ulEncryptedDataLen, pData, pulDataLen); if (rc != CKR_OK) - TRACE_DEBUG("decr_mgr_decrypt() failed.\n"); + TRACE_DEVEL("decr_mgr_decrypt() failed.\n"); done: if (rc != CKR_BUFFER_TOO_SMALL && (rc != CKR_OK || length_only != TRUE)) @@ -2181,7 +2181,7 @@ CK_RV SC_DecryptUpdate(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pEncryptedPart, pEncryptedPart,ulEncryptedPartLen, pPart, pulPartLen); if (rc != CKR_OK) - TRACE_DEBUG("decr_mgr_decrypt_update() failed.\n"); + TRACE_DEVEL("decr_mgr_decrypt_update() failed.\n"); done: if (rc != CKR_OK && rc != CKR_BUFFER_TOO_SMALL) @@ -2233,7 +2233,7 @@ CK_RV SC_DecryptFinal(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pLastPart, rc = decr_mgr_decrypt_final(sess, length_only, &sess->decr_ctx, pLastPart, pulLastPartLen); if (rc != CKR_OK) - TRACE_DEBUG("decr_mgr_decrypt_final() failed.\n"); + TRACE_DEVEL("decr_mgr_decrypt_final() failed.\n"); done: if (rc != CKR_BUFFER_TOO_SMALL && (rc != CKR_OK || length_only != TRUE)) decr_mgr_cleanup( &sess->decr_ctx ); @@ -2287,7 +2287,7 @@ CK_RV SC_DigestInit(ST_SESSION_HANDLE *sSession, CK_MECHANISM_PTR pMechanism) rc = digest_mgr_init(sess, &sess->digest_ctx, pMechanism); if (rc != CKR_OK) - TRACE_DEBUG("digest_mgr_init() failed.\n"); + TRACE_DEVEL("digest_mgr_init() failed.\n"); done: TRACE_INFO("C_DigestInit: rc = 0x%08x, sess = %d, mech = %x\n", @@ -2340,7 +2340,7 @@ CK_RV SC_Digest(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pData, rc = digest_mgr_digest(sess, length_only, &sess->digest_ctx, pData, ulDataLen, pDigest, pulDigestLen); if (rc != CKR_OK) - TRACE_DEBUG("digest_mgr_digest() failed.\n"); + TRACE_DEVEL("digest_mgr_digest() failed.\n"); done: TRACE_INFO("C_Digest: rc = 0x%08x, sess = %d, datalen = %d\n", @@ -2386,7 +2386,7 @@ CK_RV SC_DigestUpdate(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pPart, rc = digest_mgr_digest_update(sess, &sess->digest_ctx, pPart, ulPartLen); if (rc != CKR_OK) - TRACE_DEBUG("digest_mgr_digest_update() failed.\n"); + TRACE_DEVEL("digest_mgr_digest_update() failed.\n"); } done: TRACE_INFO("C_DigestUpdate: rc = %08x, sess = %d, datalen = %d\n", @@ -2422,7 +2422,7 @@ CK_RV SC_DigestKey(ST_SESSION_HANDLE *sSession, CK_OBJECT_HANDLE hKey) rc = digest_mgr_digest_key(sess, &sess->digest_ctx, hKey); if (rc != CKR_OK) - TRACE_DEBUG("digest_mgr_digest_key() failed.\n"); + TRACE_DEVEL("digest_mgr_digest_key() failed.\n"); done: TRACE_INFO("C_DigestKey: rc = %08x, sess = %d, key = %d\n", @@ -2523,7 +2523,7 @@ CK_RV SC_SignInit(ST_SESSION_HANDLE *sSession, CK_MECHANISM_PTR pMechanism, rc = sign_mgr_init(sess, &sess->sign_ctx, pMechanism, FALSE, hKey); if (rc != CKR_OK) - TRACE_DEBUG("sign_mgr_init() failed.\n"); + TRACE_DEVEL("sign_mgr_init() failed.\n"); done: TRACE_INFO("C_SignInit: rc = %08x, sess = %d, mech = %x\n", @@ -2573,7 +2573,7 @@ CK_RV SC_Sign(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pData, rc = sign_mgr_sign(sess, length_only, &sess->sign_ctx, pData, ulDataLen, pSignature, pulSignatureLen); if (rc != CKR_OK) - TRACE_DEBUG("sign_mgr_sign() failed.\n"); + TRACE_DEVEL("sign_mgr_sign() failed.\n"); done: if (rc != CKR_BUFFER_TOO_SMALL && (rc != CKR_OK || length_only != TRUE)) @@ -2619,7 +2619,7 @@ CK_RV SC_SignUpdate(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pPart, rc = sign_mgr_sign_update(sess, &sess->sign_ctx, pPart, ulPartLen); if (rc != CKR_OK) - TRACE_DEBUG("sign_mgr_sign_update() failed.\n"); + TRACE_DEVEL("sign_mgr_sign_update() failed.\n"); done: if (rc != CKR_OK) @@ -2725,7 +2725,7 @@ CK_RV SC_SignRecoverInit(ST_SESSION_HANDLE *sSession, rc = sign_mgr_init(sess, &sess->sign_ctx, pMechanism, TRUE, hKey); if (rc != CKR_OK) - TRACE_DEBUG("sign_mgr_init() failed.\n"); + TRACE_DEVEL("sign_mgr_init() failed.\n"); done: TRACE_INFO("C_SignRecoverInit: rc = %08x, sess = %d, mech = %x\n", @@ -2776,7 +2776,7 @@ CK_RV SC_SignRecover(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pData, rc = sign_mgr_sign_recover(sess, length_only, &sess->sign_ctx, pData, ulDataLen, pSignature, pulSignatureLen); if (rc != CKR_OK) - TRACE_DEBUG("sign_mgr_sign_recover() failed.\n"); + TRACE_DEVEL("sign_mgr_sign_recover() failed.\n"); done: if (rc != CKR_BUFFER_TOO_SMALL && (rc != CKR_OK || length_only != TRUE)) @@ -2832,7 +2832,7 @@ CK_RV SC_VerifyInit(ST_SESSION_HANDLE *sSession, CK_MECHANISM_PTR pMechanism, rc = verify_mgr_init(sess, &sess->verify_ctx, pMechanism, FALSE, hKey); if (rc != CKR_OK) - TRACE_DEBUG("verify_mgr_init() failed.\n"); + TRACE_DEVEL("verify_mgr_init() failed.\n"); done: TRACE_INFO("C_VerifyInit: rc = %08x, sess = %d, mech = %x\n", @@ -2878,7 +2878,7 @@ CK_RV SC_Verify(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pData, rc = verify_mgr_verify(sess, &sess->verify_ctx, pData, ulDataLen, pSignature, ulSignatureLen); if (rc != CKR_OK) - TRACE_DEBUG("verify_mgr_verify() failed.\n"); + TRACE_DEVEL("verify_mgr_verify() failed.\n"); done: verify_mgr_cleanup(&sess->verify_ctx); @@ -2924,7 +2924,7 @@ CK_RV SC_VerifyUpdate(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pPart, rc = verify_mgr_verify_update(sess, &sess->verify_ctx, pPart, ulPartLen); if (rc != CKR_OK) - TRACE_DEBUG("verify_mgr_verify_update() failed.\n"); + TRACE_DEVEL("verify_mgr_verify_update() failed.\n"); done: if (rc != CKR_OK) @@ -2971,7 +2971,7 @@ CK_RV SC_VerifyFinal(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pSignature, rc = verify_mgr_verify_final(sess, &sess->verify_ctx, pSignature, ulSignatureLen); if (rc != CKR_OK) - TRACE_DEBUG("verify_mgr_verify_final() failed.\n"); + TRACE_DEVEL("verify_mgr_verify_final() failed.\n"); done: verify_mgr_cleanup(&sess->verify_ctx); @@ -3026,7 +3026,7 @@ CK_RV SC_VerifyRecoverInit(ST_SESSION_HANDLE *sSession, rc = verify_mgr_init(sess, &sess->verify_ctx, pMechanism, TRUE, hKey); if (rc != CKR_OK) - TRACE_DEBUG("verify_mgr_init() failed.\n"); + TRACE_DEVEL("verify_mgr_init() failed.\n"); done: TRACE_INFO("C_VerifyRecoverInit: rc = %08x, sess = %d, mech = %x\n", @@ -3078,7 +3078,7 @@ CK_RV SC_VerifyRecover(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pSignature, pSignature, ulSignatureLen, pData, pulDataLen); if (rc != CKR_OK) - TRACE_DEBUG("verify_mgr_verify_recover() failed.\n"); + TRACE_DEVEL("verify_mgr_verify_recover() failed.\n"); done: if (rc != CKR_BUFFER_TOO_SMALL && (rc != CKR_OK || length_only != TRUE)) @@ -3189,7 +3189,7 @@ CK_RV SC_GenerateKey(ST_SESSION_HANDLE *sSession, CK_MECHANISM_PTR pMechanism, rc = key_mgr_generate_key(sess, pMechanism, pTemplate, ulCount, phKey); if (rc != CKR_OK) - TRACE_DEBUG("key_mgr_generate_key() failed.\n"); + TRACE_DEVEL("key_mgr_generate_key() failed.\n"); done: TRACE_INFO("C_GenerateKey: rc = %08x, sess = %d, mech = %x\n", rc, @@ -3265,7 +3265,7 @@ CK_RV SC_GenerateKeyPair(ST_SESSION_HANDLE *sSession, ulPrivateKeyAttributeCount, phPublicKey, phPrivateKey); if (rc != CKR_OK) - TRACE_DEBUG("key_mgr_generate_key_pair() failed.\n"); + TRACE_DEVEL("key_mgr_generate_key_pair() failed.\n"); done: TRACE_INFO("C_GenerateKeyPair: rc = %08x, sess = %d, mech = %x\n", @@ -3348,7 +3348,7 @@ CK_RV SC_WrapKey(ST_SESSION_HANDLE *sSession, CK_MECHANISM_PTR pMechanism, rc = key_mgr_wrap_key(sess, length_only, pMechanism, hWrappingKey, hKey, pWrappedKey, pulWrappedKeyLen); if (rc != CKR_OK) - TRACE_DEBUG("key_mgr_wrap_key() failed.\n"); + TRACE_DEVEL("key_mgr_wrap_key() failed.\n"); done: TRACE_INFO("C_WrapKey: rc = %08x, sess = %d, encrypting key = %d, " @@ -3406,7 +3406,7 @@ CK_RV SC_UnwrapKey(ST_SESSION_HANDLE *sSession, CK_MECHANISM_PTR pMechanism, pWrappedKey, ulWrappedKeyLen, hUnwrappingKey, phKey); if (rc != CKR_OK) - TRACE_DEBUG("key_mgr_unwrap_key() failed.\n"); + TRACE_DEVEL("key_mgr_unwrap_key() failed.\n"); done: TRACE_INFO("C_UnwrapKey: rc = %08x, sess = %d, decrypting key = %d," @@ -3473,7 +3473,7 @@ CK_RV SC_DeriveKey(ST_SESSION_HANDLE *sSession, CK_MECHANISM_PTR pMechanism, rc = key_mgr_derive_key(sess, pMechanism, hBaseKey, phKey, pTemplate, ulCount ); if (rc != CKR_OK) - TRACE_DEBUG("key_mgr_derive_key() failed.\n"); + TRACE_DEVEL("key_mgr_derive_key() failed.\n"); done: TRACE_INFO("C_DeriveKey: rc = %08x, sess = %d, mech = %x\n", @@ -3567,7 +3567,7 @@ CK_RV SC_GenerateRandom(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pRandomData, rc = rng_generate(pRandomData, ulRandomLen); if (rc != CKR_OK) - TRACE_DEBUG("rng_generate() failed.\n"); + TRACE_DEVEL("rng_generate() failed.\n"); done: TRACE_INFO("C_GenerateRandom: rc = %08x, %d bytes\n", rc, ulRandomLen); diff --git a/usr/lib/pkcs11/common/obj_mgr.c b/usr/lib/pkcs11/common/obj_mgr.c index 8958870b..c275225f 100755 --- a/usr/lib/pkcs11/common/obj_mgr.c +++ b/usr/lib/pkcs11/common/obj_mgr.c @@ -337,14 +337,14 @@ object_mgr_add( SESSION * sess, rc = object_create( pTemplate, ulCount, &o ); if (rc != CKR_OK){ - TRACE_DEBUG("Object Create failed.\n"); + TRACE_DEVEL("Object Create failed.\n"); goto done; } if (token_specific.t_object_add != NULL) { rc = token_specific.t_object_add(o); if (rc != CKR_OK) { - TRACE_DEBUG("Token Specific object add failed.\n"); + TRACE_DEVEL("Token Specific object add failed.\n"); goto done; } } @@ -581,7 +581,7 @@ object_mgr_add_to_map( SESSION * sess, // add the new map entry to the list if (pthread_rwlock_wrlock(&obj_list_rw_mutex)) { free(map_node); - TRACE_DEBUG("Failed to acqquire mutex lock.\n"); + TRACE_DEVEL("Failed to acqquire mutex lock.\n"); return CKR_FUNCTION_FAILED; } @@ -646,12 +646,12 @@ object_mgr_copy( SESSION * sess, rc = object_mgr_find_in_map1( old_handle, &old_obj ); if (rc != CKR_OK){ - TRACE_DEBUG("object_mgr_find_in_map1 failed.\n"); + TRACE_DEVEL("object_mgr_find_in_map1 failed.\n"); goto done; } rc = object_copy( pTemplate, ulCount, old_obj, &new_obj ); if (rc != CKR_OK){ - TRACE_DEBUG("Object Copy failed.\n"); + TRACE_DEVEL("Object Copy failed.\n"); goto done; } @@ -787,7 +787,7 @@ object_mgr_copy( SESSION * sess, rc = object_mgr_add_to_map( sess, new_obj, obj_handle, new_handle ); if (rc != CKR_OK) { - TRACE_DEBUG("object_mgr_add_to_map failed.\n"); + TRACE_DEVEL("object_mgr_add_to_map failed.\n"); // this is messy but we need to remove the object from whatever // list we just added it to @@ -872,7 +872,7 @@ object_mgr_create_skel( SESSION * sess, obj_type, sub_class, &o ); if (rc != CKR_OK){ - TRACE_DEBUG("object_create_skel failed.\n"); + TRACE_DEVEL("object_create_skel failed.\n"); return rc; } sess_obj = object_is_session_object( o ); @@ -1023,7 +1023,7 @@ object_mgr_create_final( SESSION * sess, rc = object_mgr_add_to_map( sess, obj, obj_handle, handle ); if (rc != CKR_OK) { - TRACE_DEBUG("object_mgr_add_to_map failed.\n"); + TRACE_DEVEL("object_mgr_add_to_map failed.\n"); // this is messy but we need to remove the object from whatever // list we just added it to // @@ -1359,7 +1359,7 @@ object_mgr_find_in_map1( CK_OBJECT_HANDLE handle, XProcUnLock(); if (rc != CKR_OK) { - TRACE_DEBUG("object_mgr_check_shm failed.\n"); + TRACE_DEVEL("object_mgr_check_shm failed.\n"); goto done; } } @@ -1469,7 +1469,7 @@ find_build_list_cb(void *node, unsigned long obj_handle, void *p3) if (rc != CKR_OK) { rc = object_mgr_add_to_map( fa->sess, obj, obj_handle, &map_handle ); if (rc != CKR_OK){ - TRACE_DEBUG("object_mgr_add_to_map failed.\n"); + TRACE_DEVEL("object_mgr_add_to_map failed.\n"); return; } } @@ -1479,7 +1479,7 @@ find_build_list_cb(void *node, unsigned long obj_handle, void *p3) if ((fa->hw_feature == FALSE) && (template_attribute_find(obj->template, CKA_CLASS, &attr) == TRUE)) { if (attr->pValue == NULL) { - TRACE_DEBUG("%s\n", ock_err(ERR_GENERAL_ERROR)); + TRACE_DEVEL("%s\n", ock_err(ERR_GENERAL_ERROR)); return; } if (*(CK_OBJECT_CLASS *)attr->pValue == CKO_HW_FEATURE) @@ -1665,7 +1665,7 @@ object_mgr_get_attribute_values( SESSION * sess, rc = object_mgr_find_in_map1( handle, &obj ); if (rc != CKR_OK){ - TRACE_DEBUG("object_mgr_find_in_map1 failed.\n"); + TRACE_DEVEL("object_mgr_find_in_map1 failed.\n"); goto done; } priv_obj = object_is_private( obj ); @@ -1682,7 +1682,7 @@ object_mgr_get_attribute_values( SESSION * sess, rc = object_get_attribute_values( obj, pTemplate, ulCount ); if (rc != CKR_OK) - TRACE_DEBUG("object_get_attribute_values failed.\n"); + TRACE_DEVEL("object_get_attribute_values failed.\n"); done: if (locked) MY_UnlockMutex( &obj_list_mutex ); @@ -1707,7 +1707,7 @@ object_mgr_get_object_size( CK_OBJECT_HANDLE handle, } rc = object_mgr_find_in_map1( handle, &obj ); if (rc != CKR_OK) { - TRACE_DEBUG("object_mgr_find_in_map1 failed.\n"); + TRACE_DEVEL("object_mgr_find_in_map1 failed.\n"); goto done; } @@ -1906,7 +1906,7 @@ object_mgr_restore_obj_withSize( CK_BYTE *data, OBJECT *oldObj, int data_size ) XProcUnLock(); } else { - TRACE_DEBUG("object_restore_withSize failed.\n"); + TRACE_DEVEL("object_restore_withSize failed.\n"); } } @@ -1943,7 +1943,7 @@ object_mgr_set_attribute_values( SESSION * sess, MY_UnlockMutex( &obj_list_mutex ); if (rc != CKR_OK) { - TRACE_DEBUG("object_mgr_find_in_map1 failed.\n"); + TRACE_DEVEL("object_mgr_find_in_map1 failed.\n"); return rc; } @@ -1995,7 +1995,7 @@ object_mgr_set_attribute_values( SESSION * sess, rc = object_set_attribute_values( obj, pTemplate, ulCount ); if (rc != CKR_OK){ - TRACE_DEBUG("object_set_attribute_values failed.\n"); + TRACE_DEVEL("object_set_attribute_values failed.\n"); return rc; } // okay. the object has been updated. if it's a session object, @@ -2027,7 +2027,7 @@ object_mgr_set_attribute_values( SESSION * sess, obj, &index ); if (rc != CKR_OK) { - TRACE_DEBUG("object_mgr_search_shm_for_obj failed.\n"); + TRACE_DEVEL("object_mgr_search_shm_for_obj failed.\n"); XProcUnLock(); return rc; } @@ -2039,7 +2039,7 @@ object_mgr_set_attribute_values( SESSION * sess, 0, global_shm->num_publ_tok_obj-1, obj, &index ); if (rc != CKR_OK) { - TRACE_DEBUG("object_mgr_search_shm_for_obj failed.\n"); + TRACE_DEVEL("object_mgr_search_shm_for_obj failed.\n"); XProcUnLock(); return rc; } @@ -2114,7 +2114,7 @@ object_mgr_del_from_shm( OBJECT *obj ) 0, global_shm->num_priv_tok_obj-1, obj, &index ); if (rc != CKR_OK){ - TRACE_DEBUG("object_mgr_search_shm_for_obj failed.\n"); + TRACE_DEVEL("object_mgr_search_shm_for_obj failed.\n"); return rc; } // Since the number of objects starts at 1 and index starts at zero, we @@ -2152,7 +2152,7 @@ object_mgr_del_from_shm( OBJECT *obj ) 0, global_shm->num_publ_tok_obj-1, obj, &index ); if (rc != CKR_OK){ - TRACE_DEBUG("object_mgr_search_shm_for_obj failed.\n"); + TRACE_DEVEL("object_mgr_search_shm_for_obj failed.\n"); return rc; } global_shm->num_publ_tok_obj--; @@ -2489,14 +2489,14 @@ void dump_shm(const char *s) { CK_ULONG i; - TRACE_DEVEL("%s: dump_shm priv:", s); + TRACE_DEBUG("%s: dump_shm priv:", s); for (i = 0; i < global_shm->num_priv_tok_obj; i++) { - TRACE_DEVEL("[%lu]: %.8s", i, global_shm->priv_tok_objs[i].name); + TRACE_DEBUG("[%lu]: %.8s", i, global_shm->priv_tok_objs[i].name); } - TRACE_DEVEL("%s: dump_shm publ:", s); + TRACE_DEBUG("%s: dump_shm publ:", s); for (i = 0; i < global_shm->num_publ_tok_obj; i++) { - TRACE_DEVEL("[%lu]: %.8s", i, global_shm->publ_tok_objs[i].name); + TRACE_DEBUG("[%lu]: %.8s", i, global_shm->publ_tok_objs[i].name); } } #endif diff --git a/usr/lib/pkcs11/common/object.c b/usr/lib/pkcs11/common/object.c index 628b39f2..f655a6c6 100755 --- a/usr/lib/pkcs11/common/object.c +++ b/usr/lib/pkcs11/common/object.c @@ -394,7 +394,7 @@ object_create( CK_ATTRIBUTE * pTemplate, class, subclass, &o ); if (rc != CKR_OK){ - TRACE_DEBUG("object_create_skel failed.\n"); + TRACE_DEVEL("object_create_skel failed.\n"); return rc; } // for key objects, we need be careful... @@ -417,7 +417,7 @@ object_create( CK_ATTRIBUTE * pTemplate, rc = build_attribute( CKA_ALWAYS_SENSITIVE, &flag, sizeof(CK_BYTE), &sensitive ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed.\n"); + TRACE_DEVEL("build_attribute failed.\n"); goto error; } @@ -433,7 +433,7 @@ object_create( CK_ATTRIBUTE * pTemplate, rc = build_attribute( CKA_NEVER_EXTRACTABLE, &flag, sizeof(CK_BYTE), &extractable ); if (rc != CKR_OK){ - TRACE_DEBUG("build attribute failed.\n"); + TRACE_DEVEL("build attribute failed.\n"); goto error; } template_update_attribute( o->template, sensitive ); @@ -504,12 +504,12 @@ object_copy( CK_ATTRIBUTE * pTemplate, // rc = template_copy( tmpl, old_obj->template ); if (rc != CKR_OK){ - TRACE_DEBUG("Failed to copy template.\n"); + TRACE_DEVEL("Failed to copy template.\n"); goto error; } rc = template_add_attributes( new_tmpl, pTemplate, ulCount ); if (rc != CKR_OK){ - TRACE_DEBUG("template_add_attributes failed.\n"); + TRACE_DEVEL("template_add_attributes failed.\n"); goto error; } // at this point, the new object has the list of attributes. we need @@ -537,14 +537,14 @@ object_copy( CK_ATTRIBUTE * pTemplate, // rc = template_validate_attributes( new_tmpl, class, subclass, MODE_COPY ); if (rc != CKR_OK){ - TRACE_DEBUG("template_validate_attributes failed.\n"); + TRACE_DEVEL("template_validate_attributes failed.\n"); goto error; } // merge in the new attributes // rc = template_merge( tmpl, &new_tmpl ); if (rc != CKR_OK){ - TRACE_DEBUG("template_merge failed.\n"); + TRACE_DEVEL("template_merge failed.\n"); goto error; } // do we need this? since an attribute cannot be removed, the original @@ -845,7 +845,7 @@ object_set_attribute_values( OBJECT * obj, rc = template_add_attributes( new_tmpl, pTemplate, ulCount ); if (rc != CKR_OK){ - TRACE_DEBUG("template_add_attributes failed.\n"); + TRACE_DEVEL("template_add_attributes failed.\n"); goto error; } @@ -858,7 +858,7 @@ object_set_attribute_values( OBJECT * obj, // rc = template_validate_attributes( new_tmpl, class, subclass, MODE_MODIFY ); if (rc != CKR_OK){ - TRACE_DEBUG("template_validate_attributes failed.\n"); + TRACE_DEVEL("template_validate_attributes failed.\n"); goto error; } @@ -866,7 +866,7 @@ object_set_attribute_values( OBJECT * obj, // rc = template_merge( obj->template, &new_tmpl ); if (rc != CKR_OK){ - TRACE_DEBUG("template_merge failed.\n"); + TRACE_DEVEL("template_merge failed.\n"); return rc; } return CKR_OK; @@ -926,7 +926,7 @@ object_restore_withSize( CK_BYTE *data, OBJECT **new_obj, CK_BBOOL replace, int rc = template_unflatten_withSize( &tmpl, data + offset, count, data_size ); if (rc != CKR_OK){ - TRACE_DEBUG("template_unflatten_withSize failed.\n"); + TRACE_DEVEL("template_unflatten_withSize failed.\n"); goto error; } obj->template = tmpl; @@ -1004,13 +1004,13 @@ object_create_skel( CK_ATTRIBUTE * pTemplate, rc = template_validate_attributes( tmpl2, class, subclass, mode ); if (rc != CKR_OK){ - TRACE_DEBUG("template_validate_attributes failed.\n"); + TRACE_DEVEL("template_validate_attributes failed.\n"); goto done; } rc = template_check_required_attributes( tmpl2, class, subclass, mode ); if (rc != CKR_OK){ - TRACE_DEBUG("template_check_required_attributes failed.\n"); + TRACE_DEVEL("template_check_required_attributes failed.\n"); goto done; } @@ -1021,7 +1021,7 @@ object_create_skel( CK_ATTRIBUTE * pTemplate, rc = template_merge( tmpl, &tmpl2 ); if (rc != CKR_OK){ - TRACE_DEBUG("template_merge failed.\n"); + TRACE_DEVEL("template_merge failed.\n"); goto done; } // at this point, we should have a valid object with correct attributes diff --git a/usr/lib/pkcs11/common/shared_memory.c b/usr/lib/pkcs11/common/shared_memory.c index a404021e..3d31282a 100644 --- a/usr/lib/pkcs11/common/shared_memory.c +++ b/usr/lib/pkcs11/common/shared_memory.c @@ -128,7 +128,7 @@ convert_path_to_shm_name(const char *file_path) } *it = '\0'; - TRACE_DEBUG("File path \"%s\" converted to \"%s\".\n", + TRACE_DEVEL("File path \"%s\" converted to \"%s\".\n", file_path, name); return name; } @@ -216,7 +216,7 @@ sm_open(const char *sm_name, int mode, void **p_addr, size_t len, int force) * memory, such as its size and identifier. */ created = 1; - TRACE_DEBUG("Truncating \"%s\".\n", name); + TRACE_DEVEL("Truncating \"%s\".\n", name); if (ftruncate(fd, real_len) < 0) { rc = -errno; SYS_ERROR(errno, "Cannot truncate \"%s\".\n", name); @@ -268,7 +268,7 @@ sm_open(const char *sm_name, int mode, void **p_addr, size_t len, int force) sm_close(addr, 1); goto done; } - TRACE_DEBUG("open: ref = %d\n", ctx->ref); + TRACE_DEVEL("open: ref = %d\n", ctx->ref); done: if (fd >= 0) @@ -297,7 +297,7 @@ sm_close(void *addr, int destroy) } ref = --ctx->ref; - TRACE_DEBUG("close: ref = %d\n", ref); + TRACE_DEVEL("close: ref = %d\n", ref); if (ref == 0 && destroy) { strncpy(name, ctx->name, SM_NAME_LEN); name[SM_NAME_LEN] = '\0'; @@ -310,7 +310,7 @@ sm_close(void *addr, int destroy) } if (ref == 0 && destroy) { - TRACE_DEBUG("Deleting shared memory \"%s\".\n", name); + TRACE_DEVEL("Deleting shared memory \"%s\".\n", name); if ((rc = sm_destroy(name)) != 0) return rc; } diff --git a/usr/lib/pkcs11/common/sign_mgr.c b/usr/lib/pkcs11/common/sign_mgr.c index 68043632..fa6f5e8a 100755 --- a/usr/lib/pkcs11/common/sign_mgr.c +++ b/usr/lib/pkcs11/common/sign_mgr.c @@ -379,7 +379,7 @@ sign_mgr_init( SESSION * sess, rc = check_pss_params(mech, attr->ulValueLen); if (rc != CKR_OK) { - TRACE_DEBUG("check_pss_params failed.\n"); + TRACE_DEVEL("check_pss_params failed.\n"); return rc; } } else { @@ -538,7 +538,7 @@ sign_mgr_init( SESSION * sess, rc = check_pss_params(mech, attr->ulValueLen); if (rc != CKR_OK) { - TRACE_DEBUG("check_pss_params failed.\n"); + TRACE_DEVEL("check_pss_params failed.\n"); return rc; } @@ -1035,7 +1035,7 @@ sign_mgr_sign( SESSION * sess, return CKR_MECHANISM_INVALID; } - TRACE_DEBUG("%s\n", ock_err(ERR_FUNCTION_FAILED)); + TRACE_DEVEL("%s\n", ock_err(ERR_FUNCTION_FAILED)); return CKR_FUNCTION_FAILED; } @@ -1100,7 +1100,7 @@ sign_mgr_sign_update( SESSION * sess, return CKR_MECHANISM_INVALID; } - TRACE_DEBUG("%s\n", ock_err(ERR_FUNCTION_FAILED)); + TRACE_DEVEL("%s\n", ock_err(ERR_FUNCTION_FAILED)); return CKR_FUNCTION_FAILED; } @@ -1163,7 +1163,7 @@ sign_mgr_sign_final( SESSION * sess, return CKR_MECHANISM_INVALID; } - TRACE_DEBUG("%s\n", ock_err(ERR_FUNCTION_FAILED)); + TRACE_DEVEL("%s\n", ock_err(ERR_FUNCTION_FAILED)); return CKR_FUNCTION_FAILED; } @@ -1221,6 +1221,6 @@ sign_mgr_sign_recover( SESSION * sess, return CKR_MECHANISM_INVALID; } - TRACE_DEBUG("%s\n", ock_err(ERR_FUNCTION_FAILED)); + TRACE_DEVEL("%s\n", ock_err(ERR_FUNCTION_FAILED)); return CKR_FUNCTION_FAILED; } diff --git a/usr/lib/pkcs11/common/template.c b/usr/lib/pkcs11/common/template.c index 76525029..46488f6f 100755 --- a/usr/lib/pkcs11/common/template.c +++ b/usr/lib/pkcs11/common/template.c @@ -360,7 +360,7 @@ template_add_attributes( TEMPLATE * tmpl, rc = template_update_attribute( tmpl, attr ); if (rc != CKR_OK) { free( attr ); - TRACE_DEBUG("template_update_attribute failed.\n"); + TRACE_DEVEL("template_update_attribute failed.\n"); return rc; } } @@ -386,7 +386,7 @@ template_add_default_attributes( TEMPLATE * tmpl, // rc = template_set_default_common_attributes( tmpl ); if (rc != CKR_OK){ - TRACE_DEBUG("template_set_default_common_attributes failed.\n"); + TRACE_DEVEL("template_set_default_common_attributes failed.\n"); return rc; } // set the template class-specific default attributes @@ -1342,7 +1342,7 @@ template_merge( TEMPLATE *dest, TEMPLATE **src ) rc = template_update_attribute( dest, attr ); if (rc != CKR_OK){ - TRACE_DEBUG("template_update_attribute failed.\n"); + TRACE_DEVEL("template_update_attribute failed.\n"); return rc; } // we've assigned the node's data to a node in 'dest' @@ -1655,7 +1655,7 @@ template_validate_attributes( TEMPLATE * tmpl, rc = template_validate_attribute( tmpl, attr, class, subclass, mode ); if (rc != CKR_OK){ - TRACE_DEBUG("template_validate_attribute failed.\n"); + TRACE_DEVEL("template_validate_attribute failed.\n"); return rc; } node = node->next; diff --git a/usr/lib/pkcs11/common/trace.c b/usr/lib/pkcs11/common/trace.c index c2cbb10a..588749e1 100644 --- a/usr/lib/pkcs11/common/trace.c +++ b/usr/lib/pkcs11/common/trace.c @@ -436,9 +436,9 @@ CK_RV trace_initialize(void) case TRACE_LEVEL_ERROR: case TRACE_LEVEL_WARNING: case TRACE_LEVEL_INFO: - case TRACE_LEVEL_DEBUG: -#ifdef DEBUG case TRACE_LEVEL_DEVEL: +#ifdef DEBUG + case TRACE_LEVEL_DEBUG: #endif trace.level = num; break; diff --git a/usr/lib/pkcs11/common/trace.h b/usr/lib/pkcs11/common/trace.h index f402db85..10697d56 100644 --- a/usr/lib/pkcs11/common/trace.h +++ b/usr/lib/pkcs11/common/trace.h @@ -381,8 +381,8 @@ typedef enum { TRACE_LEVEL_ERROR, TRACE_LEVEL_WARNING, TRACE_LEVEL_INFO, - TRACE_LEVEL_DEBUG, - TRACE_LEVEL_DEVEL + TRACE_LEVEL_DEVEL, + TRACE_LEVEL_DEBUG } trace_level_t; @@ -403,14 +403,14 @@ const char *ock_err(int num); #define TRACE_ERROR(fmt, ...) ock_traceit(TRACE_LEVEL_ERROR, "[%s:%d %s] ERROR: " fmt, __FILE__, __LINE__, STDLL_NAME, ##__VA_ARGS__) #define TRACE_WARNING(fmt, ...) ock_traceit(TRACE_LEVEL_WARNING, "[%s:%d %s] WARN: " fmt, __FILE__, __LINE__, STDLL_NAME, ##__VA_ARGS__) #define TRACE_INFO(fmt, ...) ock_traceit(TRACE_LEVEL_INFO, "[%s:%d %s] INFO: " fmt, __FILE__, __LINE__, STDLL_NAME, ##__VA_ARGS__) -#define TRACE_DEBUG(fmt, ...) ock_traceit(TRACE_LEVEL_DEBUG, "[%s:%d %s] DEBUG: " fmt, __FILE__, __LINE__, STDLL_NAME, ##__VA_ARGS__) +#define TRACE_DEVEL(fmt, ...) ock_traceit(TRACE_LEVEL_DEVEL, "[%s:%d %s] DEVEL: " fmt, __FILE__, __LINE__, STDLL_NAME, ##__VA_ARGS__) #ifdef DEBUG -#define TRACE_DEVEL(fmt, ...) ock_traceit(TRACE_LEVEL_DEVEL, "[%s:%d %s] DEVEL: " fmt, __FILE__, __LINE__, STDLL_NAME, ##__VA_ARGS__) +#define TRACE_DEBUG(fmt, ...) ock_traceit(TRACE_LEVEL_DEBUG, "[%s:%d %s] DEBUG: " fmt, __FILE__, __LINE__, STDLL_NAME, ##__VA_ARGS__) void dump_shm(const char *); #define DUMP_SHM(x) dump_shm(x) #else -#define TRACE_DEVEL(fmt, ...) +#define TRACE_DEBUG(fmt, ...) #define DUMP_SHM(x) #endif diff --git a/usr/lib/pkcs11/common/utility.c b/usr/lib/pkcs11/common/utility.c index f6158d7a..615112e3 100755 --- a/usr/lib/pkcs11/common/utility.c +++ b/usr/lib/pkcs11/common/utility.c @@ -630,7 +630,7 @@ CK_RV XProcLock(void) if (spinxplfd != -1) flock(spinxplfd, LOCK_EX); else - TRACE_DEBUG("No file descriptor to lock with.\n"); + TRACE_DEVEL("No file descriptor to lock with.\n"); return CKR_OK; } @@ -640,7 +640,7 @@ CK_RV XProcUnLock(void) if (spinxplfd != -1) flock(spinxplfd, LOCK_UN); else - TRACE_DEBUG("No file descriptor to unlock with.\n"); + TRACE_DEVEL("No file descriptor to unlock with.\n"); return CKR_OK; } @@ -782,13 +782,13 @@ CK_RV init_token_data(CK_SLOT_ID slot_id) // rc = generate_master_key(master_key); if (rc != CKR_OK) { - TRACE_DEBUG("generate_master_key failed.\n"); + TRACE_DEVEL("generate_master_key failed.\n"); return CKR_FUNCTION_FAILED; } rc = save_masterkey_so(); if (rc != CKR_OK) { - TRACE_DEBUG("save_masterkey_so failed.\n"); + TRACE_DEVEL("save_masterkey_so failed.\n"); return rc; } } @@ -988,7 +988,7 @@ CK_RV attach_shm(CK_SLOT_ID slot_id, LW_SHM_TYPE **shm) */ ret = sm_open(get_pk_dir(buf), 0666, (void**) shm, sizeof(**shm), 0); if (ret < 0) { - TRACE_DEBUG("sm_open failed.\n"); + TRACE_DEVEL("sm_open failed.\n"); rc = CKR_FUNCTION_FAILED; goto done; } @@ -1005,7 +1005,7 @@ CK_RV detach_shm() XProcLock(); if (sm_close((void *)global_shm, 0)) { - TRACE_DEBUG("sm_close failed.\n"); + TRACE_DEVEL("sm_close failed.\n"); rc = CKR_FUNCTION_FAILED; } @@ -1112,7 +1112,7 @@ CK_RV get_keytype(CK_OBJECT_HANDLE hkey, CK_KEY_TYPE *keytype) rc = object_mgr_find_in_map1(hkey, &key_obj); if (rc != CKR_OK) { - TRACE_DEBUG("object_mgr_find_in_map1 failed.\n"); + TRACE_DEVEL("object_mgr_find_in_map1 failed.\n"); return rc; } rc = template_attribute_find(key_obj->template, CKA_KEY_TYPE, &attr); diff --git a/usr/lib/pkcs11/common/verify_mgr.c b/usr/lib/pkcs11/common/verify_mgr.c index 6ee59e62..e7208ba4 100755 --- a/usr/lib/pkcs11/common/verify_mgr.c +++ b/usr/lib/pkcs11/common/verify_mgr.c @@ -379,7 +379,7 @@ verify_mgr_init( SESSION * sess, rc = check_pss_params(mech, attr->ulValueLen); if (rc != CKR_OK) { - TRACE_DEBUG("check_pss_params failed.\n"); + TRACE_DEVEL("check_pss_params failed.\n"); return rc; } } else { @@ -534,7 +534,7 @@ verify_mgr_init( SESSION * sess, rc = check_pss_params(mech, attr->ulValueLen); if (rc != CKR_OK) { - TRACE_DEBUG("check_pss_params failed.\n"); + TRACE_DEVEL("check_pss_params failed.\n"); return rc; } diff --git a/usr/lib/pkcs11/ep11_stdll/ep11_specific.c b/usr/lib/pkcs11/ep11_stdll/ep11_specific.c index 98513ce4..a0fc2d35 100644 --- a/usr/lib/pkcs11/ep11_stdll/ep11_specific.c +++ b/usr/lib/pkcs11/ep11_stdll/ep11_specific.c @@ -353,11 +353,11 @@ inline void hexdump(void *buf, size_t buflen) } line[47] = line[48] = line[49] = line[50] = ' '; line[67] = '\0'; - TRACE_DEVEL("%s\n", line); + TRACE_DEBUG("%s\n", line); } } -#define TRACE_DEVEL_DUMP(_buf, _buflen) hexdump(_buf, _buflen) +#define TRACE_DEBUG_DUMP(_buf, _buflen) hexdump(_buf, _buflen) #endif /* DEBUG */ @@ -563,7 +563,7 @@ ber_encode_RSAPublicKey(CK_BBOOL length_only, CK_BYTE **data, CK_ULONG *data_len offset += len; if (rc != CKR_OK) { - TRACE_DEBUG("%s ber_encode_Int failed with rc=0x%lx\n", __func__, rc); + TRACE_DEVEL("%s ber_encode_Int failed with rc=0x%lx\n", __func__, rc); return CKR_FUNCTION_FAILED; } @@ -579,7 +579,7 @@ ber_encode_RSAPublicKey(CK_BBOOL length_only, CK_BYTE **data, CK_ULONG *data_len (CK_BYTE *)modulus + sizeof(CK_ATTRIBUTE), modulus->ulValueLen); if (rc != CKR_OK) { - TRACE_DEBUG("%s ber_encode_Int failed with rc=0x%lx\n", __func__, rc); + TRACE_DEVEL("%s ber_encode_Int failed with rc=0x%lx\n", __func__, rc); return rc; } memcpy(buf+offset, buf2, len); @@ -590,7 +590,7 @@ ber_encode_RSAPublicKey(CK_BBOOL length_only, CK_BYTE **data, CK_ULONG *data_len (CK_BYTE *)publ_exp + sizeof(CK_ATTRIBUTE), publ_exp->ulValueLen); if (rc != CKR_OK) { - TRACE_DEBUG("%s ber_encode_Int failed with rc=0x%lx\n", __func__, rc); + TRACE_DEVEL("%s ber_encode_Int failed with rc=0x%lx\n", __func__, rc); return rc; } memcpy(buf+offset, buf2, len); @@ -599,14 +599,14 @@ ber_encode_RSAPublicKey(CK_BBOOL length_only, CK_BYTE **data, CK_ULONG *data_len rc = ber_encode_SEQUENCE(FALSE, &buf2, &len, buf, offset); if (rc != CKR_OK) { - TRACE_DEBUG("%s ber_encode_Seq failed with rc=0x%lx\n", __func__, rc); + TRACE_DEVEL("%s ber_encode_Seq failed with rc=0x%lx\n", __func__, rc); return rc; } /* length of outer sequence */ rc = ber_encode_OCTET_STRING(TRUE, NULL, &total, buf2, len); if (rc != CKR_OK) { - TRACE_DEBUG("%s ber_encode_Oct_Str failed with rc=0x%lx\n", __func__, rc); + TRACE_DEVEL("%s ber_encode_Oct_Str failed with rc=0x%lx\n", __func__, rc); return rc; } else total_len += total + 1; @@ -632,7 +632,7 @@ ber_encode_RSAPublicKey(CK_BBOOL length_only, CK_BYTE **data, CK_ULONG *data_len rc = ber_encode_SEQUENCE(FALSE, data, data_len, buf3, total_len); if (rc != CKR_OK) - TRACE_DEBUG("%s ber_encode_Seq failed with rc=0x%lx\n", __func__, rc); + TRACE_DEVEL("%s ber_encode_Seq failed with rc=0x%lx\n", __func__, rc); return rc; } @@ -1424,7 +1424,7 @@ static CK_RV import_RSA_key(OBJECT *rsa_key_obj, CK_BYTE *blob, size_t *blob_siz rc = rsa_priv_wrap_get_data(rsa_key_obj->template, FALSE, &data, &data_len); if (rc != CKR_OK) { - TRACE_DEBUG("%s RSA wrap get data failed\n", __func__); + TRACE_DEVEL("%s RSA wrap get data failed\n", __func__); goto import_RSA_key_end; } @@ -2031,10 +2031,10 @@ static CK_RV dh_generate_keypair(CK_MECHANISM_PTR pMechanism, dh_pgs.pg_bytes = p_len * 2; #ifdef DEBUG - TRACE_DEVEL("%s P:\n", __func__); - TRACE_DEVEL_DUMP(&dh_pgs.pg[0], p_len); - TRACE_DEVEL("%s G:\n", __func__); - TRACE_DEVEL_DUMP(&dh_pgs.pg[p_len], p_len); + TRACE_DEBUG("%s P:\n", __func__); + TRACE_DEBUG_DUMP(&dh_pgs.pg[0], p_len); + TRACE_DEBUG("%s G:\n", __func__); + TRACE_DEBUG_DUMP(&dh_pgs.pg[p_len], p_len); #endif /* add special attribute, do not add it to ock's pPublicKeyTemplate */ @@ -2094,8 +2094,8 @@ static CK_RV dh_generate_keypair(CK_MECHANISM_PTR pMechanism, } #ifdef DEBUG - TRACE_DEVEL("%s DH SPKI\n", __func__ ); - TRACE_DEVEL_DUMP(publ_op.blob, publ_op.blob_size); + TRACE_DEBUG("%s DH SPKI\n", __func__ ); + TRACE_DEBUG_DUMP(publ_op.blob, publ_op.blob_size); #endif /* CKA_VALUE of the public key must hold 'y' */ @@ -2284,12 +2284,12 @@ static CK_RV dsa_generate_keypair(CK_MECHANISM_PTR pMechanism, dsa_pqgs.pqg_bytes = p_len * 3; #ifdef DEBUG - TRACE_DEVEL("%s P:\n", __func__); - TRACE_DEVEL_DUMP(&dsa_pqgs.pqg[0], p_len); - TRACE_DEVEL("%s Q:\n", __func__); - TRACE_DEVEL_DUMP(&dsa_pqgs.pqg[p_len], p_len); - TRACE_DEVEL("%s G:\n", __func__); - TRACE_DEVEL_DUMP(&dsa_pqgs.pqg[2*p_len], p_len); + TRACE_DEBUG("%s P:\n", __func__); + TRACE_DEBUG_DUMP(&dsa_pqgs.pqg[0], p_len); + TRACE_DEBUG("%s Q:\n", __func__); + TRACE_DEBUG_DUMP(&dsa_pqgs.pqg[p_len], p_len); + TRACE_DEBUG("%s G:\n", __func__); + TRACE_DEBUG_DUMP(&dsa_pqgs.pqg[2*p_len], p_len); #endif CK_ATTRIBUTE pqgs[] = { CKA_IBM_STRUCT_PARAMS, (CK_VOID_PTR)dsa_pqgs.pqg, @@ -2383,8 +2383,8 @@ static CK_RV dsa_generate_keypair(CK_MECHANISM_PTR pMechanism, } #ifdef DEBUG - TRACE_DEVEL("%s dsa_generate_keypair public key:\n", __func__); - TRACE_DEVEL_DUMP(data, data_len); + TRACE_DEBUG("%s dsa_generate_keypair public key:\n", __func__); + TRACE_DEBUG_DUMP(data, data_len); #endif rc = build_attribute(CKA_VALUE, data, data_len, &value_attr); @@ -2546,8 +2546,8 @@ static CK_RV rsa_ec_generate_keypair(CK_MECHANISM_PTR pMechanism, /* scan the SPKI for CKA_EC_POINT */ #ifdef DEBUG - TRACE_DEVEL("%s ec_generate_keypair spki:\n", __func__); - TRACE_DEVEL_DUMP(spki, spki_len); + TRACE_DEBUG("%s ec_generate_keypair spki:\n", __func__); + TRACE_DEBUG_DUMP(spki, spki_len); #endif rc = ep11_spki_key(spki, &key, &bit_str_len); if (rc != CKR_OK) { @@ -2572,8 +2572,8 @@ static CK_RV rsa_ec_generate_keypair(CK_MECHANISM_PTR pMechanism, data = key; #ifdef DEBUG - TRACE_DEVEL("%s ec_generate_keypair ecpoint:\n", __func__); - TRACE_DEVEL_DUMP(data, data_len); + TRACE_DEBUG("%s ec_generate_keypair ecpoint:\n", __func__); + TRACE_DEBUG_DUMP(data, data_len); #endif /* build and add CKA_EC_POINT */ @@ -2657,8 +2657,8 @@ static CK_RV rsa_ec_generate_keypair(CK_MECHANISM_PTR pMechanism, } #ifdef DEBUG - TRACE_DEVEL("%s rsa_generate_keypair modulus:\n", __func__); - TRACE_DEVEL_DUMP(data, data_len); + TRACE_DEBUG("%s rsa_generate_keypair modulus:\n", __func__); + TRACE_DEBUG_DUMP(data, data_len); #endif /* build and add CKA_MODULUS */ @@ -2685,8 +2685,8 @@ static CK_RV rsa_ec_generate_keypair(CK_MECHANISM_PTR pMechanism, } #ifdef DEBUG - TRACE_DEVEL("%s rsa_generate_keypair public exponent:\n", __func__); - TRACE_DEVEL_DUMP(data, data_len); + TRACE_DEBUG("%s rsa_generate_keypair public exponent:\n", __func__); + TRACE_DEBUG_DUMP(data, data_len); #endif /* build and add CKA_PUBLIC_EXPONENT */ @@ -2753,7 +2753,7 @@ CK_RV ep11tok_generate_key_pair(SESSION * sess, CK_MECHANISM_PTR pMechanism, CKO_PUBLIC_KEY, publ_ktype, &public_key_obj); if (rc != CKR_OK) { - TRACE_DEBUG("%s Object mgr create skeleton failed\n", __func__); + TRACE_DEVEL("%s Object mgr create skeleton failed\n", __func__); goto error; } @@ -2762,7 +2762,7 @@ CK_RV ep11tok_generate_key_pair(SESSION * sess, CK_MECHANISM_PTR pMechanism, CKO_PRIVATE_KEY, priv_ktype, &private_key_obj); if (rc != CKR_OK) { - TRACE_DEBUG("%s Object mgr create skeleton failed\n", __func__); + TRACE_DEVEL("%s Object mgr create skeleton failed\n", __func__); goto error; } @@ -2860,13 +2860,13 @@ CK_RV ep11tok_generate_key_pair(SESSION * sess, CK_MECHANISM_PTR pMechanism, */ rc = object_mgr_create_final(sess, public_key_obj, phPublicKey); if (rc != CKR_OK) { - TRACE_DEBUG("%s Object mgr create final failed\n", __func__); + TRACE_DEVEL("%s Object mgr create final failed\n", __func__); goto error; } rc = object_mgr_create_final(sess, private_key_obj, phPrivateKey); if (rc != CKR_OK) { - TRACE_DEBUG("%s Object mgr create final failed\n", __func__); + TRACE_DEVEL("%s Object mgr create final failed\n", __func__); object_mgr_destroy_object(sess, *phPublicKey); public_key_obj = NULL; goto error; @@ -3481,10 +3481,10 @@ CK_RV ep11tok_unwrap_key(SESSION *session, CK_MECHANISM_PTR mech, return rc; } - TRACE_DEBUG("%s start unwrapKey: mech=0x%lx attrs_len=0x%lx wr_key=0x%lx\n", + TRACE_DEVEL("%s start unwrapKey: mech=0x%lx attrs_len=0x%lx wr_key=0x%lx\n", __func__, mech->mechanism, attrs_len, wrapping_key); for (i = 0; i < attrs_len; i++) { - TRACE_DEBUG(" attribute attrs.type=0x%lx\n", attrs[i].type); + TRACE_DEVEL(" attribute attrs.type=0x%lx\n", attrs[i].type); } memset(&op, 0, sizeof(op)); @@ -3904,7 +3904,7 @@ static int read_adapter_config_file(const char* conf_name) ap_fp = fopen(fname,"r"); if (!ap_fp) - TRACE_DEBUG("%s fopen('%s') failed with errno %d\n", + TRACE_DEVEL("%s fopen('%s') failed with errno %d\n", __func__, fname, errno); } if (!ap_fp) { @@ -3912,7 +3912,7 @@ static int read_adapter_config_file(const char* conf_name) fname[sizeof(fname)-1] = '\0'; ap_fp = fopen(fname,"r"); if (!ap_fp) - TRACE_DEBUG("%s fopen('%s') failed with errno %d\n", + TRACE_DEVEL("%s fopen('%s') failed with errno %d\n", __func__, fname, errno); } } else { @@ -3921,13 +3921,13 @@ static int read_adapter_config_file(const char* conf_name) fname[sizeof(fname)-1] = '\0'; ap_fp = fopen(fname,"r"); if (!ap_fp) { - TRACE_DEBUG("%s fopen('%s') failed with errno %d\n", + TRACE_DEVEL("%s fopen('%s') failed with errno %d\n", __func__, fname, errno); snprintf(fname, sizeof(fname), "%s/%s", OCK_CONFDIR, conf_name); fname[sizeof(fname)-1] = '\0'; ap_fp = fopen(fname,"r"); if (!ap_fp) - TRACE_DEBUG("%s fopen('%s') failed with errno %d\n", + TRACE_DEVEL("%s fopen('%s') failed with errno %d\n", __func__, fname, errno); } } else { @@ -3935,7 +3935,7 @@ static int read_adapter_config_file(const char* conf_name) fname[sizeof(fname)-1] = '\0'; ap_fp = fopen(fname,"r"); if (!ap_fp) - TRACE_DEBUG("%s fopen('%s') failed with errno %d\n", + TRACE_DEVEL("%s fopen('%s') failed with errno %d\n", __func__, fname, errno); } } diff --git a/usr/lib/pkcs11/ep11_stdll/new_host.c b/usr/lib/pkcs11/ep11_stdll/new_host.c index e122f9b2..7227f0ef 100644 --- a/usr/lib/pkcs11/ep11_stdll/new_host.c +++ b/usr/lib/pkcs11/ep11_stdll/new_host.c @@ -450,7 +450,7 @@ CK_RV ST_Initialize(void **FunctionList, CK_SLOT_ID SlotNumber, char *conf_name, rc = ep11tok_init(SlotNumber, conf_name); if (rc != 0) { *FunctionList = NULL; - TRACE_DEBUG("Token Specific Init failed.\n"); + TRACE_DEVEL("Token Specific Init failed.\n"); goto done; } } @@ -458,7 +458,7 @@ CK_RV ST_Initialize(void **FunctionList, CK_SLOT_ID SlotNumber, char *conf_name, rc = load_token_data(SlotNumber); if (rc != CKR_OK) { *FunctionList = NULL; - TRACE_DEBUG("Failed to load token data.\n"); + TRACE_DEVEL("Failed to load token data.\n"); goto done; } @@ -696,7 +696,7 @@ CK_RV SC_InitToken(CK_SLOT_ID sid, CK_CHAR_PTR pPin, CK_ULONG ulPinLen, rc = save_token_data(sid); if (rc != CKR_OK) { - TRACE_DEBUG("Failed to save token data.\n"); + TRACE_DEVEL("Failed to save token data.\n"); goto done; } done: @@ -766,12 +766,12 @@ CK_RV SC_InitPIN(ST_SESSION_HANDLE *sSession, CK_CHAR_PTR pPin, memcpy(user_pin_md5, hash_md5, MD5_HASH_SIZE); rc = save_token_data(sess->session_info.slotID); if (rc != CKR_OK) { - TRACE_DEBUG("Failed to save token data.\n"); + TRACE_DEVEL("Failed to save token data.\n"); goto done; } rc = save_masterkey_user(); if (rc != CKR_OK) - TRACE_DEBUG("Failed to save user's masterkey.\n"); + TRACE_DEVEL("Failed to save user's masterkey.\n"); done: TRACE_INFO("C_InitPin: rc = 0x%08x, session = %d\n", @@ -850,7 +850,7 @@ CK_RV SC_SetPIN(ST_SESSION_HANDLE *sSession, CK_CHAR_PTR pOldPin, } rc = XProcLock(); if (rc != CKR_OK) { - TRACE_DEBUG("Failed to get process lock.\n"); + TRACE_DEVEL("Failed to get process lock.\n"); goto done; } memcpy(nv_token_data->user_pin_sha, new_hash_sha, @@ -861,7 +861,7 @@ CK_RV SC_SetPIN(ST_SESSION_HANDLE *sSession, CK_CHAR_PTR pOldPin, XProcUnLock(); rc = save_token_data(sess->session_info.slotID); if (rc != CKR_OK) { - TRACE_DEBUG("Failed to save token data.\n"); + TRACE_DEVEL("Failed to save token data.\n"); goto done; } rc = save_masterkey_user(); @@ -890,7 +890,7 @@ CK_RV SC_SetPIN(ST_SESSION_HANDLE *sSession, CK_CHAR_PTR pOldPin, } rc = XProcLock(); if (rc != CKR_OK) { - TRACE_DEBUG("Failed to get process lock.\n"); + TRACE_DEVEL("Failed to get process lock.\n"); goto done; } memcpy(nv_token_data->so_pin_sha, new_hash_sha, SHA1_HASH_SIZE); @@ -899,12 +899,12 @@ CK_RV SC_SetPIN(ST_SESSION_HANDLE *sSession, CK_CHAR_PTR pOldPin, XProcUnLock(); rc = save_token_data(sess->session_info.slotID); if (rc != CKR_OK) { - TRACE_DEBUG("Failed to save token data.\n"); + TRACE_DEVEL("Failed to save token data.\n"); goto done; } rc = save_masterkey_so(); if (rc != CKR_OK) - TRACE_DEBUG("Failed to save SO's masterkey.\n"); + TRACE_DEVEL("Failed to save SO's masterkey.\n"); } else { TRACE_ERROR("%s\n", ock_err(ERR_SESSION_READ_ONLY)); rc = CKR_SESSION_READ_ONLY; @@ -955,7 +955,7 @@ CK_RV SC_OpenSession(CK_SLOT_ID sid, CK_FLAGS flags, locked = FALSE; rc = session_mgr_new(flags, sid, phSession); if (rc != CKR_OK) { - TRACE_DEBUG("session_mgr_new() failed\n"); + TRACE_DEVEL("session_mgr_new() failed\n"); goto done; } @@ -995,7 +995,7 @@ CK_RV SC_CloseAllSessions(CK_SLOT_ID sid) } rc = session_mgr_close_all_sessions(); if (rc != CKR_OK) - TRACE_DEBUG("session_mgr_close_all_sessions() failed.\n"); + TRACE_DEVEL("session_mgr_close_all_sessions() failed.\n"); done: TRACE_INFO("C_CloseAllSessions: rc = 0x%08x slot = %d\n", rc, sid); return rc; @@ -1065,7 +1065,7 @@ CK_RV SC_GetOperationState(ST_SESSION_HANDLE *sSession, rc = session_mgr_get_op_state(sess, length_only, pOperationState, pulOperationStateLen); if (rc != CKR_OK) - TRACE_DEBUG("session_mgr_get_op_state() failed.\n"); + TRACE_DEVEL("session_mgr_get_op_state() failed.\n"); done: TRACE_INFO("C_GetOperationState: rc = 0x%08x, session = %d\n", rc, sSession->sessionh); @@ -1105,7 +1105,7 @@ CK_RV SC_SetOperationState(ST_SESSION_HANDLE *sSession, pOperationState, ulOperationStateLen); if (rc != CKR_OK) - TRACE_DEBUG("session_mgr_set_op_state() failed.\n"); + TRACE_DEVEL("session_mgr_set_op_state() failed.\n"); done: TRACE_INFO("C_SetOperationState: rc = 0x%08x, session = %d\n", rc, sSession->sessionh); @@ -1222,7 +1222,7 @@ CK_RV SC_Login(ST_SESSION_HANDLE *sSession, CK_USER_TYPE userType, rc = load_masterkey_user(); if (rc != CKR_OK){ - TRACE_DEBUG("Failed to load user's masterkey.\n"); + TRACE_DEVEL("Failed to load user's masterkey.\n"); goto done; } @@ -1257,13 +1257,13 @@ CK_RV SC_Login(ST_SESSION_HANDLE *sSession, CK_USER_TYPE userType, rc = load_masterkey_so(); if (rc != CKR_OK) - TRACE_DEBUG("Failed to load SO's masterkey.\n"); + TRACE_DEVEL("Failed to load SO's masterkey.\n"); } done: if (rc == CKR_OK) { rc = session_mgr_login_all(userType); if (rc != CKR_OK) - TRACE_DEBUG("session_mgr_login_all failed.\n"); + TRACE_DEVEL("session_mgr_login_all failed.\n"); } TRACE_INFO("C_Login: rc = 0x%08x\n", rc); @@ -1300,7 +1300,7 @@ CK_RV SC_Logout(ST_SESSION_HANDLE *sSession) rc = session_mgr_logout_all(); if (rc != CKR_OK) - TRACE_DEBUG("session_mgr_logout_all failed.\n"); + TRACE_DEVEL("session_mgr_logout_all failed.\n"); memset(user_pin_md5, 0x0, MD5_HASH_SIZE); memset(so_pin_md5, 0x0, MD5_HASH_SIZE); @@ -1341,7 +1341,7 @@ CK_RV SC_CreateObject(ST_SESSION_HANDLE *sSession, CK_ATTRIBUTE_PTR pTemplate, rc = object_mgr_add(sess, pTemplate, ulCount, phObject); if (rc != CKR_OK) - TRACE_DEBUG("object_mgr_add() failed.\n"); + TRACE_DEVEL("object_mgr_add() failed.\n"); done: TRACE_INFO("C_CreateObject: rc = 0x%08x\n", rc); @@ -1390,7 +1390,7 @@ CK_RV SC_CopyObject(ST_SESSION_HANDLE *sSession, CK_OBJECT_HANDLE hObject, rc = object_mgr_copy(sess, pTemplate, ulCount, hObject, phNewObject); if (rc != CKR_OK) - TRACE_DEBUG("object_mgr_copy() failed\n"); + TRACE_DEVEL("object_mgr_copy() failed\n"); done: TRACE_INFO("C_CopyObject:rc = 0x%08x,old handle = %d,new handle = %d\n", @@ -1425,7 +1425,7 @@ CK_RV SC_DestroyObject(ST_SESSION_HANDLE *sSession, CK_OBJECT_HANDLE hObject) rc = object_mgr_destroy_object(sess, hObject); if (rc != CKR_OK) - TRACE_DEBUG("*_destroy_object() failed\n"); + TRACE_DEVEL("*_destroy_object() failed\n"); done: TRACE_INFO("C_DestroyObject: rc = 0x%08x, handle = %d\n", rc, hObject); return rc; @@ -1487,7 +1487,7 @@ CK_RV SC_GetAttributeValue(ST_SESSION_HANDLE *sSession, rc = object_mgr_get_attribute_values(sess, hObject, pTemplate, ulCount); if (rc != CKR_OK) - TRACE_DEBUG("obj_mgr_get_attribute_value() failed.\n"); + TRACE_DEVEL("obj_mgr_get_attribute_value() failed.\n"); done: TRACE_INFO("C_GetAttributeValue: rc = 0x%08x, handle = %d\n", @@ -1534,7 +1534,7 @@ CK_RV SC_SetAttributeValue(ST_SESSION_HANDLE *sSession, rc = object_mgr_set_attribute_values(sess, hObject, pTemplate, ulCount); if (rc != CKR_OK) - TRACE_DEBUG("obj_mgr_set_attribute_values() failed.\n"); + TRACE_DEVEL("obj_mgr_set_attribute_values() failed.\n"); done: TRACE_INFO("C_SetAttributeValue: rc = 0x%08x, handle = %d\n", @@ -1646,7 +1646,7 @@ CK_RV SC_FindObjects(ST_SESSION_HANDLE *sSession, CK_OBJECT_HANDLE_PTR phObject, } if (!sess->find_list) { - TRACE_DEBUG("sess->find_list is NULL.\n"); + TRACE_DEVEL("sess->find_list is NULL.\n"); rc = CKR_FUNCTION_FAILED; goto done; } @@ -1797,7 +1797,7 @@ CK_RV SC_Encrypt(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pData, rc = ep11tok_encrypt(sess, pData, ulDataLen, pEncryptedData, pulEncryptedDataLen); if (rc != CKR_OK) - TRACE_DEBUG("ep11tok_encrypt() failed.\n"); + TRACE_DEVEL("ep11tok_encrypt() failed.\n"); done: if (rc != CKR_BUFFER_TOO_SMALL && (rc != CKR_OK || length_only != TRUE)) @@ -1849,7 +1849,7 @@ CK_RV SC_EncryptUpdate(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pPart, rc = ep11tok_encrypt_update(sess, pPart, ulPartLen, pEncryptedPart, pulEncryptedPartLen); if (rc != CKR_OK) - TRACE_DEBUG("ep11tok_encrypt_update() failed.\n"); + TRACE_DEVEL("ep11tok_encrypt_update() failed.\n"); done: if (rc != CKR_OK && rc != CKR_BUFFER_TOO_SMALL) @@ -1957,7 +1957,7 @@ CK_RV SC_DecryptInit(ST_SESSION_HANDLE *sSession, CK_MECHANISM_PTR pMechanism, rc = ep11tok_decrypt_init(sess, pMechanism, hKey); if (rc != CKR_OK) - TRACE_DEBUG("ep11tok_decrypt_init() failed.\n"); + TRACE_DEVEL("ep11tok_decrypt_init() failed.\n"); done: TRACE_INFO("C_DecryptInit: rc = 0x%08x, sess = %d, mech = 0x%x\n", @@ -2007,7 +2007,7 @@ CK_RV SC_Decrypt(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pEncryptedData, rc = ep11tok_decrypt(sess, pEncryptedData, ulEncryptedDataLen, pData, pulDataLen); if (rc != CKR_OK) - TRACE_DEBUG("ep11tok_decrypt() failed.\n"); + TRACE_DEVEL("ep11tok_decrypt() failed.\n"); done: if (rc != CKR_BUFFER_TOO_SMALL && (rc != CKR_OK || length_only != TRUE)) @@ -2060,7 +2060,7 @@ CK_RV SC_DecryptUpdate(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pEncryptedPart, rc = ep11tok_decrypt_update(sess, pEncryptedPart, ulEncryptedPartLen, pPart, pulPartLen); if (rc != CKR_OK) - TRACE_DEBUG("ep11tok_decrypt_update() failed.\n"); + TRACE_DEVEL("ep11tok_decrypt_update() failed.\n"); done: if (rc != CKR_OK && rc != CKR_BUFFER_TOO_SMALL) @@ -2111,7 +2111,7 @@ CK_RV SC_DecryptFinal(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pLastPart, rc = ep11tok_decrypt_final(sess, pLastPart, pulLastPartLen); if (rc != CKR_OK) - TRACE_DEBUG("ep11tok_decrypt_final() failed.\n"); + TRACE_DEVEL("ep11tok_decrypt_final() failed.\n"); done: if (rc != CKR_BUFFER_TOO_SMALL && (rc != CKR_OK || length_only != TRUE)) decr_mgr_cleanup( &sess->decr_ctx ); @@ -2165,7 +2165,7 @@ CK_RV SC_DigestInit(ST_SESSION_HANDLE *sSession, CK_MECHANISM_PTR pMechanism) rc = digest_mgr_init(sess, &sess->digest_ctx, pMechanism); if (rc != CKR_OK) - TRACE_DEBUG("digest_mgr_init() failed.\n"); + TRACE_DEVEL("digest_mgr_init() failed.\n"); done: TRACE_INFO("C_DigestInit: rc = 0x%08x, sess = %d, mech = %x\n", @@ -2218,7 +2218,7 @@ CK_RV SC_Digest(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pData, rc = digest_mgr_digest(sess, length_only, &sess->digest_ctx, pData, ulDataLen, pDigest, pulDigestLen); if (rc != CKR_OK) - TRACE_DEBUG("digest_mgr_digest() failed.\n"); + TRACE_DEVEL("digest_mgr_digest() failed.\n"); done: TRACE_INFO("C_Digest: rc = 0x%08x, sess = %d, datalen = %d\n", @@ -2264,7 +2264,7 @@ CK_RV SC_DigestUpdate(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pPart, rc = digest_mgr_digest_update(sess, &sess->digest_ctx, pPart, ulPartLen); if (rc != CKR_OK) - TRACE_DEBUG("digest_mgr_digest_update() failed.\n"); + TRACE_DEVEL("digest_mgr_digest_update() failed.\n"); } done: TRACE_INFO("C_DigestUpdate: rc = %08x, sess = %d, datalen = %d\n", @@ -2300,7 +2300,7 @@ CK_RV SC_DigestKey(ST_SESSION_HANDLE *sSession, CK_OBJECT_HANDLE hKey) rc = digest_mgr_digest_key(sess, &sess->digest_ctx, hKey); if (rc != CKR_OK) - TRACE_DEBUG("digest_mgr_digest_key() failed.\n"); + TRACE_DEVEL("digest_mgr_digest_key() failed.\n"); done: TRACE_INFO("C_DigestKey: rc = %08x, sess = %d, key = %d\n", @@ -2401,7 +2401,7 @@ CK_RV SC_SignInit(ST_SESSION_HANDLE *sSession, CK_MECHANISM_PTR pMechanism, rc = ep11tok_sign_init(sess, pMechanism, FALSE, hKey); if (rc != CKR_OK) - TRACE_DEBUG("*_sign_init() failed.\n"); + TRACE_DEVEL("*_sign_init() failed.\n"); done: TRACE_INFO("C_SignInit: rc = %08x, sess = %d, mech = %x\n", @@ -2451,7 +2451,7 @@ CK_RV SC_Sign(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pData, rc = ep11tok_sign(sess, length_only, pData, ulDataLen, pSignature, pulSignatureLen); if (rc != CKR_OK) - TRACE_DEBUG("ep11tok_sign() failed.\n"); + TRACE_DEVEL("ep11tok_sign() failed.\n"); done: if (rc != CKR_BUFFER_TOO_SMALL && (rc != CKR_OK || length_only != TRUE)) @@ -2497,7 +2497,7 @@ CK_RV SC_SignUpdate(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pPart, rc = ep11tok_sign_update(sess, pPart, ulPartLen); if (rc != CKR_OK) - TRACE_DEBUG("ep11tok_sign_update() failed.\n"); + TRACE_DEVEL("ep11tok_sign_update() failed.\n"); done: if (rc != CKR_OK) @@ -2634,7 +2634,7 @@ CK_RV SC_VerifyInit(ST_SESSION_HANDLE *sSession, CK_MECHANISM_PTR pMechanism, rc = ep11tok_verify_init(sess, pMechanism, FALSE, hKey); if (rc != CKR_OK) - TRACE_DEBUG("ep11tok_verify_init() failed.\n"); + TRACE_DEVEL("ep11tok_verify_init() failed.\n"); done: TRACE_INFO("C_VerifyInit: rc = %08x, sess = %d, mech = %x\n", @@ -2679,7 +2679,7 @@ CK_RV SC_Verify(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pData, rc = ep11tok_verify(sess, pData, ulDataLen, pSignature, ulSignatureLen); if (rc != CKR_OK) - TRACE_DEBUG("ep11tok_verify() failed.\n"); + TRACE_DEVEL("ep11tok_verify() failed.\n"); done: verify_mgr_cleanup(&sess->verify_ctx); @@ -2724,7 +2724,7 @@ CK_RV SC_VerifyUpdate(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pPart, rc = ep11tok_verify_update(sess, pPart, ulPartLen); if (rc != CKR_OK) - TRACE_DEBUG("ep11tok_verify_update() failed.\n"); + TRACE_DEVEL("ep11tok_verify_update() failed.\n"); done: if (rc != CKR_OK) @@ -2770,7 +2770,7 @@ CK_RV SC_VerifyFinal(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pSignature, rc = ep11tok_verify_final(sess, pSignature, ulSignatureLen); if (rc != CKR_OK) - TRACE_DEBUG("ep11tok_verify_final() failed.\n"); + TRACE_DEVEL("ep11tok_verify_final() failed.\n"); done: verify_mgr_cleanup(&sess->verify_ctx); @@ -2910,7 +2910,7 @@ CK_RV SC_GenerateKey(ST_SESSION_HANDLE *sSession, CK_MECHANISM_PTR pMechanism, rc = ep11tok_generate_key(sess, pMechanism, pTemplate, ulCount, phKey); if (rc != CKR_OK) - TRACE_DEBUG("ep11tok_generate_key() failed.\n"); + TRACE_DEVEL("ep11tok_generate_key() failed.\n"); done: TRACE_INFO("C_GenerateKey: rc = %08x, sess = %d, mech = %x\n", rc, @@ -2986,7 +2986,7 @@ CK_RV SC_GenerateKeyPair(ST_SESSION_HANDLE *sSession, ulPrivateKeyAttributeCount, phPublicKey, phPrivateKey); if (rc != CKR_OK) - TRACE_DEBUG("ep11tok_generate_key_pair() failed.\n"); + TRACE_DEVEL("ep11tok_generate_key_pair() failed.\n"); done: TRACE_INFO("C_GenerateKeyPair: rc = %08x, sess = %d, mech = %x\n", @@ -3069,7 +3069,7 @@ CK_RV SC_WrapKey(ST_SESSION_HANDLE *sSession, CK_MECHANISM_PTR pMechanism, rc = ep11tok_wrap_key(sess, pMechanism, hWrappingKey, hKey, pWrappedKey, pulWrappedKeyLen); if (rc != CKR_OK) - TRACE_DEBUG("ep11tok_wrap_key() failed.\n"); + TRACE_DEVEL("ep11tok_wrap_key() failed.\n"); done: TRACE_INFO("C_WrapKey: rc = %08x, sess = %d, encrypting key = %d, " @@ -3127,7 +3127,7 @@ CK_RV SC_UnwrapKey(ST_SESSION_HANDLE *sSession, CK_MECHANISM_PTR pMechanism, pWrappedKey, ulWrappedKeyLen, hUnwrappingKey, phKey); if (rc != CKR_OK) - TRACE_DEBUG("ep11tok_unwrap_key() failed.\n"); + TRACE_DEVEL("ep11tok_unwrap_key() failed.\n"); done: TRACE_INFO("C_UnwrapKey: rc = %08x, sess = %d, decrypting key = %d," @@ -3194,7 +3194,7 @@ CK_RV SC_DeriveKey(ST_SESSION_HANDLE *sSession, CK_MECHANISM_PTR pMechanism, rc = ep11tok_derive_key(sess, pMechanism, hBaseKey, phKey, pTemplate, ulCount); if (rc != CKR_OK) - TRACE_DEBUG("epl11tok_derive_key() failed.\n"); + TRACE_DEVEL("epl11tok_derive_key() failed.\n"); done: TRACE_INFO("C_DeriveKey: rc = %08x, sess = %d, mech = %x\n", @@ -3288,7 +3288,7 @@ CK_RV SC_GenerateRandom(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pRandomData, rc = rng_generate(pRandomData, ulRandomLen); if (rc != CKR_OK) - TRACE_DEBUG("rng_generate() failed.\n"); + TRACE_DEVEL("rng_generate() failed.\n"); done: TRACE_INFO("C_GenerateRandom: rc = %08x, %d bytes\n", rc, ulRandomLen); diff --git a/usr/lib/pkcs11/ica_s390_stdll/ica_specific.c b/usr/lib/pkcs11/ica_s390_stdll/ica_specific.c index 894449e1..fd3be973 100755 --- a/usr/lib/pkcs11/ica_s390_stdll/ica_specific.c +++ b/usr/lib/pkcs11/ica_s390_stdll/ica_specific.c @@ -1479,7 +1479,7 @@ os_specific_rsa_keygen(TEMPLATE *publ_tmpl, TEMPLATE *priv_tmpl) rc = build_attribute( CKA_MODULUS, ptr, tmpsize, &attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto privkey_cleanup; } template_update_attribute( publ_tmpl, attr ); @@ -1491,7 +1491,7 @@ os_specific_rsa_keygen(TEMPLATE *publ_tmpl, TEMPLATE *priv_tmpl) rc = build_attribute( CKA_PUBLIC_EXPONENT, ptr, tmpsize, &attr); if (rc != CKR_OK){ - TRACE_DEBUG("build attribute failed\n"); + TRACE_DEVEL("build attribute failed\n"); goto privkey_cleanup; } template_update_attribute( publ_tmpl, attr ); @@ -1502,7 +1502,7 @@ os_specific_rsa_keygen(TEMPLATE *publ_tmpl, TEMPLATE *priv_tmpl) flag = TRUE; rc = build_attribute( CKA_LOCAL, &flag, sizeof(CK_BBOOL), &attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto privkey_cleanup; } template_update_attribute( publ_tmpl, attr ); @@ -1517,7 +1517,7 @@ os_specific_rsa_keygen(TEMPLATE *publ_tmpl, TEMPLATE *priv_tmpl) ptr = p11_bigint_trim(publKey->exponent, &tmpsize); rc = build_attribute( CKA_PUBLIC_EXPONENT, ptr, tmpsize, &attr ); if (rc != CKR_OK) { - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto privkey_cleanup; } template_update_attribute( priv_tmpl, attr ); @@ -1535,7 +1535,7 @@ os_specific_rsa_keygen(TEMPLATE *publ_tmpl, TEMPLATE *priv_tmpl) rc = build_attribute( CKA_MODULUS, ptr, tmpsize, &attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto privkey_cleanup; } template_update_attribute( priv_tmpl, attr ); @@ -1547,7 +1547,7 @@ os_specific_rsa_keygen(TEMPLATE *publ_tmpl, TEMPLATE *priv_tmpl) rc = build_attribute( CKA_EXPONENT_1, ptr, tmpsize, &attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto privkey_cleanup; } template_update_attribute( priv_tmpl, attr ); @@ -1559,7 +1559,7 @@ os_specific_rsa_keygen(TEMPLATE *publ_tmpl, TEMPLATE *priv_tmpl) rc = build_attribute( CKA_EXPONENT_2, ptr, tmpsize, &attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto privkey_cleanup; } template_update_attribute( priv_tmpl, attr ); @@ -1571,7 +1571,7 @@ os_specific_rsa_keygen(TEMPLATE *publ_tmpl, TEMPLATE *priv_tmpl) rc = build_attribute( CKA_PRIME_1, ptr, tmpsize, &attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto privkey_cleanup; } template_update_attribute( priv_tmpl, attr ); @@ -1584,7 +1584,7 @@ os_specific_rsa_keygen(TEMPLATE *publ_tmpl, TEMPLATE *priv_tmpl) rc = build_attribute( CKA_PRIME_2, privKey->q, privKey->key_length/2, &attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto privkey_cleanup; } template_update_attribute( priv_tmpl, attr ); @@ -1597,7 +1597,7 @@ os_specific_rsa_keygen(TEMPLATE *publ_tmpl, TEMPLATE *priv_tmpl) rc = build_attribute( CKA_COEFFICIENT, ptr, tmpsize, &attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto privkey_cleanup; } template_update_attribute( priv_tmpl, attr ); @@ -1625,7 +1625,7 @@ token_specific_rsa_generate_keypair( TEMPLATE * publ_tmpl, rc = os_specific_rsa_keygen(publ_tmpl,priv_tmpl); if (rc != CKR_OK) - TRACE_DEBUG("os_specific_rsa_keygen failed\n"); + TRACE_DEVEL("os_specific_rsa_keygen failed\n"); return rc; } @@ -1833,7 +1833,7 @@ token_specific_rsa_encrypt(CK_BYTE *in_data, CK_ULONG in_data_len, /* format the data */ rc = rsa_format_block(in_data, in_data_len, clear, modulus_bytes, PKCS_BT_2); if (rc != CKR_OK) { - TRACE_DEBUG("rsa_format_block failed\n"); + TRACE_DEVEL("rsa_format_block failed\n"); return rc; } @@ -1842,7 +1842,7 @@ token_specific_rsa_encrypt(CK_BYTE *in_data, CK_ULONG in_data_len, memcpy(out_data, cipher, modulus_bytes); *out_data_len = modulus_bytes; } else - TRACE_DEBUG("os_specific_rsa_encrypt failed\n"); + TRACE_DEVEL("os_specific_rsa_encrypt failed\n"); return rc; } @@ -1859,13 +1859,13 @@ token_specific_rsa_decrypt(CK_BYTE *in_data, CK_ULONG in_data_len, rc = os_specific_rsa_decrypt(in_data, in_data_len, out, key_obj); if (rc != CKR_OK) { - TRACE_DEBUG("os_specific_rsa_decrypt failed\n"); + TRACE_DEVEL("os_specific_rsa_decrypt failed\n"); return rc; } rc = rsa_parse_block(out,in_data_len,out_data,out_data_len,PKCS_BT_2); if (rc != CKR_OK) { - TRACE_DEBUG("rsa_parse_block failed\n"); + TRACE_DEVEL("rsa_parse_block failed\n"); return rc; } @@ -1901,7 +1901,7 @@ token_specific_rsa_sign(CK_BYTE *in_data, CK_ULONG in_data_len, rc = rsa_format_block(in_data, in_data_len, data, modulus_bytes, PKCS_BT_1); if (rc != CKR_OK) { - TRACE_DEBUG("rsa_format_block failed\n"); + TRACE_DEVEL("rsa_format_block failed\n"); return rc; } @@ -1911,7 +1911,7 @@ token_specific_rsa_sign(CK_BYTE *in_data, CK_ULONG in_data_len, memcpy( out_data, sig, modulus_bytes ); *out_data_len = modulus_bytes; } else - TRACE_DEBUG("os_specific_rsa_decrypt failed\n"); + TRACE_DEVEL("os_specific_rsa_decrypt failed\n"); return rc; } @@ -1954,7 +1954,7 @@ token_specific_rsa_verify (CK_BYTE *in_data, CK_ULONG in_data_len, return CKR_FUNCTION_FAILED; } } else - TRACE_DEBUG("rsa_parse_block failed\n"); + TRACE_DEVEL("rsa_parse_block failed\n"); return rc; } @@ -1979,7 +1979,7 @@ token_specific_rsa_verify_recover(CK_BYTE *signature, CK_ULONG sig_len, rc = os_specific_rsa_encrypt(signature, modulus_bytes, out, key_obj); if (rc != CKR_OK) { - TRACE_DEBUG("os_specific_rsa_encrypt failed\n"); + TRACE_DEVEL("os_specific_rsa_encrypt failed\n"); return rc; } @@ -1988,7 +1988,7 @@ token_specific_rsa_verify_recover(CK_BYTE *signature, CK_ULONG sig_len, TRACE_ERROR("%s\n", ock_err(ERR_SIGNATURE_INVALID)); return CKR_SIGNATURE_INVALID; } else if (rc != CKR_OK) - TRACE_DEBUG("rsa_parse_block failed\n"); + TRACE_DEVEL("rsa_parse_block failed\n"); return rc; } @@ -2021,7 +2021,7 @@ token_specific_rsa_x509_encrypt(CK_BYTE *in_data, CK_ULONG in_data_len, memcpy(out_data, cipher, modulus_bytes); *out_data_len = modulus_bytes; } else - TRACE_DEBUG("os_specific_rsa_encrypt failed\n"); + TRACE_DEVEL("os_specific_rsa_encrypt failed\n"); return rc; } @@ -2049,7 +2049,7 @@ token_specific_rsa_x509_decrypt(CK_BYTE *in_data, CK_ULONG in_data_len, memcpy(out_data, out, modulus_bytes); *out_data_len = modulus_bytes; } else - TRACE_DEBUG("os_specific_rsa_decrypt failed\n"); + TRACE_DEVEL("os_specific_rsa_decrypt failed\n"); return rc; } @@ -2082,7 +2082,7 @@ token_specific_rsa_x509_sign(CK_BYTE *in_data, CK_ULONG in_data_len, memcpy(out_data, sig, modulus_bytes); *out_data_len = modulus_bytes; } else - TRACE_DEBUG("os_specific_rsa_decrypt failed\n"); + TRACE_DEVEL("os_specific_rsa_decrypt failed\n"); return rc; } @@ -2136,7 +2136,7 @@ token_specific_rsa_x509_verify(CK_BYTE *in_data, CK_ULONG in_data_len, } return CKR_OK; } else - TRACE_DEBUG("os_specific_rsa_encrypt failed\n"); + TRACE_DEVEL("os_specific_rsa_encrypt failed\n"); return rc; } @@ -2165,7 +2165,7 @@ token_specific_rsa_x509_verify_recover(CK_BYTE *signature, CK_ULONG sig_len, memcpy(out_data, out, modulus_bytes); *out_data_len = modulus_bytes; } else - TRACE_DEBUG("os_specific_rsa_encrypt failed\n"); + TRACE_DEVEL("os_specific_rsa_encrypt failed\n"); return rc; } @@ -2193,7 +2193,7 @@ CK_RV token_specific_rsa_oaep_encrypt(ENCR_DECR_CONTEXT *ctx, CK_BYTE *in_data, rc = object_mgr_find_in_map1(ctx->key, &key_obj); if (rc != CKR_OK) { - TRACE_DEBUG("object_mgr_find_in_map1 failed\n"); + TRACE_DEVEL("object_mgr_find_in_map1 failed\n"); return rc; } @@ -2223,7 +2223,7 @@ CK_RV token_specific_rsa_oaep_encrypt(ENCR_DECR_CONTEXT *ctx, CK_BYTE *in_data, memcpy(out_data, cipher, modulus_bytes); *out_data_len = modulus_bytes; } else - TRACE_DEBUG("os_specific_rsa_encrypt failed\n"); + TRACE_DEVEL("os_specific_rsa_encrypt failed\n"); done: if (em_data) @@ -2252,7 +2252,7 @@ CK_RV token_specific_rsa_oaep_decrypt(ENCR_DECR_CONTEXT *ctx, CK_BYTE *in_data, rc = object_mgr_find_in_map1(ctx->key, &key_obj); if (rc != CKR_OK) { - TRACE_DEBUG("object_mgr_find_in_map1 failed\n"); + TRACE_DEVEL("object_mgr_find_in_map1 failed\n"); return rc; } @@ -2312,7 +2312,7 @@ CK_RV token_specific_rsa_pss_sign(SIGN_VERIFY_CONTEXT *ctx, CK_BYTE *in_data, /* get the key */ rc = object_mgr_find_in_map1(ctx->key, &key_obj); if (rc != CKR_OK) { - TRACE_DEBUG("object_mgr_find_in_map1 failed\n"); + TRACE_DEVEL("object_mgr_find_in_map1 failed\n"); return rc; } @@ -2338,7 +2338,7 @@ CK_RV token_specific_rsa_pss_sign(SIGN_VERIFY_CONTEXT *ctx, CK_BYTE *in_data, if (rc == CKR_OK) *sig_len = modbytes; else - TRACE_DEBUG("os_specific_rsa_decrypt failed\n"); + TRACE_DEVEL("os_specific_rsa_decrypt failed\n"); done: if (emdata) @@ -2375,14 +2375,14 @@ CK_RV token_specific_rsa_pss_verify(SIGN_VERIFY_CONTEXT *ctx, CK_BYTE *in_data, /* get the key */ rc = object_mgr_find_in_map1(ctx->key, &key_obj); if (rc != CKR_OK) { - TRACE_DEBUG("object_mgr_find_in_map1 failed\n"); + TRACE_DEVEL("object_mgr_find_in_map1 failed\n"); return rc; } /* verify is a public key operation ... encrypt */ rc = os_specific_rsa_encrypt(signature, sig_len, out, key_obj); if (rc != CKR_OK) { - TRACE_DEBUG("os_specific_rsa_encrypt failed\n"); + TRACE_DEVEL("os_specific_rsa_encrypt failed\n"); return rc; } @@ -2791,7 +2791,7 @@ token_specific_dh_pkcs_key_pair_gen( TEMPLATE * publ_tmpl, rc = build_attribute( CKA_VALUE, temp_byte, temp_bn_len, &temp_attr ); // in bytes if (rc != CKR_OK) { - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); return rc; } template_update_attribute( publ_tmpl, temp_attr ); @@ -2808,7 +2808,7 @@ token_specific_dh_pkcs_key_pair_gen( TEMPLATE * publ_tmpl, rc = build_attribute( CKA_VALUE, temp_byte, temp_bn_len, &temp_attr ); // in bytes if (rc != CKR_OK) { - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); return rc; } template_update_attribute( priv_tmpl, temp_attr ); @@ -2827,7 +2827,7 @@ token_specific_dh_pkcs_key_pair_gen( TEMPLATE * publ_tmpl, prime_attr->ulValueLen, &temp_attr ); // in bytes if (rc != CKR_OK) { - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); return rc; } template_update_attribute( priv_tmpl, temp_attr ); @@ -2836,7 +2836,7 @@ token_specific_dh_pkcs_key_pair_gen( TEMPLATE * publ_tmpl, base_attr->ulValueLen, &temp_attr ); // in bytes if (rc != CKR_OK) { - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); return rc; } template_update_attribute( priv_tmpl, temp_attr ); diff --git a/usr/lib/pkcs11/icsf_stdll/icsf.c b/usr/lib/pkcs11/icsf_stdll/icsf.c index cb17d588..188000be 100644 --- a/usr/lib/pkcs11/icsf_stdll/icsf.c +++ b/usr/lib/pkcs11/icsf_stdll/icsf.c @@ -273,7 +273,7 @@ icsf_login(LDAP **ld, const char *uri, const char *dn, const char *password) dn = (dn && dn[0]) ? dn : NULL; /* Connect to LDAP server */ - TRACE_DEBUG("Connecting to: %s\n", uri ? uri : "(null)"); + TRACE_DEVEL("Connecting to: %s\n", uri ? uri : "(null)"); rc = ldap_initialize(ld, uri); if (rc != LDAP_SUCCESS) { TRACE_ERROR("Failed to connect to \"%s\": %s (%d)\n", @@ -284,7 +284,7 @@ icsf_login(LDAP **ld, const char *uri, const char *dn, const char *password) if (icsf_force_ldap_v3(*ld)) return -1; - TRACE_DEBUG("Binding with DN: %s\n", dn ? dn : "(null)"); + TRACE_DEVEL("Binding with DN: %s\n", dn ? dn : "(null)"); cred.bv_len = strlen(password); cred.bv_val = (char *) password; rc = ldap_sasl_bind_s(*ld, dn, LDAP_SASL_SIMPLE, &cred, NULL, NULL, @@ -312,9 +312,9 @@ icsf_set_sasl_params(LDAP *ld, const char *cert, const char *key, CHECK_ARG_NON_NULL(ld); - TRACE_DEBUG("Preparing environment for TLS\n"); + TRACE_DEVEL("Preparing environment for TLS\n"); if (cert && *cert) { - TRACE_DEBUG("Using certificate: %s\n", cert); + TRACE_DEVEL("Using certificate: %s\n", cert); rc = ldap_set_option(NULL, LDAP_OPT_X_TLS_CERTFILE, cert); if (rc != LDAP_SUCCESS) { TRACE_ERROR("Failed to set certificate file for TLS: " @@ -334,7 +334,7 @@ icsf_set_sasl_params(LDAP *ld, const char *cert, const char *key, } if (ca && *ca) { - TRACE_DEBUG("Using CA certificate file: %s\n", ca); + TRACE_DEVEL("Using CA certificate file: %s\n", ca); rc = ldap_set_option(NULL, LDAP_OPT_X_TLS_CACERTFILE, ca); if (rc != LDAP_SUCCESS) { TRACE_ERROR("Failed to set CA certificate file for TLS:" @@ -344,7 +344,7 @@ icsf_set_sasl_params(LDAP *ld, const char *cert, const char *key, } if (ca_dir && *ca_dir) { - TRACE_DEBUG("Using CA certificate dir: %s\n", ca_dir); + TRACE_DEVEL("Using CA certificate dir: %s\n", ca_dir); rc = ldap_set_option(NULL, LDAP_OPT_X_TLS_CACERTDIR, ca_dir); if (rc != LDAP_SUCCESS) { TRACE_ERROR("Failed to set CA certificate dir for TLS: " @@ -372,7 +372,7 @@ icsf_sasl_login(LDAP **ld, const char *uri, const char *cert, uri = (uri && uri[0]) ? uri : NULL; /* Connect to LDAP server */ - TRACE_DEBUG("Connecting to: %s\n", uri ? uri : "(null)"); + TRACE_DEVEL("Connecting to: %s\n", uri ? uri : "(null)"); rc = ldap_initialize(ld, uri); if (rc != LDAP_SUCCESS) { TRACE_ERROR("Failed to connect to \"%s\": %s (%d)\n", @@ -387,7 +387,7 @@ icsf_sasl_login(LDAP **ld, const char *uri, const char *cert, if (icsf_set_sasl_params(*ld, cert, key, ca, ca_dir)) return -1; - TRACE_DEBUG("Binding\n"); + TRACE_DEVEL("Binding\n"); rc = ldap_sasl_bind_s(*ld, NULL, "EXTERNAL", NULL, NULL, NULL, NULL); if (rc != LDAP_SUCCESS) { char *ext_msg = NULL; @@ -680,7 +680,7 @@ icsf_call(LDAP *ld, int *reason, char *handle, size_t handle_len, memset(handle + len, 0, handle_len - len); } - TRACE_DEBUG("ICSF call result: %d (%d)\n", return_code, reason_code); + TRACE_DEVEL("ICSF call result: %d (%d)\n", return_code, reason_code); if (ICSF_RC_IS_ERROR(return_code)) { TRACE_ERROR("ICSF call failed: %d (%d)\n", return_code, @@ -1167,7 +1167,7 @@ icsf_copy_object(LDAP * ld, int *reason, } if (icsf_ber_put_attribute_list(msg, attrs, attrs_len) < 0) { - TRACE_DEBUG("icsf_ber_put_attribute_list failed\n"); + TRACE_DEVEL("icsf_ber_put_attribute_list failed\n"); goto cleanup; } @@ -2192,7 +2192,7 @@ icsf_get_attribute(LDAP *ld, int *reason, struct icsf_object_record *object, rc = icsf_call(ld, reason, handle, sizeof(handle), "", 0, ICSF_TAG_CSFPGAV, msg, &result); if (rc != 0) { - TRACE_DEBUG("icsf_call failed.\n"); + TRACE_DEVEL("icsf_call failed.\n"); goto cleanup; } @@ -2536,7 +2536,7 @@ int icsf_hmac_sign(LDAP *ld, int *reason, struct icsf_object_record *key, sizeof(rule_array), ICSF_TAG_CSFPHMG, msg, &result); if (ICSF_RC_IS_ERROR(rc)) { - TRACE_DEBUG("icsf_call failed\n"); + TRACE_DEVEL("icsf_call failed\n"); goto done; } @@ -2680,7 +2680,7 @@ int icsf_hmac_verify(LDAP *ld, int *reason, struct icsf_object_record *key, sizeof(rule_array), ICSF_TAG_CSFPHMV, msg, &result); if (ICSF_RC_IS_ERROR(rc)) { - TRACE_DEBUG("icsf_call failed\n"); + TRACE_DEVEL("icsf_call failed\n"); goto done; } @@ -3106,7 +3106,7 @@ icsf_derive_key(LDAP *ld, int *reason, CK_MECHANISM_PTR mech, } if (icsf_ber_put_attribute_list(msg, attrs, attrs_len) < 0 ) { - TRACE_DEBUG("Failed to encode message.\n"); + TRACE_DEVEL("Failed to encode message.\n"); goto cleanup; } diff --git a/usr/lib/pkcs11/icsf_stdll/icsf_specific.c b/usr/lib/pkcs11/icsf_stdll/icsf_specific.c index fa4bad7a..74b07b75 100644 --- a/usr/lib/pkcs11/icsf_stdll/icsf_specific.c +++ b/usr/lib/pkcs11/icsf_stdll/icsf_specific.c @@ -322,7 +322,7 @@ CK_RV token_specific_init_token_data(CK_SLOT_ID slot_id) /* Check if data needs to be retrieved for this slot */ if (slot_data[slot_id]->initialized) { - TRACE_DEBUG("Slot data already initialized for slot %d. " + TRACE_DEVEL("Slot data already initialized for slot %d. " "Skipping it\n", slot_id); goto done; } @@ -334,7 +334,7 @@ CK_RV token_specific_init_token_data(CK_SLOT_ID slot_id) return CKR_FUNCTION_FAILED; } - TRACE_DEBUG("DEBUG: conf_name=\"%s\".\n", conf_name); + TRACE_DEVEL("DEBUG: conf_name=\"%s\".\n", conf_name); if (parse_config_file(conf_name, slot_id, &config)) { TRACE_ERROR("Failed to parse file \"%s\" for slot %d.\n", conf_name, slot_id); @@ -446,7 +446,7 @@ CK_RV token_specific_attach_shm(CK_SLOT_ID slot_id, LW_SHM_TYPE **shm) "for slot %d.\n", slot_id); return CKR_HOST_MEMORY; } - TRACE_DEBUG("Attaching to shared memory \"%s\".\n", shm_id); + TRACE_DEVEL("Attaching to shared memory \"%s\".\n", shm_id); XProcLock(); @@ -509,13 +509,13 @@ CK_RV login(LDAP **ld, CK_SLOT_ID slot_id, CK_BYTE *pin, CK_ULONG pin_len, /* Load master key */ sprintf(fname, "%s/MK_SO", get_pk_dir(pk_dir_buf)); if (get_masterkey(pin, pin_len, fname, mk, &mk_len)) { - TRACE_DEBUG("Failed to get masterkey \"%s\".\n", fname); + TRACE_DEVEL("Failed to get masterkey \"%s\".\n", fname); return CKR_FUNCTION_FAILED; } /* Load RACF password */ if (get_racf(mk, mk_len, racf_pass, &racf_pass_len)) { - TRACE_DEBUG("Failed to get RACF password.\n"); + TRACE_DEVEL("Failed to get RACF password.\n"); return CKR_FUNCTION_FAILED; } @@ -528,7 +528,7 @@ CK_RV login(LDAP **ld, CK_SLOT_ID slot_id, CK_BYTE *pin, CK_ULONG pin_len, } if (ret) { - TRACE_DEBUG("Failed to bind to %s\n", data.uri); + TRACE_DEVEL("Failed to bind to %s\n", data.uri); rc = CKR_FUNCTION_FAILED; goto done; } @@ -567,26 +567,26 @@ CK_RV reset_token_data(CK_SLOT_ID slot_id, CK_CHAR_PTR pin, CK_ULONG pin_len) /* Load master key */ sprintf(fname, "%s/MK_SO", get_pk_dir(pk_dir_buf)); if (get_masterkey(pin, pin_len, fname, mk, &mk_len)) { - TRACE_DEBUG("Failed to load masterkey \"%s\".\n", + TRACE_DEVEL("Failed to load masterkey \"%s\".\n", fname); return CKR_FUNCTION_FAILED; } /* Load RACF password */ if (get_racf(mk, mk_len, racf_pass, &racf_pass_len)) { - TRACE_DEBUG("Failed to get RACF password.\n"); + TRACE_DEVEL("Failed to get RACF password.\n"); return CKR_FUNCTION_FAILED; } /* Generate new key */ if (get_randombytes(mk, mk_len)) { - TRACE_DEBUG("Failed to generate new master key.\n"); + TRACE_DEVEL("Failed to generate new master key.\n"); return CKR_FUNCTION_FAILED; } /* Save racf password using the new master key */ if (secure_racf(racf_pass, racf_pass_len, mk, mk_len)) { - TRACE_DEBUG("Failed to save racf password.\n"); + TRACE_DEVEL("Failed to save racf password.\n"); return CKR_FUNCTION_FAILED; } } @@ -609,13 +609,13 @@ CK_RV reset_token_data(CK_SLOT_ID slot_id, CK_CHAR_PTR pin, CK_ULONG pin_len) if (slot_data[slot_id]->mech == ICSF_CFG_MECH_SIMPLE) { /* Save master key */ if (secure_masterkey(mk, mk_len, pin, pin_len, fname)) { - TRACE_DEBUG("Failed to save the new master key.\n"); + TRACE_DEVEL("Failed to save the new master key.\n"); return CKR_FUNCTION_FAILED; } } if (save_token_data(slot_id)) { - TRACE_DEBUG("Failed to save token data.\n"); + TRACE_DEVEL("Failed to save token data.\n"); return CKR_FUNCTION_FAILED; } @@ -636,14 +636,14 @@ CK_RV destroy_objects(CK_SLOT_ID slot_id, CK_CHAR_PTR token_name, if (login(&ld, slot_id, pin, pin_len, RACFFILE)) return CKR_FUNCTION_FAILED; - TRACE_DEBUG("Destroying objects in slot %lu.\n", slot_id); + TRACE_DEVEL("Destroying objects in slot %lu.\n", slot_id); do { records_len = sizeof(records)/sizeof(records[0]); rc = icsf_list_objects(ld, NULL, token_name, 0, NULL, previous, records, &records_len, 0); if (ICSF_RC_IS_ERROR(rc)) { - TRACE_DEBUG("Failed to list objects for slot %lu.\n", + TRACE_DEVEL("Failed to list objects for slot %lu.\n", slot_id); rc = CKR_FUNCTION_FAILED; goto done; @@ -651,7 +651,7 @@ CK_RV destroy_objects(CK_SLOT_ID slot_id, CK_CHAR_PTR token_name, for (i = 0; i < records_len; i++) { if ((rc = icsf_destroy_object(ld, &reason, &records[i]))) { - TRACE_DEBUG("Failed to destroy object " + TRACE_DEVEL("Failed to destroy object " "%s/%lu/%c in slot %lu.\n", records[i].token_name, records[i].sequence, @@ -698,7 +698,7 @@ CK_RV icsftok_init_token(CK_SLOT_ID slot_id, CK_CHAR_PTR pin, CK_ULONG pin_len, /* purge the object btree */ if (purge_object_mapping()) { - TRACE_DEBUG("Failed to purge objects.\n"); + TRACE_DEVEL("Failed to purge objects.\n"); rc = CKR_FUNCTION_FAILED; } @@ -734,7 +734,7 @@ CK_RV icsftok_init_pin(SESSION *sess, CK_CHAR_PTR pPin, CK_ULONG ulPinLen) rc = secure_masterkey(master_key, AES_KEY_SIZE_256, pPin, ulPinLen, fname); if (rc != CKR_OK) { - TRACE_DEBUG("Could not create MK_USER.\n"); + TRACE_DEVEL("Could not create MK_USER.\n"); return rc; } } @@ -951,7 +951,7 @@ static CK_RV close_session(struct session_state *session_state) /* Log off from LDAP server */ if (session_state->ld) { if (icsf_logout(session_state->ld)) { - TRACE_DEBUG("Failed to disconnect from LDAP server.\n"); + TRACE_DEVEL("Failed to disconnect from LDAP server.\n"); return CKR_FUNCTION_FAILED; } session_state->ld = NULL; @@ -961,7 +961,7 @@ static CK_RV close_session(struct session_state *session_state) list_remove(&session_state->sessions); if (list_is_empty(&sessions)) { if (purge_object_mapping()) { - TRACE_DEBUG("Failed to purge objects.\n"); + TRACE_DEVEL("Failed to purge objects.\n"); rc = CKR_FUNCTION_FAILED; } } @@ -1007,7 +1007,7 @@ CK_RV icsftok_close_session(SESSION *session) */ CK_RV icsftok_final(void) { - CK_RV rc; + CK_RV rc = CKR_OK; struct session_state *session_state; list_entry_t *e; @@ -1085,7 +1085,7 @@ CK_RV icsftok_login(SESSION *sess, CK_USER_TYPE userType, CK_CHAR_PTR pPin, rc = get_masterkey(pPin, ulPinLen, fname, master_key, &mklen); if (rc != CKR_OK) { - TRACE_DEBUG("Failed to load master key.\n"); + TRACE_DEVEL("Failed to load master key.\n"); goto done; } } @@ -1105,7 +1105,7 @@ CK_RV icsftok_login(SESSION *sess, CK_USER_TYPE userType, CK_CHAR_PTR pPin, rc = get_masterkey(pPin, ulPinLen, fname, master_key, &mklen); if (rc != CKR_OK) { - TRACE_DEBUG("Failed to load master key.\n"); + TRACE_DEVEL("Failed to load master key.\n"); goto done; } } @@ -1125,7 +1125,7 @@ CK_RV icsftok_login(SESSION *sess, CK_USER_TYPE userType, CK_CHAR_PTR pPin, /* get racf passwd */ rc = get_racf(master_key, AES_KEY_SIZE_256, racfpwd, &racflen); if (rc != CKR_OK) { - TRACE_DEBUG("Failed to get racf passwd.\n"); + TRACE_DEVEL("Failed to get racf passwd.\n"); goto done; } @@ -1133,7 +1133,7 @@ CK_RV icsftok_login(SESSION *sess, CK_USER_TYPE userType, CK_CHAR_PTR pPin, rc = icsf_login(&ld, slot_data[slot_id]->uri, slot_data[slot_id]->dn, racfpwd); if (rc != CKR_OK) { - TRACE_DEBUG("Failed to bind to ldap server.\n"); + TRACE_DEVEL("Failed to bind to ldap server.\n"); goto done; } @@ -1146,7 +1146,7 @@ CK_RV icsftok_login(SESSION *sess, CK_USER_TYPE userType, CK_CHAR_PTR pPin, slot_data[slot_id]->key_file, slot_data[slot_id]->ca_file, ca_dir); if (rc != CKR_OK) { - TRACE_DEBUG("Failed to bind to ldap server.\n"); + TRACE_DEVEL("Failed to bind to ldap server.\n"); goto done; } } @@ -1311,7 +1311,7 @@ CK_RV icsftok_copy_object(SESSION * session, CK_ATTRIBUTE_PTR attrs, /* Check permissions based on attributes and session */ rc = check_session_permissions(session, priv_attrs, 2); if (rc_permission != CKR_OK) { - TRACE_DEBUG("check_session_permissions failed\n"); + TRACE_DEVEL("check_session_permissions failed\n"); goto done; } @@ -1320,7 +1320,7 @@ CK_RV icsftok_copy_object(SESSION * session, CK_ATTRIBUTE_PTR attrs, &mapping_src->icsf_object, &mapping_dst->icsf_object); if (rc != 0) { - TRACE_DEBUG("Failed to Copy object.\n"); + TRACE_DEVEL("Failed to Copy object.\n"); rc = icsf_to_ock_err(rc, reason); goto done; } @@ -1400,7 +1400,7 @@ CK_RV icsftok_create_object(SESSION *session, CK_ATTRIBUTE_PTR attrs, if ((rc = icsf_create_object(session_state->ld, &reason, token_name, attrs, attrs_len, &mapping->icsf_object))) { - TRACE_DEBUG("icsf_create_object failed\n"); + TRACE_DEVEL("icsf_create_object failed\n"); rc = icsf_to_ock_err(rc, reason); goto done; } @@ -1583,7 +1583,7 @@ CK_RV icsftok_generate_key_pair(SESSION *session, CK_MECHANISM_PTR mech, /* Get session state */ if (!(session_state = get_session_state(session->handle))) { - TRACE_DEBUG("Session not found for session id %lu.\n", + TRACE_DEVEL("Session not found for session id %lu.\n", (unsigned long) session->handle); rc = CKR_FUNCTION_FAILED; goto done; @@ -1608,7 +1608,7 @@ CK_RV icsftok_generate_key_pair(SESSION *session, CK_MECHANISM_PTR mech, new_priv_attrs, new_priv_attrs_len, &pub_key_mapping->icsf_object, &priv_key_mapping->icsf_object))) { - TRACE_DEBUG("icsf_generate_key_pair failed\n"); + TRACE_DEVEL("icsf_generate_key_pair failed\n"); rc = icsf_to_ock_err(rc, reason); goto done; } @@ -1702,7 +1702,7 @@ CK_RV icsftok_generate_key(SESSION *session, CK_MECHANISM_PTR mech, /* Get session state */ if (!(session_state = get_session_state(session->handle))) { - TRACE_DEBUG("Session not found for session id %lu.\n", + TRACE_DEVEL("Session not found for session id %lu.\n", (unsigned long) session->handle); rc = CKR_FUNCTION_FAILED; goto done; @@ -1712,7 +1712,7 @@ CK_RV icsftok_generate_key(SESSION *session, CK_MECHANISM_PTR mech, if ((rc = icsf_generate_secret_key(session_state->ld, &reason, token_name, mech, new_attrs, new_attrs_len, &mapping->icsf_object))) { - TRACE_DEBUG("icsf_generate_secret_key failed\n"); + TRACE_DEVEL("icsf_generate_secret_key failed\n"); rc = icsf_to_ock_err(rc, reason); goto done; } @@ -2106,7 +2106,7 @@ CK_RV icsftok_encrypt_update(SESSION *session, CK_BYTE_PTR input_part, rc = CKR_BUFFER_TOO_SMALL; } } else { - TRACE_DEBUG("Failed to encrypt data. reason = %d\n", + TRACE_DEVEL("Failed to encrypt data. reason = %d\n", reason); rc = icsf_to_ock_err(rc, reason); } @@ -2252,7 +2252,7 @@ CK_RV icsftok_encrypt_final(SESSION *session, CK_BYTE_PTR output_part, rc = CKR_BUFFER_TOO_SMALL; } } else { - TRACE_DEBUG("Failed to encrypt data. reason = %d\n", + TRACE_DEVEL("Failed to encrypt data. reason = %d\n", reason); rc = icsf_to_ock_err(rc, reason); } @@ -2438,7 +2438,7 @@ CK_RV icsftok_decrypt(SESSION *session, CK_BYTE_PTR input_data, rc = CKR_BUFFER_TOO_SMALL; } } else { - TRACE_DEBUG("Failed to decrypt data. reason = %d\n", + TRACE_DEVEL("Failed to decrypt data. reason = %d\n", reason); rc = icsf_to_ock_err(rc, reason); } @@ -2588,7 +2588,7 @@ CK_RV icsftok_decrypt_update(SESSION *session, CK_BYTE_PTR input_part, rc = CKR_BUFFER_TOO_SMALL; } } else { - TRACE_DEBUG("Failed to decrypt data. reason = %d\n", + TRACE_DEVEL("Failed to decrypt data. reason = %d\n", reason); rc = icsf_to_ock_err(rc, reason); } @@ -2735,7 +2735,7 @@ CK_RV icsftok_decrypt_final(SESSION *session, CK_BYTE_PTR output_part, rc = CKR_BUFFER_TOO_SMALL; } } else { - TRACE_DEBUG("Failed to decrypt data. reason = %d\n", + TRACE_DEVEL("Failed to decrypt data. reason = %d\n", reason); rc = icsf_to_ock_err(rc, reason); } @@ -2792,7 +2792,7 @@ CK_RV icsftok_get_attribute_value(SESSION *sess, CK_OBJECT_HANDLE handle, rc = icsf_get_attribute(session_state->ld, &reason, &mapping->icsf_object, priv_attr, 1); if (rc != CKR_OK) { - TRACE_DEBUG("icsf_get_attribute failed\n"); + TRACE_DEVEL("icsf_get_attribute failed\n"); rc = icsf_to_ock_err(rc, reason); goto done; } @@ -2810,7 +2810,7 @@ CK_RV icsftok_get_attribute_value(SESSION *sess, CK_OBJECT_HANDLE handle, rc = icsf_get_attribute(session_state->ld, &reason, &mapping->icsf_object, pTemplate, ulCount); if (rc != CKR_OK) { - TRACE_DEBUG("icsf_get_attribute failed\n"); + TRACE_DEVEL("icsf_get_attribute failed\n"); rc = icsf_to_ock_err(rc, reason); } @@ -2869,7 +2869,7 @@ CK_RV icsftok_set_attribute_value(SESSION *sess, CK_OBJECT_HANDLE handle, rc = icsf_get_attribute(session_state->ld, &reason, &mapping->icsf_object, priv_attrs, 2); if (rc != CKR_OK) { - TRACE_DEBUG("icsf_get_attribute failed\n"); + TRACE_DEVEL("icsf_get_attribute failed\n"); rc = icsf_to_ock_err(rc, reason); goto done; } @@ -2877,7 +2877,7 @@ CK_RV icsftok_set_attribute_value(SESSION *sess, CK_OBJECT_HANDLE handle, /* Check permissions based on attributes and session */ rc = check_session_permissions(sess, priv_attrs, 2); if (rc != CKR_OK) { - TRACE_DEBUG("check_session_permissions failed\n"); + TRACE_DEVEL("check_session_permissions failed\n"); goto done; } @@ -2974,7 +2974,7 @@ CK_RV icsftok_find_objects_init(SESSION *sess, CK_ATTRIBUTE *pTemplate, ulCount, pTemplate, previous, records, &records_len, 0); if (ICSF_RC_IS_ERROR(rc)) { - TRACE_DEBUG("Failed to list objects.\n"); + TRACE_DEVEL("Failed to list objects.\n"); rc = icsf_to_ock_err(rc, reason); goto done; } @@ -3104,7 +3104,7 @@ CK_RV icsftok_destroy_object(SESSION *sess, CK_OBJECT_HANDLE handle) rc = icsf_destroy_object(session_state->ld, &reason, &mapping->icsf_object); if (rc != 0) { - TRACE_DEBUG("icsf_destroy_object failed\n"); + TRACE_DEVEL("icsf_destroy_object failed\n"); rc = CKR_FUNCTION_FAILED; goto done; } @@ -3425,7 +3425,7 @@ CK_RV icsftok_sign(SESSION *session, CK_BBOOL length_only, CK_BYTE *in_data, && length_only) { rc = CKR_OK; } else { - TRACE_DEBUG("icsf_private_key_sign failed\n"); + TRACE_DEVEL("icsf_private_key_sign failed\n"); rc = icsf_to_ock_err(rc, reason); } } @@ -3447,7 +3447,7 @@ CK_RV icsftok_sign(SESSION *session, CK_BBOOL length_only, CK_BYTE *in_data, && length_only) { rc = CKR_OK; } else { - TRACE_DEBUG("icsf_hash_signverify failed\n"); + TRACE_DEVEL("icsf_hash_signverify failed\n"); rc = icsf_to_ock_err(rc, reason); } } @@ -3524,7 +3524,7 @@ CK_RV icsftok_sign_update(SESSION *session, CK_BYTE *in_data, chain_data, &chain_data_len); if (rc != 0) { - TRACE_DEBUG("icsf_hmac_sign failed\n"); + TRACE_DEVEL("icsf_hmac_sign failed\n"); rc = icsf_to_ock_err(rc, reason); } else { multi_part_ctx->initiated = TRUE; @@ -3593,7 +3593,7 @@ CK_RV icsftok_sign_update(SESSION *session, CK_BYTE *in_data, chain_data, &chain_data_len, 0); if (rc != 0) { - TRACE_DEBUG("icsf_hash_signverify failed\n"); + TRACE_DEVEL("icsf_hash_signverify failed\n"); rc = icsf_to_ock_err(rc, reason); } else { multi_part_ctx->initiated = TRUE; @@ -3718,7 +3718,7 @@ CK_RV icsftok_sign_final(SESSION *session, CK_BBOOL length_only, if (length_only && reason == 3003) rc = CKR_OK; else { - TRACE_DEBUG("icsf_hash_signverify failed\n"); + TRACE_DEVEL("icsf_hash_signverify failed\n"); rc = icsf_to_ock_err(rc, reason); } } @@ -4059,7 +4059,7 @@ CK_RV icsftok_verify_update(SESSION *session, CK_BYTE *in_data, chain_data, &chain_data_len); if (rc != 0) { - TRACE_DEBUG("icsf_hmac_verify failed\n"); + TRACE_DEVEL("icsf_hmac_verify failed\n"); rc = icsf_to_ock_err(rc, reason); } else { multi_part_ctx->initiated = TRUE; @@ -4126,7 +4126,7 @@ CK_RV icsftok_verify_update(SESSION *session, CK_BYTE *in_data, chain_data, &chain_data_len, 1); if (rc != 0) { - TRACE_DEBUG("icsf_hash_signverify failed\n"); + TRACE_DEVEL("icsf_hash_signverify failed\n"); rc = icsf_to_ock_err(rc, reason); } else { multi_part_ctx->initiated = TRUE; @@ -4291,7 +4291,7 @@ CK_RV icsftok_wrap_key(SESSION *session, CK_MECHANISM_PTR mech, &key_mapping->icsf_object, wrapped_key, p_wrapped_key_len); if (rc) { - TRACE_DEBUG("icsf_wrap_key failed\n"); + TRACE_DEVEL("icsf_wrap_key failed\n"); return icsf_to_ock_err(rc, reason); } @@ -4344,7 +4344,7 @@ CK_RV icsftok_unwrap_key(SESSION *session, CK_MECHANISM_PTR mech, wrapped_key, wrapped_key_len, attrs, attrs_len, &key_mapping->icsf_object); if (rc) { - TRACE_DEBUG("icsf_unwrap_key failed\n"); + TRACE_DEVEL("icsf_unwrap_key failed\n"); rc = icsf_to_ock_err(rc, reason); goto done; } diff --git a/usr/lib/pkcs11/icsf_stdll/new_host.c b/usr/lib/pkcs11/icsf_stdll/new_host.c index 81ffda0c..dc9790ae 100644 --- a/usr/lib/pkcs11/icsf_stdll/new_host.c +++ b/usr/lib/pkcs11/icsf_stdll/new_host.c @@ -447,7 +447,7 @@ CK_RV ST_Initialize(void **FunctionList, CK_SLOT_ID SlotNumber, char *conf_name, rc = icsftok_init(SlotNumber, conf_name); if (rc != 0) { *FunctionList = NULL; - TRACE_DEBUG("Token Specific Init failed.\n"); + TRACE_DEVEL("Token Specific Init failed.\n"); goto done; } } @@ -455,7 +455,7 @@ CK_RV ST_Initialize(void **FunctionList, CK_SLOT_ID SlotNumber, char *conf_name, rc = load_token_data(SlotNumber); if (rc != CKR_OK) { *FunctionList = NULL; - TRACE_DEBUG("Failed to load token data.\n"); + TRACE_DEVEL("Failed to load token data.\n"); goto done; } @@ -722,7 +722,7 @@ CK_RV SC_InitPIN(ST_SESSION_HANDLE *sSession, CK_CHAR_PTR pPin, CKF_USER_PIN_COUNT_LOW); rc = save_token_data(sess->session_info.slotID); if (rc != CKR_OK) - TRACE_DEBUG("Failed to save token data.\n"); + TRACE_DEVEL("Failed to save token data.\n"); } done: TRACE_INFO("C_InitPin: rc = 0x%08x, session = %d\n", @@ -803,7 +803,7 @@ CK_RV SC_OpenSession(CK_SLOT_ID sid, CK_FLAGS flags, locked = FALSE; rc = session_mgr_new(flags, sid, phSession); if (rc != CKR_OK) { - TRACE_DEBUG("session_mgr_new() failed\n"); + TRACE_DEVEL("session_mgr_new() failed\n"); goto done; } @@ -851,7 +851,7 @@ CK_RV SC_CloseAllSessions(CK_SLOT_ID sid) } rc = session_mgr_close_all_sessions(); if (rc != CKR_OK) - TRACE_DEBUG("session_mgr_close_all_sessions() failed.\n"); + TRACE_DEVEL("session_mgr_close_all_sessions() failed.\n"); done: TRACE_INFO("C_CloseAllSessions: rc = 0x%08x slot = %d\n", rc, sid); return rc; @@ -921,7 +921,7 @@ CK_RV SC_GetOperationState(ST_SESSION_HANDLE *sSession, rc = session_mgr_get_op_state(sess, length_only, pOperationState, pulOperationStateLen); if (rc != CKR_OK) - TRACE_DEBUG("session_mgr_get_op_state() failed.\n"); + TRACE_DEVEL("session_mgr_get_op_state() failed.\n"); done: TRACE_INFO("C_GetOperationState: rc = 0x%08x, session = %d\n", rc, sSession->sessionh); @@ -961,7 +961,7 @@ CK_RV SC_SetOperationState(ST_SESSION_HANDLE *sSession, pOperationState, ulOperationStateLen); if (rc != CKR_OK) - TRACE_DEBUG("session_mgr_set_op_state() failed.\n"); + TRACE_DEVEL("session_mgr_set_op_state() failed.\n"); done: TRACE_INFO("C_SetOperationState: rc = 0x%08x, session = %d\n", rc, sSession->sessionh); @@ -1075,7 +1075,7 @@ done: if (rc == CKR_OK) { rc = session_mgr_login_all(userType); if (rc != CKR_OK) - TRACE_DEBUG("session_mgr_login_all failed.\n"); + TRACE_DEVEL("session_mgr_login_all failed.\n"); } TRACE_INFO("C_Login: rc = 0x%08x\n", rc); @@ -1112,7 +1112,7 @@ CK_RV SC_Logout(ST_SESSION_HANDLE *sSession) rc = session_mgr_logout_all(); if (rc != CKR_OK) - TRACE_DEBUG("session_mgr_logout_all failed.\n"); + TRACE_DEVEL("session_mgr_logout_all failed.\n"); memset(user_pin_md5, 0x0, MD5_HASH_SIZE); @@ -1154,7 +1154,7 @@ CK_RV SC_CreateObject(ST_SESSION_HANDLE *sSession, CK_ATTRIBUTE_PTR pTemplate, rc = icsftok_create_object(sess, pTemplate, ulCount, phObject); if (rc != CKR_OK) - TRACE_DEBUG("icsftok_create_object() failed.\n"); + TRACE_DEVEL("icsftok_create_object() failed.\n"); done: TRACE_INFO("C_CreateObject: rc = 0x%08x\n", rc); @@ -1202,7 +1202,7 @@ CK_RV SC_CopyObject(ST_SESSION_HANDLE *sSession, CK_OBJECT_HANDLE hObject, rc = icsftok_copy_object(sess, pTemplate, ulCount, hObject, phNewObject); if (rc != CKR_OK) - TRACE_DEBUG("icsftok_copy_object() failed\n"); + TRACE_DEVEL("icsftok_copy_object() failed\n"); done: TRACE_INFO("C_CopyObject:rc = 0x%08x,old handle = %d,new handle = %d\n", @@ -1237,7 +1237,7 @@ CK_RV SC_DestroyObject(ST_SESSION_HANDLE *sSession, CK_OBJECT_HANDLE hObject) rc = icsftok_destroy_object(sess, hObject); if (rc != CKR_OK) - TRACE_DEBUG("icsftok_destroy_object() failed\n"); + TRACE_DEVEL("icsftok_destroy_object() failed\n"); done: TRACE_INFO("C_DestroyObject: rc = 0x%08x, handle = %d\n", rc, hObject); return rc; @@ -1298,7 +1298,7 @@ CK_RV SC_GetAttributeValue(ST_SESSION_HANDLE *sSession, rc = icsftok_get_attribute_value(sess, hObject, pTemplate, ulCount); if (rc != CKR_OK) - TRACE_DEBUG("icsftok_get_attribute_value() failed.\n"); + TRACE_DEVEL("icsftok_get_attribute_value() failed.\n"); done: TRACE_INFO("C_GetAttributeValue: rc = 0x%08x, handle = %d\n", @@ -1345,7 +1345,7 @@ CK_RV SC_SetAttributeValue(ST_SESSION_HANDLE *sSession, rc = icsftok_set_attribute_value(sess, hObject, pTemplate, ulCount); if (rc != CKR_OK) - TRACE_DEBUG("icsftok_set_attribute_values() failed.\n"); + TRACE_DEVEL("icsftok_set_attribute_values() failed.\n"); done: TRACE_INFO("C_SetAttributeValue: rc = 0x%08x, handle = %d\n", @@ -1457,7 +1457,7 @@ CK_RV SC_FindObjects(ST_SESSION_HANDLE *sSession, CK_OBJECT_HANDLE_PTR phObject, } if (!sess->find_list) { - TRACE_DEBUG("sess->find_list is NULL.\n"); + TRACE_DEVEL("sess->find_list is NULL.\n"); rc = CKR_FUNCTION_FAILED; goto done; } @@ -1608,7 +1608,7 @@ CK_RV SC_Encrypt(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pData, rc = icsftok_encrypt(sess, pData, ulDataLen, pEncryptedData, pulEncryptedDataLen); if (rc != CKR_OK) - TRACE_DEBUG("icsftok_encrypt() failed.\n"); + TRACE_DEVEL("icsftok_encrypt() failed.\n"); done: if (rc != CKR_BUFFER_TOO_SMALL && (rc != CKR_OK || length_only != TRUE)) @@ -1660,7 +1660,7 @@ CK_RV SC_EncryptUpdate(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pPart, rc = icsftok_encrypt_update(sess, pPart, ulPartLen, pEncryptedPart, pulEncryptedPartLen); if (rc != CKR_OK) - TRACE_DEBUG("icsftok_encrypt_update() failed.\n"); + TRACE_DEVEL("icsftok_encrypt_update() failed.\n"); done: if (rc != CKR_OK && rc != CKR_BUFFER_TOO_SMALL) @@ -1768,7 +1768,7 @@ CK_RV SC_DecryptInit(ST_SESSION_HANDLE *sSession, CK_MECHANISM_PTR pMechanism, rc = icsftok_decrypt_init(sess, pMechanism, hKey); if (rc != CKR_OK) - TRACE_DEBUG("icsftok_decrypt_init() failed.\n"); + TRACE_DEVEL("icsftok_decrypt_init() failed.\n"); done: TRACE_INFO("C_DecryptInit: rc = 0x%08x, sess = %d, mech = 0x%x\n", @@ -1818,7 +1818,7 @@ CK_RV SC_Decrypt(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pEncryptedData, rc = icsftok_decrypt(sess, pEncryptedData, ulEncryptedDataLen, pData, pulDataLen); if (rc != CKR_OK) - TRACE_DEBUG("icsftok_decrypt() failed.\n"); + TRACE_DEVEL("icsftok_decrypt() failed.\n"); done: if (rc != CKR_BUFFER_TOO_SMALL && (rc != CKR_OK || length_only != TRUE)) @@ -1871,7 +1871,7 @@ CK_RV SC_DecryptUpdate(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pEncryptedPart, rc = icsftok_decrypt_update(sess, pEncryptedPart, ulEncryptedPartLen, pPart, pulPartLen); if (rc != CKR_OK) - TRACE_DEBUG("icsftok_decrypt_update() failed.\n"); + TRACE_DEVEL("icsftok_decrypt_update() failed.\n"); done: if (rc != CKR_OK && rc != CKR_BUFFER_TOO_SMALL) @@ -1922,7 +1922,7 @@ CK_RV SC_DecryptFinal(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pLastPart, rc = icsftok_decrypt_final(sess, pLastPart, pulLastPartLen); if (rc != CKR_OK) - TRACE_DEBUG("icsftok_decrypt_final() failed.\n"); + TRACE_DEVEL("icsftok_decrypt_final() failed.\n"); done: if (rc != CKR_BUFFER_TOO_SMALL && (rc != CKR_OK || length_only != TRUE)) decr_mgr_cleanup( &sess->decr_ctx ); @@ -1976,7 +1976,7 @@ CK_RV SC_DigestInit(ST_SESSION_HANDLE *sSession, CK_MECHANISM_PTR pMechanism) rc = digest_mgr_init(sess, &sess->digest_ctx, pMechanism); if (rc != CKR_OK) - TRACE_DEBUG("digest_mgr_init() failed.\n"); + TRACE_DEVEL("digest_mgr_init() failed.\n"); done: TRACE_INFO("C_DigestInit: rc = 0x%08x, sess = %d, mech = %x\n", @@ -2029,7 +2029,7 @@ CK_RV SC_Digest(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pData, rc = digest_mgr_digest(sess, length_only, &sess->digest_ctx, pData, ulDataLen, pDigest, pulDigestLen); if (rc != CKR_OK) - TRACE_DEBUG("digest_mgr_digest() failed.\n"); + TRACE_DEVEL("digest_mgr_digest() failed.\n"); done: TRACE_INFO("C_Digest: rc = 0x%08x, sess = %d, datalen = %d\n", @@ -2075,7 +2075,7 @@ CK_RV SC_DigestUpdate(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pPart, rc = digest_mgr_digest_update(sess, &sess->digest_ctx, pPart, ulPartLen); if (rc != CKR_OK) - TRACE_DEBUG("digest_mgr_digest_update() failed.\n"); + TRACE_DEVEL("digest_mgr_digest_update() failed.\n"); } done: TRACE_INFO("C_DigestUpdate: rc = %08x, sess = %d, datalen = %d\n", @@ -2111,7 +2111,7 @@ CK_RV SC_DigestKey(ST_SESSION_HANDLE *sSession, CK_OBJECT_HANDLE hKey) rc = digest_mgr_digest_key(sess, &sess->digest_ctx, hKey); if (rc != CKR_OK) - TRACE_DEBUG("digest_mgr_digest_key() failed.\n"); + TRACE_DEVEL("digest_mgr_digest_key() failed.\n"); done: TRACE_INFO("C_DigestKey: rc = %08x, sess = %d, key = %d\n", @@ -2212,7 +2212,7 @@ CK_RV SC_SignInit(ST_SESSION_HANDLE *sSession, CK_MECHANISM_PTR pMechanism, rc = icsftok_sign_init(sess, pMechanism, FALSE, hKey); if (rc != CKR_OK) - TRACE_DEBUG("icsftok_sign_init() failed.\n"); + TRACE_DEVEL("icsftok_sign_init() failed.\n"); done: TRACE_INFO("C_SignInit: rc = %08x, sess = %d, mech = %x\n", @@ -2262,7 +2262,7 @@ CK_RV SC_Sign(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pData, rc = icsftok_sign(sess, length_only, pData, ulDataLen, pSignature, pulSignatureLen); if (rc != CKR_OK) - TRACE_DEBUG("icsftok_sign() failed.\n"); + TRACE_DEVEL("icsftok_sign() failed.\n"); done: if (rc != CKR_BUFFER_TOO_SMALL && (rc != CKR_OK || length_only != TRUE)) @@ -2308,7 +2308,7 @@ CK_RV SC_SignUpdate(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pPart, rc = icsftok_sign_update(sess, pPart, ulPartLen); if (rc != CKR_OK) - TRACE_DEBUG("*_sign_update() failed.\n"); + TRACE_DEVEL("*_sign_update() failed.\n"); done: if (rc != CKR_OK) @@ -2442,7 +2442,7 @@ CK_RV SC_VerifyInit(ST_SESSION_HANDLE *sSession, CK_MECHANISM_PTR pMechanism, rc = icsftok_verify_init(sess, pMechanism, FALSE, hKey); if (rc != CKR_OK) - TRACE_DEBUG("icsftok_verify_init() failed.\n"); + TRACE_DEVEL("icsftok_verify_init() failed.\n"); done: TRACE_INFO("C_VerifyInit: rc = %08x, sess = %d, mech = %x\n", @@ -2487,7 +2487,7 @@ CK_RV SC_Verify(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pData, rc = icsftok_verify(sess, pData, ulDataLen, pSignature, ulSignatureLen); if (rc != CKR_OK) - TRACE_DEBUG("icsftok_verify() failed.\n"); + TRACE_DEVEL("icsftok_verify() failed.\n"); done: verify_mgr_cleanup(&sess->verify_ctx); @@ -2532,7 +2532,7 @@ CK_RV SC_VerifyUpdate(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pPart, rc = icsftok_verify_update(sess, pPart, ulPartLen); if (rc != CKR_OK) - TRACE_DEBUG("icsftok_verify_update() failed.\n"); + TRACE_DEVEL("icsftok_verify_update() failed.\n"); done: if (rc != CKR_OK) @@ -2578,7 +2578,7 @@ CK_RV SC_VerifyFinal(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pSignature, rc = icsftok_verify_final(sess, pSignature, ulSignatureLen); if (rc != CKR_OK) - TRACE_DEBUG("icsftok_verify_final() failed.\n"); + TRACE_DEVEL("icsftok_verify_final() failed.\n"); done: verify_mgr_cleanup(&sess->verify_ctx); @@ -2716,7 +2716,7 @@ CK_RV SC_GenerateKey(ST_SESSION_HANDLE *sSession, CK_MECHANISM_PTR pMechanism, rc = icsftok_generate_key(sess, pMechanism, pTemplate, ulCount, phKey); if (rc != CKR_OK) - TRACE_DEBUG("icsftok_generate_key() failed.\n"); + TRACE_DEVEL("icsftok_generate_key() failed.\n"); done: TRACE_INFO("C_GenerateKey: rc = %08x, sess = %d, mech = %x\n", rc, @@ -2792,7 +2792,7 @@ CK_RV SC_GenerateKeyPair(ST_SESSION_HANDLE *sSession, ulPrivateKeyAttributeCount, phPublicKey, phPrivateKey); if (rc != CKR_OK) - TRACE_DEBUG("icsftok_generate_key_pair() faild.\n"); + TRACE_DEVEL("icsftok_generate_key_pair() faild.\n"); done: TRACE_INFO("C_GenerateKeyPair: rc = %08x, sess = %d, mech = %x\n", rc, (sess == NULL) ? -1 : ((CK_LONG) sess->handle), @@ -2874,7 +2874,7 @@ CK_RV SC_WrapKey(ST_SESSION_HANDLE *sSession, CK_MECHANISM_PTR pMechanism, rc = icsftok_wrap_key(sess, pMechanism, hWrappingKey, hKey, pWrappedKey, pulWrappedKeyLen); if (rc != CKR_OK) - TRACE_DEBUG("*_wrap_key() failed.\n"); + TRACE_DEVEL("*_wrap_key() failed.\n"); done: TRACE_INFO("C_WrapKey: rc = %08x, sess = %d, encrypting key = %d, " @@ -2932,7 +2932,7 @@ CK_RV SC_UnwrapKey(ST_SESSION_HANDLE *sSession, CK_MECHANISM_PTR pMechanism, pWrappedKey, ulWrappedKeyLen, hUnwrappingKey, phKey); if (rc != CKR_OK) - TRACE_DEBUG("icsftok_unwrap_key() failed.\n"); + TRACE_DEVEL("icsftok_unwrap_key() failed.\n"); done: TRACE_INFO("C_UnwrapKey: rc = %08x, sess = %d, decrypting key = %d," @@ -2999,7 +2999,7 @@ CK_RV SC_DeriveKey(ST_SESSION_HANDLE *sSession, CK_MECHANISM_PTR pMechanism, rc = icsftok_derive_key(sess, pMechanism, hBaseKey, phKey, pTemplate, ulCount); if (rc != CKR_OK) - TRACE_DEBUG("icsftok_derive_key() failed.\n"); + TRACE_DEVEL("icsftok_derive_key() failed.\n"); done: TRACE_INFO("C_DeriveKey: rc = %08x, sess = %d, mech = %x\n", @@ -3093,7 +3093,7 @@ CK_RV SC_GenerateRandom(ST_SESSION_HANDLE *sSession, CK_BYTE_PTR pRandomData, rc = rng_generate(pRandomData, ulRandomLen); if (rc != CKR_OK) - TRACE_DEBUG("rng_generate() failed.\n"); + TRACE_DEVEL("rng_generate() failed.\n"); done: TRACE_INFO("C_GenerateRandom: rc = %08x, %d bytes\n", rc, ulRandomLen); diff --git a/usr/lib/pkcs11/soft_stdll/soft_specific.c b/usr/lib/pkcs11/soft_stdll/soft_specific.c index 6348c154..8c006c18 100644 --- a/usr/lib/pkcs11/soft_stdll/soft_specific.c +++ b/usr/lib/pkcs11/soft_stdll/soft_specific.c @@ -896,7 +896,7 @@ os_specific_rsa_keygen(TEMPLATE *publ_tmpl, TEMPLATE *priv_tmpl) BNLength = BN_bn2bin(bignum, ssl_ptr); rc = build_attribute( CKA_MODULUS, ssl_ptr, BNLength, &attr ); // in bytes if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto done; } template_update_attribute( publ_tmpl, attr ); @@ -914,7 +914,7 @@ os_specific_rsa_keygen(TEMPLATE *publ_tmpl, TEMPLATE *priv_tmpl) BNLength = BN_bn2bin(bignum, ssl_ptr); rc = build_attribute( CKA_PUBLIC_EXPONENT, ssl_ptr, BNLength, &attr ); // in bytes if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto done; } template_update_attribute( publ_tmpl, attr ); @@ -923,7 +923,7 @@ os_specific_rsa_keygen(TEMPLATE *publ_tmpl, TEMPLATE *priv_tmpl) * private template at this point, we're just making its value correct */ rc = build_attribute( CKA_PUBLIC_EXPONENT, ssl_ptr, BNLength, &attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto done; } template_update_attribute( priv_tmpl, attr ); @@ -935,7 +935,7 @@ os_specific_rsa_keygen(TEMPLATE *publ_tmpl, TEMPLATE *priv_tmpl) flag = TRUE; rc = build_attribute( CKA_LOCAL, &flag, sizeof(CK_BBOOL), &attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto done; } template_update_attribute( publ_tmpl, attr ); @@ -959,7 +959,7 @@ os_specific_rsa_keygen(TEMPLATE *publ_tmpl, TEMPLATE *priv_tmpl) BNLength = BN_bn2bin(bignum, ssl_ptr); rc = build_attribute( CKA_MODULUS, ssl_ptr, BNLength ,&attr ); // in bytes if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto done; } template_update_attribute( priv_tmpl, attr ); @@ -978,7 +978,7 @@ os_specific_rsa_keygen(TEMPLATE *publ_tmpl, TEMPLATE *priv_tmpl) BNLength = BN_bn2bin(bignum, ssl_ptr); rc = build_attribute( CKA_PRIVATE_EXPONENT, ssl_ptr, BNLength, &attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto done; } template_update_attribute( priv_tmpl, attr ); @@ -997,7 +997,7 @@ os_specific_rsa_keygen(TEMPLATE *publ_tmpl, TEMPLATE *priv_tmpl) BNLength = BN_bn2bin(bignum, ssl_ptr); rc = build_attribute( CKA_PRIME_1, ssl_ptr, BNLength, &attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto done; } template_update_attribute( priv_tmpl, attr ); @@ -1016,7 +1016,7 @@ os_specific_rsa_keygen(TEMPLATE *publ_tmpl, TEMPLATE *priv_tmpl) BNLength = BN_bn2bin(bignum, ssl_ptr); rc = build_attribute( CKA_PRIME_2, ssl_ptr, BNLength, &attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto done; } template_update_attribute( priv_tmpl, attr ); @@ -1035,7 +1035,7 @@ os_specific_rsa_keygen(TEMPLATE *publ_tmpl, TEMPLATE *priv_tmpl) BNLength = BN_bn2bin(bignum, ssl_ptr); rc = build_attribute( CKA_EXPONENT_1, ssl_ptr, BNLength, &attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto done; } template_update_attribute( priv_tmpl, attr ); @@ -1054,7 +1054,7 @@ os_specific_rsa_keygen(TEMPLATE *publ_tmpl, TEMPLATE *priv_tmpl) BNLength = BN_bn2bin(bignum, ssl_ptr); rc = build_attribute( CKA_EXPONENT_2, ssl_ptr, BNLength, &attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto done; } template_update_attribute( priv_tmpl, attr ); @@ -1073,7 +1073,7 @@ os_specific_rsa_keygen(TEMPLATE *publ_tmpl, TEMPLATE *priv_tmpl) BNLength = BN_bn2bin(bignum, ssl_ptr); rc = build_attribute( CKA_COEFFICIENT, ssl_ptr, BNLength, &attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto done; } template_update_attribute( priv_tmpl, attr ); @@ -1082,7 +1082,7 @@ os_specific_rsa_keygen(TEMPLATE *publ_tmpl, TEMPLATE *priv_tmpl) flag = TRUE; rc = build_attribute( CKA_LOCAL, &flag, sizeof(CK_BBOOL), &attr ); if (rc != CKR_OK){ - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); goto done; } template_update_attribute( priv_tmpl, attr ); @@ -1100,7 +1100,7 @@ token_specific_rsa_generate_keypair( TEMPLATE * publ_tmpl, rc = os_specific_rsa_keygen(publ_tmpl,priv_tmpl); if (rc != CKR_OK) - TRACE_DEBUG("os_specific_rsa_keygen failed\n"); + TRACE_DEVEL("os_specific_rsa_keygen failed\n"); return rc; } @@ -1190,7 +1190,7 @@ token_specific_rsa_encrypt(CK_BYTE *in_data, CK_ULONG in_data_len, rc = rsa_format_block(in_data, in_data_len, clear, modulus_bytes, PKCS_BT_2); if (rc != CKR_OK) { - TRACE_DEBUG("rsa_format_block failed\n"); + TRACE_DEVEL("rsa_format_block failed\n"); return rc; } // Do an RSA public encryption @@ -1200,7 +1200,7 @@ token_specific_rsa_encrypt(CK_BYTE *in_data, CK_ULONG in_data_len, memcpy(out_data, cipher, modulus_bytes); *out_data_len = modulus_bytes; } else - TRACE_DEBUG("os_specific_rsa_encrypt failed\n"); + TRACE_DEVEL("os_specific_rsa_encrypt failed\n"); return rc; } @@ -1218,13 +1218,13 @@ token_specific_rsa_decrypt(CK_BYTE *in_data, CK_ULONG in_data_len, rc = os_specific_rsa_decrypt(in_data, modulus_bytes, out, key_obj); if (rc != CKR_OK) { - TRACE_DEBUG("os_specific_rsa_decrypt failed\n"); + TRACE_DEVEL("os_specific_rsa_decrypt failed\n"); return rc; } rc = rsa_parse_block(out, modulus_bytes, out_data, out_data_len, PKCS_BT_2); if (rc != CKR_OK) { - TRACE_DEBUG("rsa_parse_block failed\n"); + TRACE_DEVEL("rsa_parse_block failed\n"); return rc; } @@ -1259,7 +1259,7 @@ token_specific_rsa_sign(CK_BYTE *in_data, CK_ULONG in_data_len, modulus_bytes = attr->ulValueLen; rc = rsa_format_block(in_data, in_data_len, data, modulus_bytes, PKCS_BT_1); if (rc != CKR_OK) { - TRACE_DEBUG("rsa_format_block failed\n"); + TRACE_DEVEL("rsa_format_block failed\n"); return rc; } @@ -1269,7 +1269,7 @@ token_specific_rsa_sign(CK_BYTE *in_data, CK_ULONG in_data_len, memcpy(out_data, sig, modulus_bytes); *out_data_len = modulus_bytes; } else - TRACE_DEBUG("os_specific_rsa_decrypt failed\n"); + TRACE_DEVEL("os_specific_rsa_decrypt failed\n"); return rc; } @@ -1344,7 +1344,7 @@ token_specific_rsa_verify_recover(CK_BYTE *signature, CK_ULONG sig_len, // rc = os_specific_rsa_encrypt(signature, modulus_bytes, out, key_obj); if (rc != CKR_OK) { - TRACE_DEBUG("os_specific_rsa_encrypt failed\n"); + TRACE_DEVEL("os_specific_rsa_encrypt failed\n"); return rc; } @@ -1387,7 +1387,7 @@ CK_RV token_specific_rsa_pss_sign(SIGN_VERIFY_CONTEXT *ctx, CK_BYTE *in_data, /* get the key */ rc = object_mgr_find_in_map1(ctx->key, &key_obj); if (rc != CKR_OK) { - TRACE_DEBUG("object_mgr_find_in_map1 failed\n"); + TRACE_DEVEL("object_mgr_find_in_map1 failed\n"); return rc; } @@ -1413,7 +1413,7 @@ CK_RV token_specific_rsa_pss_sign(SIGN_VERIFY_CONTEXT *ctx, CK_BYTE *in_data, if (rc == CKR_OK) *sig_len = modbytes; else - TRACE_DEBUG("os_specific_rsa_decrypt failed\n"); + TRACE_DEVEL("os_specific_rsa_decrypt failed\n"); done: if (emdata) @@ -1450,14 +1450,14 @@ CK_RV token_specific_rsa_pss_verify(SIGN_VERIFY_CONTEXT *ctx, CK_BYTE *in_data, /* get the key */ rc = object_mgr_find_in_map1(ctx->key, &key_obj); if (rc != CKR_OK) { - TRACE_DEBUG("object_mgr_find_in_map1 failed\n"); + TRACE_DEVEL("object_mgr_find_in_map1 failed\n"); return rc; } /* verify is a public key operation ... encrypt */ rc = os_specific_rsa_encrypt(signature, sig_len, out, key_obj); if (rc != CKR_OK) { - TRACE_DEBUG("os_specific_rsa_encrypt failed\n"); + TRACE_DEVEL("os_specific_rsa_encrypt failed\n"); return rc; } @@ -1503,7 +1503,7 @@ token_specific_rsa_x509_encrypt(CK_BYTE *in_data, CK_ULONG in_data_len, memcpy(out_data, cipher, modulus_bytes); *out_data_len = modulus_bytes; } else - TRACE_DEBUG("os_specific_rsa_encrypt failed\n"); + TRACE_DEVEL("os_specific_rsa_encrypt failed\n"); return rc; } @@ -1531,7 +1531,7 @@ token_specific_rsa_x509_decrypt(CK_BYTE *in_data, CK_ULONG in_data_len, memcpy(out_data, out, modulus_bytes); *out_data_len = modulus_bytes; } else - TRACE_DEBUG("os_specific_rsa_decrypt failed\n"); + TRACE_DEVEL("os_specific_rsa_decrypt failed\n"); return rc; } @@ -1566,7 +1566,7 @@ token_specific_rsa_x509_sign(CK_BYTE *in_data, CK_ULONG in_data_len, memcpy(out_data, sig, modulus_bytes); *out_data_len = modulus_bytes; } else - TRACE_DEBUG("os_specific_rsa_decrypt failed\n"); + TRACE_DEVEL("os_specific_rsa_decrypt failed\n"); return rc; } @@ -1618,7 +1618,7 @@ token_specific_rsa_x509_verify(CK_BYTE *in_data, CK_ULONG in_data_len, } return CKR_OK; } else - TRACE_DEBUG("os_specific_rsa_encrypt failed\n"); + TRACE_DEVEL("os_specific_rsa_encrypt failed\n"); return rc; } @@ -1646,7 +1646,7 @@ token_specific_rsa_x509_verify_recover(CK_BYTE *signature, CK_ULONG sig_len, memcpy(out_data, out, modulus_bytes); *out_data_len = modulus_bytes; } else - TRACE_DEBUG("os_specific_rsa_encrypt failed\n"); + TRACE_DEVEL("os_specific_rsa_encrypt failed\n"); return rc; } @@ -1674,7 +1674,7 @@ CK_RV token_specific_rsa_oaep_encrypt(ENCR_DECR_CONTEXT *ctx, CK_BYTE *in_data, rc = object_mgr_find_in_map1(ctx->key, &key_obj); if (rc != CKR_OK) { - TRACE_DEBUG("object_mgr_find_in_map1 failed\n"); + TRACE_DEVEL("object_mgr_find_in_map1 failed\n"); return rc; } @@ -1704,7 +1704,7 @@ CK_RV token_specific_rsa_oaep_encrypt(ENCR_DECR_CONTEXT *ctx, CK_BYTE *in_data, memcpy(out_data, cipher, modulus_bytes); *out_data_len = modulus_bytes; } else - TRACE_DEBUG("os_specific_rsa_encrypt failed\n"); + TRACE_DEVEL("os_specific_rsa_encrypt failed\n"); done: if (em_data) free(em_data); @@ -1732,7 +1732,7 @@ CK_RV token_specific_rsa_oaep_decrypt(ENCR_DECR_CONTEXT *ctx, CK_BYTE *in_data, rc = object_mgr_find_in_map1(ctx->key, &key_obj); if (rc != CKR_OK) { - TRACE_DEBUG("object_mgr_find_in_map1 failed\n"); + TRACE_DEVEL("object_mgr_find_in_map1 failed\n"); return rc; } @@ -2013,7 +2013,7 @@ token_specific_dh_pkcs_key_pair_gen( TEMPLATE * publ_tmpl, rc = build_attribute( CKA_VALUE, temp_byte, temp_bn_len, &temp_attr ); // in bytes if (rc != CKR_OK) { - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); return CKR_FUNCTION_FAILED; } template_update_attribute( publ_tmpl, temp_attr ); @@ -2030,7 +2030,7 @@ token_specific_dh_pkcs_key_pair_gen( TEMPLATE * publ_tmpl, rc = build_attribute( CKA_VALUE, temp_byte, temp_bn_len, &temp_attr ); // in bytes if (rc != CKR_OK) { - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); return CKR_FUNCTION_FAILED; } template_update_attribute( priv_tmpl, temp_attr ); @@ -2049,7 +2049,7 @@ token_specific_dh_pkcs_key_pair_gen( TEMPLATE * publ_tmpl, prime_attr->ulValueLen, &temp_attr ); // in bytes if (rc != CKR_OK) { - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); return CKR_FUNCTION_FAILED; } template_update_attribute( priv_tmpl, temp_attr ); @@ -2058,7 +2058,7 @@ token_specific_dh_pkcs_key_pair_gen( TEMPLATE * publ_tmpl, base_attr->ulValueLen, &temp_attr ); // in bytes if (rc != CKR_OK) { - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); return CKR_FUNCTION_FAILED; } template_update_attribute( priv_tmpl, temp_attr ); diff --git a/usr/lib/pkcs11/tpm_stdll/tpm_openssl.c b/usr/lib/pkcs11/tpm_stdll/tpm_openssl.c index 7be6d1d5..9b773d8c 100644 --- a/usr/lib/pkcs11/tpm_stdll/tpm_openssl.c +++ b/usr/lib/pkcs11/tpm_stdll/tpm_openssl.c @@ -86,7 +86,7 @@ regen_rsa_key: RSA_free(rsa); counter++; if (counter == KEYGEN_RETRY) { - TRACE_DEBUG("Tried %d times to generate a " + TRACE_DEVEL("Tried %d times to generate a " "valid RSA key, failed.\n", KEYGEN_RETRY); return NULL; diff --git a/usr/lib/pkcs11/tpm_stdll/tpm_specific.c b/usr/lib/pkcs11/tpm_stdll/tpm_specific.c index 0adf5817..d573932c 100644 --- a/usr/lib/pkcs11/tpm_stdll/tpm_specific.c +++ b/usr/lib/pkcs11/tpm_stdll/tpm_specific.c @@ -275,7 +275,7 @@ token_get_key_blob(CK_OBJECT_HANDLE ckKey, CK_ULONG *blob_size, CK_BYTE **ret_bl /* find object the first time to return the size of the buffer needed */ if ((rc = object_mgr_get_attribute_values(&dummy_sess, ckKey, tmpl, 1))) { - TRACE_DEBUG("object_mgr_get_attribute_values failed:rc=0x%lx\n", + TRACE_DEVEL("object_mgr_get_attribute_values failed:rc=0x%lx\n", rc); goto done; } @@ -290,7 +290,7 @@ token_get_key_blob(CK_OBJECT_HANDLE ckKey, CK_ULONG *blob_size, CK_BYTE **ret_bl tmpl[0].pValue = blob; /* find object the 2nd time to fill the buffer with data */ if ((rc = object_mgr_get_attribute_values(&dummy_sess, ckKey, tmpl, 1))) { - TRACE_DEBUG("object_mgr_get_attribute_values failed:rc=0x%lx\n", + TRACE_DEVEL("object_mgr_get_attribute_values failed:rc=0x%lx\n", rc); goto done; } @@ -328,7 +328,7 @@ token_wrap_sw_key(int size_n, unsigned char *n, int size_p, unsigned char *p, result = util_set_public_modulus(*phKey, size_n, n); if (result != TSS_SUCCESS) { - TRACE_DEBUG("util_set_public_modulus failed:rc=0x%x\n", result); + TRACE_DEVEL("util_set_public_modulus failed:rc=0x%x\n", result); Tspi_Context_CloseObject(tspContext, *phKey); *phKey = NULL_HKEY; return result; @@ -445,7 +445,7 @@ token_wrap_key_object( CK_OBJECT_HANDLE ckObject, TSS_HKEY hParentKey, TSS_HKEY UINT32 ulBlobLen; if ((rc = object_mgr_find_in_map1(ckObject, &obj))) { - TRACE_DEBUG("object_mgr_find_in_map1 failed. rc=0x%lx\n", rc); + TRACE_DEVEL("object_mgr_find_in_map1 failed. rc=0x%lx\n", rc); return rc; } @@ -513,13 +513,13 @@ token_wrap_key_object( CK_OBJECT_HANDLE ckObject, TSS_HKEY hParentKey, TSS_HKEY hParentKey, TSS_KEY_TYPE_LEGACY | TSS_KEY_NO_AUTHORIZATION, phKey))) { - TRACE_DEBUG("token_wrap_sw_key failed. rc=0x%lu\n", rc); + TRACE_DEVEL("token_wrap_sw_key failed. rc=0x%lu\n", rc); return rc; } } else if (class == CKO_PUBLIC_KEY) { /* Make sure the public exponent is usable */ if ((util_check_public_exponent(obj->template))) { - TRACE_DEBUG("Invalid public exponent\n"); + TRACE_DEVEL("Invalid public exponent\n"); return CKR_TEMPLATE_INCONSISTENT; } @@ -548,7 +548,7 @@ token_wrap_key_object( CK_OBJECT_HANDLE ckObject, TSS_HKEY hParentKey, TSS_HKEY } if ((result = util_set_public_modulus(*phKey, attr->ulValueLen, attr->pValue))) { - TRACE_DEBUG("util_set_public_modulus failed: 0x%x\n", + TRACE_DEVEL("util_set_public_modulus failed: 0x%x\n", result); Tspi_Context_CloseObject(tspContext, *phKey); *phKey = NULL_HKEY; @@ -569,7 +569,7 @@ token_wrap_key_object( CK_OBJECT_HANDLE ckObject, TSS_HKEY hParentKey, TSS_HKEY /* insert the key blob into the object */ if ((rc = build_attribute(CKA_IBM_OPAQUE, rgbBlob, ulBlobLen, &new_attr))) { - TRACE_DEBUG("build_atribute failed\n"); + TRACE_DEVEL("build_atribute failed\n"); Tspi_Context_FreeMemory(tspContext, rgbBlob); return rc; } @@ -599,15 +599,15 @@ token_load_key(CK_OBJECT_HANDLE ckKey, TSS_HKEY hParentKey, CK_CHAR_PTR passHash if ((rc = token_get_key_blob(ckKey, &ulBlobSize, &blob))) { if (rc != CKR_ATTRIBUTE_TYPE_INVALID) { - TRACE_DEBUG("token_get_key_blob failed. rc=0x%lx\n", + TRACE_DEVEL("token_get_key_blob failed. rc=0x%lx\n", rc); return rc; } /* the key blob wasn't found, so check for a modulus * to load */ - TRACE_DEBUG("key blob not found, checking for modulus\n"); + TRACE_DEVEL("key blob not found, checking for modulus\n"); if ((rc = token_wrap_key_object(ckKey, hParentKey, phKey))) { - TRACE_DEBUG("token_wrap_key_object failed. rc=0x%lx\n", + TRACE_DEVEL("token_wrap_key_object failed. rc=0x%lx\n", rc); return rc; } @@ -720,7 +720,7 @@ token_load_public_root_key() return TSS_SUCCESS; if ((result = token_load_srk())) { - TRACE_DEBUG("token_load_srk failed. rc=0x%x\n", result); + TRACE_DEVEL("token_load_srk failed. rc=0x%x\n", result); return result; } @@ -730,7 +730,7 @@ token_load_public_root_key() } if ((result = token_get_key_blob(ckPublicRootKey, &blob_size, &blob))) { - TRACE_DEBUG("token_get_key_blob failed. rc=0x%x\n", result); + TRACE_DEVEL("token_get_key_blob failed. rc=0x%x\n", result); return CKR_FUNCTION_FAILED; } @@ -920,7 +920,7 @@ token_store_priv_key(TSS_HKEY hKey, int key_type, CK_OBJECT_HANDLE *ckKey) /* create skeleton for the private key object */ if ((rc = object_create_skel(NULL, 0, MODE_KEYGEN, CKO_PRIVATE_KEY, CKK_RSA, &priv_key_obj))) { - TRACE_DEBUG("objectr_create_skel: 0x%lx\n", rc); + TRACE_DEVEL("objectr_create_skel: 0x%lx\n", rc); Tspi_Context_FreeMemory(tspContext, rgbBlob); Tspi_Context_FreeMemory(tspContext, rgbPrivBlob); free(key_id); @@ -929,7 +929,7 @@ token_store_priv_key(TSS_HKEY hKey, int key_type, CK_OBJECT_HANDLE *ckKey) /* add the ID attribute */ if ((rc = build_attribute(CKA_ID, key_id, strlen((char *)key_id), &new_attr))) { - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); Tspi_Context_FreeMemory(tspContext, rgbBlob); Tspi_Context_FreeMemory(tspContext, rgbPrivBlob); free(key_id); @@ -940,7 +940,7 @@ token_store_priv_key(TSS_HKEY hKey, int key_type, CK_OBJECT_HANDLE *ckKey) /* add the key blob to the PKCS#11 object template */ if ((rc = build_attribute(CKA_IBM_OPAQUE, rgbBlob, ulBlobLen, &new_attr))) { - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); Tspi_Context_FreeMemory(tspContext, rgbBlob); Tspi_Context_FreeMemory(tspContext, rgbPrivBlob); return rc; @@ -950,7 +950,7 @@ token_store_priv_key(TSS_HKEY hKey, int key_type, CK_OBJECT_HANDLE *ckKey) /* add the private key blob to the PKCS#11 object template */ if ((rc = build_attribute(CKA_MODULUS, rgbPrivBlob, ulPrivBlobLen, &new_attr))) { - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); Tspi_Context_FreeMemory(tspContext, rgbPrivBlob); return rc; } @@ -960,7 +960,7 @@ token_store_priv_key(TSS_HKEY hKey, int key_type, CK_OBJECT_HANDLE *ckKey) /* add the HIDDEN attribute */ flag = TRUE; if ((rc = build_attribute(CKA_HIDDEN, &flag, sizeof(CK_BBOOL), &new_attr))) { - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); free(key_id); return rc; } @@ -968,34 +968,34 @@ token_store_priv_key(TSS_HKEY hKey, int key_type, CK_OBJECT_HANDLE *ckKey) /* set CKA_ALWAYS_SENSITIVE to true */ if ((rc = build_attribute( CKA_ALWAYS_SENSITIVE, &flag, sizeof(CK_BBOOL), &new_attr ))) { - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); return rc; } template_update_attribute( priv_key_obj->template, new_attr ); /* set CKA_NEVER_EXTRACTABLE to true */ if ((rc = build_attribute( CKA_NEVER_EXTRACTABLE, &flag, sizeof(CK_BBOOL), &new_attr ))) { - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); return rc; } template_update_attribute( priv_key_obj->template, new_attr ); /* make the object reside on the token, as if that were possible */ if ((rc = build_attribute( CKA_TOKEN, &flag, sizeof(CK_BBOOL), &new_attr ))) { - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); return rc; } template_update_attribute( priv_key_obj->template, new_attr ); flag = FALSE; if ((rc = build_attribute( CKA_PRIVATE, &flag, sizeof(CK_BBOOL), &new_attr ))) { - TRACE_DEBUG("build_attribute failed\n"); + TRACE_DEVEL("build_attribute failed\n"); return rc; } template_update_attribute( priv_key_obj->template, new_attr ); if ((rc = object_mgr_create_final(&dummy_sess, priv_key_obj, ckKey))) { - TRACE_DEBUG("object_mgr_create_final failed.\n"); + TRACE_DEVEL("object_mgr_create_final failed.\n"); } return rc; @@ -1043,7 +1043,7 @@ token_store_pub_key(TSS_HKEY hKey, int key_type, CK_OBJECT_HANDLE *ckKey) /* create skeleton for the private key object */ if ((rc = object_create_skel(pub_tmpl, 5, MODE_CREATE, CKO_PUBLIC_KEY, CKK_RSA, &pub_key_obj))) { - TRACE_DEBUG("object_create_skel: 0x%lx\n", rc); + TRACE_DEVEL("object_create_skel: 0x%lx\n", rc); Tspi_Context_CloseObject(tspContext, hKey); free(key_id); return rc; @@ -1052,20 +1052,20 @@ token_store_pub_key(TSS_HKEY hKey, int key_type, CK_OBJECT_HANDLE *ckKey) /* make the object reside on the token, as if that were possible */ if ((rc = build_attribute( CKA_TOKEN, &flag, sizeof(CK_BBOOL), &new_attr ))) { - TRACE_DEBUG("build attribute failed.\n"); + TRACE_DEVEL("build attribute failed.\n"); goto done; } template_update_attribute( pub_key_obj->template, new_attr ); /* set the object to be hidden */ if ((rc = build_attribute( CKA_HIDDEN, &flag, sizeof(CK_BBOOL), &new_attr ))) { - TRACE_DEBUG("build attribute failed.\n"); + TRACE_DEVEL("build attribute failed.\n"); goto done; } template_update_attribute( pub_key_obj->template, new_attr ); if ((rc = object_mgr_create_final(&dummy_sess, pub_key_obj, ckKey))) { - TRACE_DEBUG("object_mgr_create_final failed\n"); + TRACE_DEVEL("object_mgr_create_final failed\n"); goto done; } @@ -1092,12 +1092,12 @@ token_update_private_key(TSS_HKEY hKey, int key_type) /* destroy the private key and create a new one */ if ((rc = object_mgr_destroy_object(&dummy_sess, ckHandle))) { - TRACE_DEBUG("object_mgr_destroy_object failed: 0x%lx\n", rc); + TRACE_DEVEL("object_mgr_destroy_object failed: 0x%lx\n", rc); return rc; } if ((rc = token_store_priv_key(hKey, key_type, &ckHandle))) { - TRACE_DEBUG("token_store_priv_key failed: 0x%lx\n", rc); + TRACE_DEVEL("token_store_priv_key failed: 0x%lx\n", rc); } return rc; @@ -1110,13 +1110,13 @@ token_store_tss_key(TSS_HKEY hKey, int key_type, CK_OBJECT_HANDLE *ckKey) /* create a PKCS#11 pub key object for the key */ if ((rc = token_store_pub_key(hKey, key_type, ckKey))) { - TRACE_DEBUG("token_store_pub_key failed. rc=0x%lx\n", rc); + TRACE_DEVEL("token_store_pub_key failed. rc=0x%lx\n", rc); return rc; } /* create a PKCS#11 private key object for the key */ if ((rc = token_store_priv_key(hKey, key_type, ckKey))) { - TRACE_DEBUG("token_store_priv_key failed. rc=0x%lx\n", rc); + TRACE_DEVEL("token_store_priv_key failed. rc=0x%lx\n", rc); } return rc; @@ -1153,7 +1153,7 @@ token_generate_leaf_key(int key_type, CK_CHAR_PTR passHash, TSS_HKEY *phKey) } if ((rc = token_store_tss_key(*phKey, key_type, ckKey))) { - TRACE_DEBUG("token_store_tss_key failed. rc=0x%x\n", result); + TRACE_DEVEL("token_store_tss_key failed. rc=0x%x\n", result); } done: @@ -1215,7 +1215,7 @@ token_create_private_tree(CK_BYTE *pinHash, CK_BYTE *pPin) return CKR_HOST_MEMORY; if (openssl_get_modulus_and_prime(rsa, &size_n, n, &size_p, p) != 0) { - TRACE_DEBUG("openssl_get_modulus_and_prime failed\n"); + TRACE_DEVEL("openssl_get_modulus_and_prime failed\n"); return CKR_FUNCTION_FAILED; } @@ -1223,12 +1223,12 @@ token_create_private_tree(CK_BYTE *pinHash, CK_BYTE *pPin) if ((rc = token_wrap_sw_key(size_n, n, size_p, p, hSRK, TSS_KEY_NO_AUTHORIZATION | TSS_KEY_TYPE_STORAGE, &hPrivateRootKey))) { - TRACE_DEBUG("token_wrap_sw_key failed. rc=0x%lu\n", rc); + TRACE_DEVEL("token_wrap_sw_key failed. rc=0x%lu\n", rc); return rc; } if (openssl_write_key(rsa, TPMTOK_PRIV_ROOT_KEY_FILE, pPin)) { - TRACE_DEBUG("openssl_write_key failed.\n"); + TRACE_DEVEL("openssl_write_key failed.\n"); RSA_free(rsa); return CKR_FUNCTION_FAILED; } @@ -1237,7 +1237,7 @@ token_create_private_tree(CK_BYTE *pinHash, CK_BYTE *pPin) /* store the user base key in a PKCS#11 object internally */ if ((rc = token_store_tss_key(hPrivateRootKey, TPMTOK_PRIVATE_ROOT_KEY, &ckPrivateRootKey))) { - TRACE_DEBUG("token_store_tss_key failed. rc=0x%lx\n", rc); + TRACE_DEVEL("token_store_tss_key failed. rc=0x%lx\n", rc); return rc; } @@ -1250,7 +1250,7 @@ token_create_private_tree(CK_BYTE *pinHash, CK_BYTE *pPin) /* generate the private leaf key */ if ((rc = token_generate_leaf_key(TPMTOK_PRIVATE_LEAF_KEY, pinHash, &hPrivateLeafKey))) { - TRACE_DEBUG("token_generate_leaf_key failed. rc=0x%lx\n", rc); + TRACE_DEVEL("token_generate_leaf_key failed. rc=0x%lx\n", rc); return rc; } @@ -1280,7 +1280,7 @@ token_create_public_tree(CK_BYTE *pinHash, CK_BYTE *pPin) return CKR_HOST_MEMORY; if (openssl_get_modulus_and_prime(rsa, &size_n, n, &size_p, p) != 0) { - TRACE_DEBUG("openssl_get_modulus_and_prime failed\n"); + TRACE_DEVEL("openssl_get_modulus_and_prime failed\n"); return CKR_FUNCTION_FAILED; } @@ -1288,12 +1288,12 @@ token_create_public_tree(CK_BYTE *pinHash, CK_BYTE *pPin) if ((rc = token_wrap_sw_key(size_n, n, size_p, p, hSRK, TSS_KEY_NO_AUTHORIZATION | TSS_KEY_TYPE_STORAGE, &hPublicRootKey))) { - TRACE_DEBUG("token_wrap_sw_key failed. rc=0x%lx\n", rc); + TRACE_DEVEL("token_wrap_sw_key failed. rc=0x%lx\n", rc); return rc; } if (openssl_write_key(rsa, TPMTOK_PUB_ROOT_KEY_FILE, pPin)) { - TRACE_DEBUG("openssl_write_key\n"); + TRACE_DEVEL("openssl_write_key\n"); RSA_free(rsa); return CKR_FUNCTION_FAILED; } @@ -1308,13 +1308,13 @@ token_create_public_tree(CK_BYTE *pinHash, CK_BYTE *pPin) } if ((rc = token_store_tss_key(hPublicRootKey, TPMTOK_PUBLIC_ROOT_KEY, &ckPublicRootKey))) { - TRACE_DEBUG("token_store_tss_key failed. rc=0x%lx\n", rc); + TRACE_DEVEL("token_store_tss_key failed. rc=0x%lx\n", rc); return rc; } /* create the SO's leaf key */ if ((rc = token_generate_leaf_key(TPMTOK_PUBLIC_LEAF_KEY, pinHash, &hPublicLeafKey))) { - TRACE_DEBUG("token_generate_leaf_key failed. rc=0x%lx\n", rc); + TRACE_DEVEL("token_generate_leaf_key failed. rc=0x%lx\n", rc); return rc; } @@ -1364,7 +1364,7 @@ token_migrate(int key_type, CK_BYTE *pin) if ((rc = openssl_read_key(backup_loc, pin, &rsa))) { if (rc == CKR_FILE_NOT_FOUND) rc = CKR_FUNCTION_FAILED; - TRACE_DEBUG("openssl_read_key failed\n"); + TRACE_DEVEL("openssl_read_key failed\n"); return rc; } @@ -1372,14 +1372,14 @@ token_migrate(int key_type, CK_BYTE *pin) * We will now try to re-wrap that key with the current SRK */ if (openssl_get_modulus_and_prime(rsa, &size_n, n, &size_p, p) != 0) { - TRACE_DEBUG("openssl_get_modulus_and_prime failed\n"); + TRACE_DEVEL("openssl_get_modulus_and_prime failed\n"); return CKR_FUNCTION_FAILED; } if ((rc = token_wrap_sw_key(size_n, n, size_p, p, hSRK, TSS_KEY_TYPE_STORAGE | TSS_KEY_NO_AUTHORIZATION, phKey))) { - TRACE_DEBUG("token_wrap_sw_key failed. rc=0x%lx\n", rc); + TRACE_DEVEL("token_wrap_sw_key failed. rc=0x%lx\n", rc); RSA_free(rsa); return rc; } @@ -1401,7 +1401,7 @@ token_migrate(int key_type, CK_BYTE *pin) } if ((rc = object_mgr_destroy_object(&dummy_sess, *ckHandle))) { - TRACE_DEBUG("object_mgr_destroy_object failed: 0x%lx\n", rc); + TRACE_DEVEL("object_mgr_destroy_object failed: 0x%lx\n", rc); return rc; } @@ -1411,12 +1411,12 @@ token_migrate(int key_type, CK_BYTE *pin) } if ((rc = object_mgr_destroy_object(&dummy_sess, *ckHandle))) { - TRACE_DEBUG("object_mgr_destroy_object failed: 0x%lx\n", rc); + TRACE_DEVEL("object_mgr_destroy_object failed: 0x%lx\n", rc); return rc; } if ((rc = token_store_tss_key(*phKey, key_type, ckHandle))) { - TRACE_DEBUG("token_store_tss_key failed: 0x%lx\n", rc); + TRACE_DEVEL("token_store_tss_key failed: 0x%lx\n", rc); return rc; } @@ -1533,7 +1533,7 @@ load_masterkey_private() /* create the private master key, then save */ if ((rc = token_specific_rng(master_key_private, MK_SIZE))) { - TRACE_DEBUG("token_rng failed. rc=0x%lx\n", rc); + TRACE_DEVEL("token_rng failed. rc=0x%lx\n", rc); return rc; } @@ -1600,7 +1600,7 @@ token_specific_login(SESSION *sess, CK_USER_TYPE userType, CK_CHAR_PTR pPin, CK_ TSS_RESULT result; if ((result = token_load_srk())) { - TRACE_DEBUG("token_load_srk failed. rc=0x%x\n", result); + TRACE_DEVEL("token_load_srk failed. rc=0x%x\n", result); return CKR_FUNCTION_FAILED; } @@ -1612,7 +1612,7 @@ token_specific_login(SESSION *sess, CK_USER_TYPE userType, CK_CHAR_PTR pPin, CK_ if (userType == CKU_USER) { /* If the public root key doesn't exist yet, the SO hasn't init'd the token */ if ((result = token_load_public_root_key())) { - TRACE_DEBUG("token_load_public_root_key failed. " + TRACE_DEVEL("token_load_public_root_key failed. " "rc=0x%x\n", result); return CKR_USER_PIN_NOT_INITIALIZED; } @@ -1630,7 +1630,7 @@ token_specific_login(SESSION *sess, CK_USER_TYPE userType, CK_CHAR_PTR pPin, CK_ } if ((rc = token_load_key(ckPrivateRootKey, hSRK, NULL, &hPrivateRootKey))) { - TRACE_DEBUG("token_load_key failed. rc=0x%lx\n", rc); + TRACE_DEVEL("token_load_key failed. rc=0x%lx\n", rc); /* Here, we've found the private root key, but its load failed. * This should only happen in a migration path, where we have @@ -1641,7 +1641,7 @@ token_specific_login(SESSION *sess, CK_USER_TYPE userType, CK_CHAR_PTR pPin, CK_ * re-wrap the private root key to the new SRK. */ if ((token_migrate(TPMTOK_PRIVATE_ROOT_KEY, pPin))) { - TRACE_DEBUG("token_migrate. rc=0x%lx\n", rc); + TRACE_DEVEL("token_migrate. rc=0x%lx\n", rc); return rc; } @@ -1658,12 +1658,12 @@ token_specific_login(SESSION *sess, CK_USER_TYPE userType, CK_CHAR_PTR pPin, CK_ } if ((rc = token_load_key(ckPrivateLeafKey, hPrivateRootKey, hash_sha, &hPrivateLeafKey))) { - TRACE_DEBUG("token_load_key failed. rc=0x%lx\n", rc); + TRACE_DEVEL("token_load_key failed. rc=0x%lx\n", rc); return CKR_FUNCTION_FAILED; } if ((rc = token_verify_pin(hPrivateLeafKey))) { - TRACE_DEBUG("token_verify_pin failed. failed. rc=0x%lx\n", rc); + TRACE_DEVEL("token_verify_pin failed. failed. rc=0x%lx\n", rc); return rc; } @@ -1671,7 +1671,7 @@ token_specific_login(SESSION *sess, CK_USER_TYPE userType, CK_CHAR_PTR pPin, CK_ /* load private data encryption key here */ if ((rc = load_masterkey_private())) { - TRACE_DEBUG("load_masterkey_private failed. rc=0x%lx\n", rc); + TRACE_DEVEL("load_masterkey_private failed. rc=0x%lx\n", rc); Tspi_Key_UnloadKey(hPrivateLeafKey); hPrivateLeafKey = NULL_HKEY; return rc; @@ -1701,7 +1701,7 @@ token_specific_login(SESSION *sess, CK_USER_TYPE userType, CK_CHAR_PTR pPin, CK_ /* The SO's key hierarchy has previously been created, so load the key * hierarchy and verify the pin using the TPM. */ if ((rc = token_load_key(ckPublicRootKey, hSRK, NULL, &hPublicRootKey))) { - TRACE_DEBUG("token_load_key failed. rc=0x%lx\n", rc); + TRACE_DEVEL("token_load_key failed. rc=0x%lx\n", rc); /* Here, we've found the public root key, but its load failed. * This should only happen in a migration path, where we have @@ -1712,7 +1712,7 @@ token_specific_login(SESSION *sess, CK_USER_TYPE userType, CK_CHAR_PTR pPin, CK_ * re-wrap the public root key to the new SRK. */ if ((token_migrate(TPMTOK_PUBLIC_ROOT_KEY, pPin))) { - TRACE_DEBUG("token_migrate. rc=0x%lx\n", rc); + TRACE_DEVEL("token_migrate. rc=0x%lx\n", rc); return rc; } @@ -1729,12 +1729,12 @@ token_specific_login(SESSION *sess, CK_USER_TYPE userType, CK_CHAR_PTR pPin, CK_ } if ((rc = token_load_key(ckPublicLeafKey, hPublicRootKey, hash_sha, &hPublicLeafKey))) { - TRACE_DEBUG("token_load_key failed. rc=0x%lx\n", rc); + TRACE_DEVEL("token_load_key failed. rc=0x%lx\n", rc); return CKR_FUNCTION_FAILED; } if ((rc = token_verify_pin(hPublicLeafKey))) { - TRACE_DEBUG("token_verify_pin failed. rc=0x%lx\n", rc); + TRACE_DEVEL("token_verify_pin failed. rc=0x%lx\n", rc); return rc; } @@ -1816,25 +1816,25 @@ verify_user_pin(CK_BYTE *hash_sha) if ((rc = token_load_key(ckPrivateRootKey, hSRK, NULL, &hPrivateRootKey))) { - TRACE_DEBUG("token_load_key failed. rc=0x%lx\n", rc); + TRACE_DEVEL("token_load_key failed. rc=0x%lx\n", rc); return CKR_FUNCTION_FAILED; } /* find, load the user leaf key */ if ((rc = token_find_key(TPMTOK_PRIVATE_LEAF_KEY, CKO_PRIVATE_KEY, &ckPrivateLeafKey))) { - TRACE_DEBUG("token_find_key failed. rc=0x%lx\n", rc); + TRACE_DEVEL("token_find_key failed. rc=0x%lx\n", rc); return CKR_FUNCTION_FAILED; } if ((rc = token_load_key(ckPrivateLeafKey, hPrivateRootKey, hash_sha, &hPrivateLeafKey))) { - TRACE_DEBUG("token_load_key failed. rc=0x%lx\n", rc); + TRACE_DEVEL("token_load_key failed. rc=0x%lx\n", rc); return CKR_FUNCTION_FAILED; } if ((rc = token_verify_pin(hPrivateLeafKey))) { - TRACE_DEBUG("token_verify_pin failed. failed. rc=0x%lx\n", rc); + TRACE_DEVEL("token_verify_pin failed. failed. rc=0x%lx\n", rc); return rc; } @@ -1866,7 +1866,7 @@ token_specific_set_pin(SESSION *sess, } if ((result = token_load_srk())) { - TRACE_DEBUG("token_load_srk failed. rc=0x%x\n", result); + TRACE_DEVEL("token_load_srk failed. rc=0x%x\n", result); return CKR_FUNCTION_FAILED; } @@ -1891,7 +1891,7 @@ token_specific_set_pin(SESSION *sess, if ((rc = token_create_private_tree(newpin_hash, pNewPin))) { - TRACE_DEBUG("FAILED creating USER tree.\n"); + TRACE_DEVEL("FAILED creating USER tree.\n"); return CKR_FUNCTION_FAILED; } @@ -1927,7 +1927,7 @@ token_specific_set_pin(SESSION *sess, /* destroy the old PKCS#11 priv key object and create a new one */ if ((rc = token_update_private_key(hPrivateLeafKey, TPMTOK_PRIVATE_LEAF_KEY))) { - TRACE_DEBUG("token_update_private_key failed.\n"); + TRACE_DEVEL("token_update_private_key failed.\n"); return rc; } @@ -1939,14 +1939,14 @@ token_specific_set_pin(SESSION *sess, return CKR_OK; } - TRACE_DEBUG("openssl_read_key failed\n"); + TRACE_DEVEL("openssl_read_key failed\n"); return rc; } /* write it out using the new pin */ if ((rc = openssl_write_key(rsa_root, TPMTOK_PRIV_ROOT_KEY_FILE, pNewPin))) { RSA_free(rsa_root); - TRACE_DEBUG("openssl_write_key failed\n"); + TRACE_DEVEL("openssl_write_key failed\n"); return CKR_FUNCTION_FAILED; } RSA_free(rsa_root); @@ -1963,7 +1963,7 @@ token_specific_set_pin(SESSION *sess, } if ((rc = token_create_public_tree(newpin_hash, pNewPin))) { - TRACE_DEBUG("FAILED creating SO tree.\n"); + TRACE_DEVEL("FAILED creating SO tree.\n"); return CKR_FUNCTION_FAILED; } @@ -1988,7 +1988,7 @@ token_specific_set_pin(SESSION *sess, } if ((rc = token_update_private_key(hPublicLeafKey, TPMTOK_PUBLIC_LEAF_KEY))) { - TRACE_DEBUG("token_update_private_key failed.\n"); + TRACE_DEVEL("token_update_private_key failed.\n"); return rc; } @@ -2000,14 +2000,14 @@ token_specific_set_pin(SESSION *sess, return CKR_OK; } - TRACE_DEBUG("openssl_read_key failed\n"); + TRACE_DEVEL("openssl_read_key failed\n"); return rc; } /* write it out using the new pin */ if ((rc = openssl_write_key(rsa_root, TPMTOK_PUB_ROOT_KEY_FILE, pNewPin))) { RSA_free(rsa_root); - TRACE_DEBUG("openssl_write_key failed\n"); + TRACE_DEVEL("openssl_write_key failed\n"); return CKR_FUNCTION_FAILED; } RSA_free(rsa_root); @@ -2093,13 +2093,13 @@ token_specific_init_token(CK_SLOT_ID sid, CK_CHAR_PTR pPin, CK_ULONG ulPinLen, } if ((rc = token_load_srk())) { - TRACE_DEBUG("token_load_srk failed. rc = 0x%lx\n", rc); + TRACE_DEVEL("token_load_srk failed. rc = 0x%lx\n", rc); return CKR_FUNCTION_FAILED; } /* we found the root key, so check by loading the chain */ if ((rc = token_load_key(ckPublicRootKey, hSRK, NULL, &hPublicRootKey))) { - TRACE_DEBUG("token_load_key failed. rc=0x%lx\n", rc); + TRACE_DEVEL("token_load_key failed. rc=0x%lx\n", rc); return CKR_FUNCTION_FAILED; } @@ -2110,12 +2110,12 @@ token_specific_init_token(CK_SLOT_ID sid, CK_CHAR_PTR pPin, CK_ULONG ulPinLen, } if ((rc = token_load_key(ckPublicLeafKey, hPublicRootKey, hash_sha, &hPublicLeafKey))) { - TRACE_DEBUG("token_load_key(MigLeafKey) Failed.\n"); + TRACE_DEVEL("token_load_key(MigLeafKey) Failed.\n"); return CKR_FUNCTION_FAILED; } if ((rc = token_verify_pin(hPublicLeafKey))) { - TRACE_DEBUG("token_verify_pin failed. rc=0x%lx\n", rc); + TRACE_DEVEL("token_verify_pin failed. rc=0x%lx\n", rc); return rc; } @@ -2140,7 +2140,7 @@ done: rc = save_token_data(sid); if (rc != CKR_OK) { - TRACE_DEBUG("save_token_data failed.\n"); + TRACE_DEVEL("save_token_data failed.\n"); return rc; } @@ -2506,13 +2506,13 @@ token_wrap_auth_data(CK_BYTE *authData, TEMPLATE *publ_tmpl, TEMPLATE *priv_tmpl } if ((rc = build_attribute( CKA_ENC_AUTHDATA, blob, blob_size, &new_attr ))) { - TRACE_DEBUG("build_attribute failed.\n"); + TRACE_DEVEL("build_attribute failed.\n"); return rc; } template_update_attribute( publ_tmpl, new_attr ); if ((rc = build_attribute( CKA_ENC_AUTHDATA, blob, blob_size, &new_attr ))) { - TRACE_DEBUG("build_attribute failed.\n"); + TRACE_DEVEL("build_attribute failed.\n"); return rc; } template_update_attribute( priv_tmpl, new_attr ); @@ -2607,7 +2607,7 @@ token_specific_rsa_generate_keypair( TEMPLATE * publ_tmpl, /* Make sure the public exponent is usable */ if ((util_check_public_exponent(publ_tmpl))) { - TRACE_DEBUG("Invalid public exponent\n"); + TRACE_DEVEL("Invalid public exponent\n"); return CKR_TEMPLATE_INCONSISTENT; } @@ -2629,7 +2629,7 @@ token_specific_rsa_generate_keypair( TEMPLATE * publ_tmpl, initFlags |= TSS_KEY_TYPE_LEGACY | TSS_KEY_NO_AUTHORIZATION | TSS_KEY_MIGRATABLE; if ((result = token_load_public_root_key())) { - TRACE_DEBUG("token_load_public_root_key failed. " + TRACE_DEVEL("token_load_public_root_key failed. " "rc=%x\n", result); return CKR_FUNCTION_FAILED; } @@ -2641,7 +2641,7 @@ token_specific_rsa_generate_keypair( TEMPLATE * publ_tmpl, /* get a random SHA1 hash for the auth data */ if ((rc = token_specific_rng(authHash, SHA1_HASH_SIZE))) { - TRACE_DEBUG("token_rng failed. rc=%lx\n", rc); + TRACE_DEVEL("token_rng failed. rc=%lx\n", rc); return CKR_FUNCTION_FAILED; } @@ -2653,7 +2653,7 @@ token_specific_rsa_generate_keypair( TEMPLATE * publ_tmpl, /* get a random SHA1 hash for the auth data */ if ((rc = token_specific_rng(authHash, SHA1_HASH_SIZE))) { - TRACE_DEBUG("token_rng failed. rc=0x%lx\n", rc); + TRACE_DEVEL("token_rng failed. rc=0x%lx\n", rc); return CKR_FUNCTION_FAILED; } @@ -2673,13 +2673,13 @@ token_specific_rsa_generate_keypair( TEMPLATE * publ_tmpl, } if ((rc = build_attribute(CKA_IBM_OPAQUE, rgbBlob, ulBlobLen, &attr))) { - TRACE_DEBUG("build_attribute(CKA_IBM_OPAQUE) failed.\n"); + TRACE_DEVEL("build_attribute(CKA_IBM_OPAQUE) failed.\n"); Tspi_Context_FreeMemory(tspContext, rgbBlob); return rc; } template_update_attribute( priv_tmpl, attr ); if ((rc = build_attribute(CKA_IBM_OPAQUE, rgbBlob, ulBlobLen, &attr))) { - TRACE_DEBUG("build_attribute(CKA_IBM_OPAQUE) failed.\n"); + TRACE_DEVEL("build_attribute(CKA_IBM_OPAQUE) failed.\n"); Tspi_Context_FreeMemory(tspContext, rgbBlob); return rc; } @@ -2697,7 +2697,7 @@ token_specific_rsa_generate_keypair( TEMPLATE * publ_tmpl, /* add the public key blob to the object template */ if ((rc = build_attribute(CKA_MODULUS, rgbBlob, ulBlobLen, &attr))) { - TRACE_DEBUG("build_attribute(CKA_MODULUS) failed.\n"); + TRACE_DEVEL("build_attribute(CKA_MODULUS) failed.\n"); Tspi_Context_FreeMemory(tspContext, rgbBlob); return rc; } @@ -2705,7 +2705,7 @@ token_specific_rsa_generate_keypair( TEMPLATE * publ_tmpl, /* add the public key blob to the object template */ if ((rc = build_attribute(CKA_MODULUS, rgbBlob, ulBlobLen, &attr))) { - TRACE_DEBUG("build_attribute(CKA_MODULUS) failed.\n"); + TRACE_DEVEL("build_attribute(CKA_MODULUS) failed.\n"); Tspi_Context_FreeMemory(tspContext, rgbBlob); return rc; } @@ -2714,7 +2714,7 @@ token_specific_rsa_generate_keypair( TEMPLATE * publ_tmpl, /* put the public exponent into the private key object */ if ((rc = build_attribute(CKA_PUBLIC_EXPONENT, tpm_pubexp, sizeof(tpm_pubexp), &attr))) { - TRACE_DEBUG("build_attribute(CKA_PUBLIC_EXPONENT) failed.\n"); + TRACE_DEVEL("build_attribute(CKA_PUBLIC_EXPONENT) failed.\n"); return rc; } template_update_attribute( priv_tmpl, attr ); @@ -2722,7 +2722,7 @@ token_specific_rsa_generate_keypair( TEMPLATE * publ_tmpl, /* wrap the authdata and put it into an object */ if (authData != NULL) { if ((rc = token_wrap_auth_data(authData, publ_tmpl, priv_tmpl))) { - TRACE_DEBUG("token_wrap_auth_data failed with rc: 0x%lx\n", rc); + TRACE_DEVEL("token_wrap_auth_data failed with rc: 0x%lx\n", rc); } } @@ -2744,7 +2744,7 @@ token_rsa_load_key( OBJECT * key_obj, TSS_HKEY * phKey ) hParentKey = hPrivateRootKey; } else { if ((result = token_load_public_root_key())) { - TRACE_DEBUG("token_load_public_root_key failed. " + TRACE_DEVEL("token_load_public_root_key failed. " "rc=%x\n", result); return CKR_FUNCTION_FAILED; } @@ -2758,7 +2758,7 @@ token_rsa_load_key( OBJECT * key_obj, TSS_HKEY * phKey ) if (rc != CKR_OK) return CKR_FUNCTION_FAILED; if ((rc = token_load_key(handle, hParentKey, NULL, phKey))) { - TRACE_DEBUG("token_load_key failed. rc=0x%lx\n", rc); + TRACE_DEVEL("token_load_key failed. rc=0x%lx\n", rc); return rc; } /* try again to get the CKA_IBM_OPAQUE attr */ @@ -2788,7 +2788,7 @@ token_rsa_load_key( OBJECT * key_obj, TSS_HKEY * phKey ) } if ((result = token_unwrap_auth_data(attr->pValue, attr->ulValueLen, hParentKey, &authData))) { - TRACE_DEBUG("token_unwrap_auth_data: 0x%x\n", result); + TRACE_DEVEL("token_unwrap_auth_data: 0x%x\n", result); return CKR_FUNCTION_FAILED; } @@ -2848,7 +2848,7 @@ token_specific_rsa_decrypt( CK_BYTE * in_data, BYTE *buf = NULL; if ((rc = token_rsa_load_key(key_obj, &hKey))) { - TRACE_DEBUG("token_rsa_load_key failed. rc=0x%lx\n", rc); + TRACE_DEVEL("token_rsa_load_key failed. rc=0x%lx\n", rc); return rc; } @@ -2867,7 +2867,7 @@ token_specific_rsa_decrypt( CK_BYTE * in_data, } /* unbind the data, receiving the plaintext back */ - TRACE_DEBUG("unbinding data with size: %ld\n", in_data_len); + TRACE_DEVEL("unbinding data with size: %ld\n", in_data_len); if ((result = Tspi_Data_Unbind(hEncData, hKey, &buf_size, &buf))) { TRACE_ERROR("Tspi_Data_Unbind failed: 0x%x\n", result); return CKR_FUNCTION_FAILED; @@ -2899,7 +2899,7 @@ token_specific_rsa_verify( CK_BYTE * in_data, CK_RV rc; if ((rc = token_rsa_load_key(key_obj, &hKey))) { - TRACE_DEBUG("token_rsa_load_key failed. rc=0x%lx\n", rc); + TRACE_DEVEL("token_rsa_load_key failed. rc=0x%lx\n", rc); return rc; } @@ -2949,7 +2949,7 @@ token_specific_rsa_sign( CK_BYTE * in_data, CK_RV rc; if ((rc = token_rsa_load_key(key_obj, &hKey))) { - TRACE_DEBUG("token_rsa_load_key failed. rc=0x%lx\n", rc); + TRACE_DEVEL("token_rsa_load_key failed. rc=0x%lx\n", rc); return rc; } @@ -3002,7 +3002,7 @@ token_specific_rsa_encrypt( CK_BYTE * in_data, CK_RV rc; if ((rc = token_rsa_load_key(key_obj, &hKey))) { - TRACE_DEBUG("token_rsa_load_key failed. rc=0x%lx\n", rc); + TRACE_DEVEL("token_rsa_load_key failed. rc=0x%lx\n", rc); return rc; } @@ -3048,7 +3048,7 @@ token_specific_rsa_verify_recover(CK_BYTE *signature, CK_ULONG sig_len, out_data_len, key_obj); if (rc != CKR_OK) - TRACE_DEBUG("token specific rsa_encrypt failed.\n"); + TRACE_DEVEL("token specific rsa_encrypt failed.\n"); return rc; } @@ -3309,7 +3309,7 @@ token_specific_dh_pkcs_key_pair_gen( TEMPLATE * publ_tmpl, temp_bn_len = BN_bn2bin(temp_bn, temp_byte); rc = build_attribute( CKA_VALUE, temp_byte, temp_bn_len, &temp_attr ); // in bytes if (rc != CKR_OK) { - TRACE_DEBUG("build_attribute(CKA_VALUE) failed.\n"); + TRACE_DEVEL("build_attribute(CKA_VALUE) failed.\n"); return CKR_FUNCTION_FAILED; } template_update_attribute( publ_tmpl, temp_attr ); @@ -3325,7 +3325,7 @@ token_specific_dh_pkcs_key_pair_gen( TEMPLATE * publ_tmpl, temp_bn_len = BN_bn2bin(temp_bn, temp_byte); rc = build_attribute( CKA_VALUE, temp_byte, temp_bn_len, &temp_attr ); // in bytes if (rc != CKR_OK) { - TRACE_DEBUG("build_attribute(CKA_VALUE) failed.\n"); + TRACE_DEVEL("build_attribute(CKA_VALUE) failed.\n"); return CKR_FUNCTION_FAILED; } template_update_attribute( priv_tmpl, temp_attr ); @@ -3343,7 +3343,7 @@ token_specific_dh_pkcs_key_pair_gen( TEMPLATE * publ_tmpl, rc = build_attribute( CKA_PRIME,(char *)prime_attr->pValue, prime_attr->ulValueLen, &temp_attr ); // in bytes if (rc != CKR_OK) { - TRACE_DEBUG("build_attribute(CKA_PRIME) failed.\n"); + TRACE_DEVEL("build_attribute(CKA_PRIME) failed.\n"); return CKR_FUNCTION_FAILED; } template_update_attribute( priv_tmpl, temp_attr ); @@ -3351,7 +3351,7 @@ token_specific_dh_pkcs_key_pair_gen( TEMPLATE * publ_tmpl, rc = build_attribute( CKA_BASE,(char *)base_attr->pValue, base_attr->ulValueLen, &temp_attr ); // in bytes if (rc != CKR_OK) { - TRACE_DEBUG("build_attribute(CKA_PRIME) failed.\n"); + TRACE_DEVEL("build_attribute(CKA_PRIME) failed.\n"); return CKR_FUNCTION_FAILED; } template_update_attribute( priv_tmpl, temp_attr ); diff --git a/usr/lib/pkcs11/tpm_stdll/tpm_util.c b/usr/lib/pkcs11/tpm_stdll/tpm_util.c index c954df57..768ad679 100644 --- a/usr/lib/pkcs11/tpm_stdll/tpm_util.c +++ b/usr/lib/pkcs11/tpm_stdll/tpm_util.c @@ -317,7 +317,7 @@ get_srk_info(struct srk_info *srk) * represent the hash. */ if (srk->len != (h_len * 2)) { - TRACE_DEBUG("Hashed secret is %d bytes, expected %d.\n", + TRACE_DEVEL("Hashed secret is %d bytes, expected %d.\n", srk->len, h_len*2); goto error; }