Ticket #126: pkcs11-spy-fix.patch

src/pkcs11/pkcs11-spy.c

@@ -158 +158 @@
         return rv;
 }
 
+static CK_RV check_po() 
+{
+  if(!po) {
+    fprintf(spy_output, "Error: Instance finalized early");
+        return retne(CKR_CRYPTOKI_NOT_INITIALIZED);
+  }
+  return CKR_OK;
+}
+#define CHECK_PO() do { CK_RV ret = check_po(); if(ret != CKR_OK) return ret; } while(0)
+
 static void spy_dump_string_in(const char *name, CK_VOID_PTR data, CK_ULONG size)
 {
   fprintf(spy_output, "[in] %s ", name);
@@ -244 +254 @@
 {
   CK_RV rv;
   enter("C_Finalize");
+  CHECK_PO();
+  
   rv = po->C_Finalize(pReserved);
   /* After Finalize do not use the module again */
   C_UnloadModule(modhandle);
   po = NULL;
+  
   return retne(rv);
 }
 
@@ -255 +268 @@
 {
   CK_RV rv;
   enter("C_GetInfo");
+  CHECK_PO();
   rv = po->C_GetInfo(pInfo);
   if(rv == CKR_OK) {
     print_ck_info(spy_output, pInfo);
@@ -269 +283 @@
   CK_RV rv;
   enter("C_GetSlotList");
   spy_dump_ulong_in("tokenPresent", tokenPresent);
+  CHECK_PO();
   rv = po->C_GetSlotList(tokenPresent, pSlotList, pulCount);
   if(rv == CKR_OK) {
     spy_dump_desc_out("pSlotList");
@@ -284 +299 @@
   CK_RV rv;
   enter("C_GetSlotInfo");
   spy_dump_ulong_in("slotID", slotID);
+  CHECK_PO();
   rv = po->C_GetSlotInfo(slotID, pInfo);
   if(rv == CKR_OK) {
     spy_dump_desc_out("pInfo");
@@ -298 +314 @@
   CK_RV rv;
   enter("C_GetTokenInfo");
   spy_dump_ulong_in("slotID", slotID);
+  CHECK_PO();
   rv = po->C_GetTokenInfo(slotID, pInfo);
   if(rv == CKR_OK) {
     spy_dump_desc_out("pInfo");
@@ -313 +330 @@
   CK_RV rv;
   enter("C_GetMechanismList");
   spy_dump_ulong_in("slotID", slotID);
+  CHECK_PO();
   rv = po->C_GetMechanismList(slotID, pMechanismList, pulCount);
   if(rv == CKR_OK) {
     spy_dump_array_out("pMechanismList", *pulCount);
@@ -334 +352 @@
   } else {
     fprintf(spy_output, " Unknown Mechanism (%08lx)  \n", type);
   }
+  CHECK_PO();
   rv = po->C_GetMechanismInfo(slotID, type, pInfo);
   if(rv == CKR_OK) {
     spy_dump_desc_out("pInfo");
@@ -352 +371 @@
   spy_dump_ulong_in("slotID", slotID);
   spy_dump_string_in("pPin[ulPinLen]", pPin, ulPinLen);
   spy_dump_string_in("pLabel[32]", pLabel, 32);
+  CHECK_PO();
   rv = po->C_InitToken (slotID, pPin, ulPinLen, pLabel);
   return retne(rv);
 }
@@ -364 +384 @@
   enter("C_InitPIN");
   spy_dump_ulong_in("hSession", hSession);
   spy_dump_string_in("pPin[ulPinLen]", pPin, ulPinLen);
+  CHECK_PO();
   rv = po->C_InitPIN(hSession, pPin, ulPinLen);
   return retne(rv);
 }
@@ -379 +400 @@
   spy_dump_ulong_in("hSession", hSession);
   spy_dump_string_in("pOldPin[ulOldLen]", pOldPin, ulOldLen);
   spy_dump_string_in("pNewPin[ulNewLen]", pNewPin, ulNewLen);
+  CHECK_PO();
   rv = po->C_SetPIN(hSession, pOldPin, ulOldLen,
                     pNewPin, ulNewLen);
   return retne(rv);
@@ -396 +418 @@
   spy_dump_ulong_in("flags", flags);
   fprintf(spy_output, "pApplication=%p\n", pApplication);
   fprintf(spy_output, "Notify=%p\n", (void *)Notify);
+  CHECK_PO();
   rv = po->C_OpenSession(slotID, flags, pApplication,
                          Notify, phSession);
   spy_dump_ulong_out("*phSession", *phSession);
@@ -408 +431 @@
   CK_RV rv;
   enter("C_CloseSession");
   spy_dump_ulong_in("hSession", hSession);
+  CHECK_PO();
   rv = po->C_CloseSession(hSession);
   return retne(rv);
 }
@@ -418 +442 @@
   CK_RV rv;
   enter("C_CloseAllSessions");
   spy_dump_ulong_in("slotID", slotID);
+  CHECK_PO();
   rv = po->C_CloseAllSessions(slotID);
   return retne(rv);
 }
@@ -429 +454 @@
   CK_RV rv;
   enter("C_GetSessionInfo");
   spy_dump_ulong_in("hSession", hSession);
+  CHECK_PO();
   rv = po->C_GetSessionInfo(hSession, pInfo);
   if(rv == CKR_OK) {
     spy_dump_desc_out("pInfo");
@@ -445 +471 @@
   CK_RV rv;
   enter("C_GetOperationState");
   spy_dump_ulong_in("hSession", hSession);
+  CHECK_PO();
   rv = po->C_GetOperationState(hSession, pOperationState,
                                pulOperationStateLen);
   if (rv == CKR_OK) {
@@ -468 +495 @@
                      pOperationState, ulOperationStateLen);
   spy_dump_ulong_in("hEncryptionKey", hEncryptionKey);
   spy_dump_ulong_in("hAuthenticationKey", hAuthenticationKey);
+  CHECK_PO();
   rv = po->C_SetOperationState(hSession, pOperationState,
                                ulOperationStateLen,
                                hEncryptionKey,
@@ -487 +515 @@
   fprintf(spy_output, "[in] userType = %s\n",
           lookup_enum(USR_T, userType));
   spy_dump_string_in("pPin[ulPinLen]", pPin, ulPinLen);
+  CHECK_PO();
   rv = po->C_Login(hSession, userType, pPin, ulPinLen);
   return retne(rv);
 }
@@ -496 +525 @@
   CK_RV rv;
   enter("C_Logout");
   spy_dump_ulong_in("hSession", hSession);
+  CHECK_PO();
   rv = po->C_Logout(hSession);
   return retne(rv);
 }
@@ -509 +539 @@
   enter("C_CreateObject");
   spy_dump_ulong_in("hSession", hSession);
   spy_attribute_list_in("pTemplate", pTemplate, ulCount);
+  CHECK_PO();
   rv = po->C_CreateObject(hSession, pTemplate, ulCount, phObject);
   if (rv == CKR_OK) {
     spy_dump_ulong_out("*phObject", *phObject);
@@ -527 +558 @@
   spy_dump_ulong_in("hSession", hSession);
   spy_dump_ulong_in("hObject", hObject);
   spy_attribute_list_in("pTemplate", pTemplate, ulCount);
+  CHECK_PO();
   rv = po->C_CopyObject(hSession, hObject, pTemplate, ulCount, phNewObject);
   if (rv == CKR_OK) {
     spy_dump_ulong_out("*phNewObject", *phNewObject);
@@ -542 +574 @@
   enter("C_DestroyObject");
   spy_dump_ulong_in("hSession", hSession);
   spy_dump_ulong_in("hObject", hObject);
+  CHECK_PO();
   rv = po->C_DestroyObject(hSession, hObject);
   return retne(rv);
 }
@@ -555 +588 @@
   enter("C_GetObjectSize");
   spy_dump_ulong_in("hSession", hSession);
   spy_dump_ulong_in("hObject", hObject);
+  CHECK_PO();
   rv = po->C_GetObjectSize(hSession, hObject, pulSize);
   if (rv == CKR_OK) {
     spy_dump_ulong_out("*pulSize", *pulSize);
@@ -579 +613 @@
    *   true errors for C_GetAttributeValue.''
    * That's why we ignore these error codes, because we want to display
    * all other attributes anyway (they may have been returned correctly) */
+  CHECK_PO();
   rv = po->C_GetAttributeValue(hSession, hObject, pTemplate, ulCount);
   if (rv == CKR_OK || rv == CKR_ATTRIBUTE_SENSITIVE ||
           rv == CKR_ATTRIBUTE_TYPE_INVALID || rv == CKR_BUFFER_TOO_SMALL) {
@@ -598 +633 @@
   spy_dump_ulong_in("hSession", hSession);
   spy_dump_ulong_in("hObject", hObject);
   spy_attribute_list_in("pTemplate", pTemplate, ulCount);
+  CHECK_PO();
   rv = po->C_SetAttributeValue(hSession, hObject, pTemplate, ulCount);
   return retne(rv);
 }
@@ -611 +647 @@
   enter("C_FindObjectsInit");
   spy_dump_ulong_in("hSession", hSession);
   spy_attribute_list_in("pTemplate", pTemplate, ulCount);
+  CHECK_PO();
   rv = po->C_FindObjectsInit(hSession, pTemplate, ulCount);
   return retne(rv);
 }
@@ -625 +662 @@
   enter("C_FindObjects");
   spy_dump_ulong_in("hSession", hSession);
   spy_dump_ulong_in("ulMaxObjectCount", ulMaxObjectCount);
+  CHECK_PO();
   rv = po->C_FindObjects(hSession, phObject, ulMaxObjectCount,
                          pulObjectCount);
   if (rv == CKR_OK) {
@@ -643 +681 @@
   CK_RV rv;
   enter("C_FindObjectsFinal");
   spy_dump_ulong_in("hSession", hSession);
+  CHECK_PO();
   rv = po->C_FindObjectsFinal(hSession);
   return retne(rv);
 }
@@ -657 +696 @@
   fprintf(spy_output, "pMechanism->type=%s\n",
           lookup_enum(MEC_T, pMechanism->mechanism));
   spy_dump_ulong_in("hKey", hKey);
+  CHECK_PO();
   rv = po->C_EncryptInit(hSession, pMechanism, hKey);
   return retne(rv);
 }
@@ -672 +712 @@
   enter("C_Encrypt");
   spy_dump_ulong_in("hSession", hSession);
   spy_dump_string_in("pData[ulDataLen]", pData, ulDataLen);
+  CHECK_PO();
   rv = po->C_Encrypt(hSession, pData, ulDataLen,
                      pEncryptedData, pulEncryptedDataLen);
   if (rv == CKR_OK) {
@@ -692 +733 @@
   enter("C_EncryptUpdate");
   spy_dump_ulong_in("hSession", hSession);
   spy_dump_string_in("pPart[ulPartLen]", pPart, ulPartLen);
+  CHECK_PO();
   rv = po->C_EncryptUpdate(hSession, pPart, ulPartLen, pEncryptedPart,
                            pulEncryptedPartLen);
   if (rv == CKR_OK) {
@@ -708 +750 @@
   CK_RV rv;
   enter("C_EncryptFinal");
   spy_dump_ulong_in("hSession", hSession);
+  CHECK_PO();
   rv = po->C_EncryptFinal(hSession, pLastEncryptedPart,
                           pulLastEncryptedPartLen);
   if (rv == CKR_OK) {
@@ -728 +771 @@
   fprintf(spy_output, "pMechanism->type=%s\n",
           lookup_enum(MEC_T, pMechanism->mechanism));
   spy_dump_ulong_in("hKey", hKey);
+  CHECK_PO();
   rv = po->C_DecryptInit(hSession, pMechanism, hKey);
   return retne(rv);
 }
@@ -744 +788 @@
   spy_dump_ulong_in("hSession", hSession);
   spy_dump_string_in("pEncryptedData[ulEncryptedDataLen]",
                       pEncryptedData, ulEncryptedDataLen);
+  CHECK_PO();
   rv = po->C_Decrypt(hSession, pEncryptedData, ulEncryptedDataLen,
                      pData, pulDataLen);
   if (rv == CKR_OK) {
@@ -764 +809 @@
   spy_dump_ulong_in("hSession", hSession);
   spy_dump_string_in("pEncryptedPart[ulEncryptedPartLen]",
                       pEncryptedPart, ulEncryptedPartLen);
+  CHECK_PO();
   rv = po->C_DecryptUpdate(hSession, pEncryptedPart, ulEncryptedPartLen,
                            pPart, pulPartLen);
   if (rv == CKR_OK) {
@@ -780 +826 @@
   CK_RV rv;
   enter("C_DecryptFinal");
   spy_dump_ulong_in("hSession", hSession);
+  CHECK_PO();
   rv = po->C_DecryptFinal(hSession, pLastPart, pulLastPartLen);
   if (rv == CKR_OK) {
     spy_dump_string_out("pLastPart[*pulLastPartLen]",
@@ -796 +843 @@
   spy_dump_ulong_in("hSession", hSession);
   fprintf(spy_output, "pMechanism->type=%s\n",
           lookup_enum(MEC_T, pMechanism->mechanism));
+  CHECK_PO();
   rv = po->C_DigestInit(hSession, pMechanism);
   return retne(rv);
 }
@@ -811 +859 @@
   enter("C_Digest");
   spy_dump_ulong_in("hSession", hSession);
   spy_dump_string_in("pData[ulDataLen]", pData, ulDataLen);
+  CHECK_PO();
   rv = po->C_Digest(hSession, pData, ulDataLen, pDigest, pulDigestLen);
   if (rv == CKR_OK) {
     spy_dump_string_out("pDigest[*pulDigestLen]",
@@ -828 +877 @@
   enter("C_DigestUpdate");
   spy_dump_ulong_in("hSession", hSession);
   spy_dump_string_in("pPart[ulPartLen]", pPart, ulPartLen);
+  CHECK_PO();
   rv = po->C_DigestUpdate(hSession, pPart, ulPartLen);
   return retne(rv);
 }
@@ -840 +890 @@
   enter("C_DigestKey");
   spy_dump_ulong_in("hSession", hSession);
   spy_dump_ulong_in("hKey", hKey);
+  CHECK_PO();
   rv = po->C_DigestKey(hSession, hKey);
   return retne(rv);
 }
@@ -852 +903 @@
   CK_RV rv;
   enter("C_DigestFinal");
   spy_dump_ulong_in("hSession", hSession);
+  CHECK_PO();
   rv = po->C_DigestFinal(hSession, pDigest, pulDigestLen);
   if (rv == CKR_OK) {
     spy_dump_string_out("pDigest[*pulDigestLen]",
@@ -870 +922 @@
   fprintf(spy_output, "pMechanism->type=%s\n",
           lookup_enum(MEC_T, pMechanism->mechanism));
   spy_dump_ulong_in("hKey", hKey);
+  CHECK_PO();
   rv = po->C_SignInit(hSession, pMechanism, hKey);
   return retne(rv);
 }
@@ -885 +938 @@
   enter("C_Sign");
   spy_dump_ulong_in("hSession", hSession);
   spy_dump_string_in("pData[ulDataLen]", pData, ulDataLen);
+  CHECK_PO();
   rv = po->C_Sign(hSession, pData, ulDataLen, pSignature, pulSignatureLen);
   if (rv == CKR_OK) {
     spy_dump_string_out("pSignature[*pulSignatureLen]",
@@ -902 +956 @@
   enter("C_SignUpdate");
   spy_dump_ulong_in("hSession", hSession);
   spy_dump_string_in("pPart[ulPartLen]", pPart, ulPartLen);
+  CHECK_PO();
   rv = po->C_SignUpdate(hSession, pPart, ulPartLen);
   return retne(rv);
 }
@@ -914 +969 @@
   CK_RV rv;
   enter("C_SignFinal");
   spy_dump_ulong_in("hSession", hSession);
+  CHECK_PO();
   rv = po->C_SignFinal(hSession, pSignature, pulSignatureLen);
   if (rv == CKR_OK) {
     spy_dump_string_out("pSignature[*pulSignatureLen]",
@@ -933 +989 @@
   fprintf(spy_output, "pMechanism->type=%s\n",
           lookup_enum(MEC_T, pMechanism->mechanism));
   spy_dump_ulong_in("hKey", hKey);
+  CHECK_PO();
   rv = po->C_SignRecoverInit(hSession, pMechanism, hKey);
   return retne(rv);
 }
@@ -948 +1005 @@
   enter("C_SignRecover");
   spy_dump_ulong_in("hSession", hSession);
   spy_dump_string_in("pData[ulDataLen]", pData, ulDataLen);
+  CHECK_PO();
   rv = po->C_SignRecover(hSession, pData, ulDataLen,
                          pSignature, pulSignatureLen);
   if (rv == CKR_OK) {
@@ -967 +1025 @@
   fprintf(spy_output, "pMechanism->type=%s\n",
           lookup_enum(MEC_T, pMechanism->mechanism));
   spy_dump_ulong_in("hKey", hKey);
+  CHECK_PO();
   rv = po->C_VerifyInit(hSession, pMechanism, hKey);
   return retne(rv);
 }
@@ -984 +1043 @@
   spy_dump_string_in("pData[ulDataLen]", pData, ulDataLen);
   spy_dump_string_in("pSignature[ulSignatureLen]",
                      pSignature, ulSignatureLen);
+  CHECK_PO();
   rv = po->C_Verify(hSession, pData, ulDataLen, pSignature, ulSignatureLen);
   return retne(rv);
 }
@@ -997 +1057 @@
   enter("C_VerifyUpdate");
   spy_dump_ulong_in("hSession", hSession);
   spy_dump_string_in("pPart[ulPartLen]", pPart, ulPartLen);
+  CHECK_PO();
   rv = po->C_VerifyUpdate(hSession, pPart, ulPartLen);
   return retne(rv);
 }
@@ -1011 +1072 @@
   spy_dump_ulong_in("hSession", hSession);
   spy_dump_string_in("pSignature[ulSignatureLen]",
                      pSignature, ulSignatureLen);
+  CHECK_PO();
   rv = po->C_VerifyFinal(hSession, pSignature, ulSignatureLen);
   return retne(rv);
 }
@@ -1026 +1088 @@
   fprintf(spy_output, "pMechanism->type=%s\n",
           lookup_enum(MEC_T, pMechanism->mechanism));
   spy_dump_ulong_in("hKey", hKey);
+  CHECK_PO();
   rv = po->C_VerifyRecoverInit(hSession, pMechanism, hKey);
   return retne(rv);
 }
@@ -1042 +1105 @@
   spy_dump_ulong_in("hSession", hSession);
   spy_dump_string_in("pSignature[ulSignatureLen]",
                      pSignature, ulSignatureLen);
+  CHECK_PO();
   rv = po->C_VerifyRecover(hSession, pSignature, ulSignatureLen,
                            pData, pulDataLen);
   if (rv == CKR_OK) {
@@ -1060 +1124 @@
   enter("C_DigestEncryptUpdate");
   spy_dump_ulong_in("hSession", hSession);
   spy_dump_string_in("pPart[ulPartLen]", pPart, ulPartLen);
+  CHECK_PO();
   rv = po->C_DigestEncryptUpdate(hSession, pPart, ulPartLen,
                                  pEncryptedPart, pulEncryptedPartLen);
   if (rv == CKR_OK) {
@@ -1081 +1146 @@
   spy_dump_ulong_in("hSession", hSession);
   spy_dump_string_in("pEncryptedPart[ulEncryptedPartLen]",
                       pEncryptedPart, ulEncryptedPartLen);
+  CHECK_PO();
   rv = po->C_DecryptDigestUpdate(hSession, pEncryptedPart,
                                  ulEncryptedPartLen,
                                  pPart,  pulPartLen);
@@ -1101 +1167 @@
   enter("C_SignEncryptUpdate");
   spy_dump_ulong_in("hSession", hSession);
   spy_dump_string_in("pPart[ulPartLen]", pPart, ulPartLen);
+  CHECK_PO();
   rv = po->C_SignEncryptUpdate(hSession, pPart, ulPartLen,
                                pEncryptedPart, pulEncryptedPartLen);
   if (rv == CKR_OK) {
@@ -1122 +1189 @@
   spy_dump_ulong_in("hSession", hSession);
   spy_dump_string_in("pEncryptedPart[ulEncryptedPartLen]",
                       pEncryptedPart, ulEncryptedPartLen);
+  CHECK_PO();
   rv = po->C_DecryptVerifyUpdate(hSession, pEncryptedPart,
                                  ulEncryptedPartLen, pPart,
                                  pulPartLen);
@@ -1143 +1211 @@
   fprintf(spy_output, "pMechanism->type=%s\n",
           lookup_enum(MEC_T, pMechanism->mechanism));
   spy_attribute_list_in("pTemplate", pTemplate, ulCount);
+  CHECK_PO();
   rv = po->C_GenerateKey(hSession, pMechanism, pTemplate,
                          ulCount, phKey);
   if (rv == CKR_OK) {
@@ -1169 +1238 @@
                         pPublicKeyTemplate, ulPublicKeyAttributeCount);
   spy_attribute_list_in("pPrivateKeyTemplate",
                         pPrivateKeyTemplate, ulPrivateKeyAttributeCount);
+  CHECK_PO();
   rv = po->C_GenerateKeyPair(hSession, pMechanism, pPublicKeyTemplate,
                              ulPublicKeyAttributeCount, pPrivateKeyTemplate,
                              ulPrivateKeyAttributeCount, phPublicKey,
@@ -1195 +1265 @@
           lookup_enum(MEC_T, pMechanism->mechanism));
   spy_dump_ulong_in("hWrappingKey", hWrappingKey);
   spy_dump_ulong_in("hKey", hKey);
+  CHECK_PO();
   rv = po->C_WrapKey(hSession, pMechanism, hWrappingKey,
                      hKey, pWrappedKey, pulWrappedKeyLen);
   if (rv == CKR_OK) {
@@ -1222 +1293 @@
   spy_dump_string_in("pWrappedKey[ulWrappedKeyLen]",
                       pWrappedKey, ulWrappedKeyLen);
   spy_attribute_list_in("pTemplate", pTemplate, ulAttributeCount);
+  CHECK_PO();
   rv = po->C_UnwrapKey(hSession, pMechanism, hUnwrappingKey,
                        pWrappedKey, ulWrappedKeyLen, pTemplate,
                        ulAttributeCount, phKey);
@@ -1245 +1317 @@
           lookup_enum(MEC_T, pMechanism->mechanism));
   spy_dump_ulong_in("hBaseKey", hBaseKey);
   spy_attribute_list_in("pTemplate", pTemplate, ulAttributeCount);
+  CHECK_PO();
   rv = po->C_DeriveKey(hSession, pMechanism, hBaseKey,
                        pTemplate, ulAttributeCount, phKey);
   if (rv == CKR_OK) {
@@ -1261 +1334 @@
   enter("C_SeedRandom");
   spy_dump_ulong_in("hSession", hSession);
   spy_dump_string_in("pSeed[ulSeedLen]", pSeed, ulSeedLen);
+  CHECK_PO();
   rv = po->C_SeedRandom(hSession, pSeed, ulSeedLen);
   return retne(rv);
 }
@@ -1273 +1347 @@
   CK_RV rv;
   enter("C_GenerateRandom");
   spy_dump_ulong_in("hSession", hSession);
+  CHECK_PO();
   rv = po->C_GenerateRandom(hSession, RandomData, ulRandomLen);
   if (rv == CKR_OK) {
     spy_dump_string_out("RandomData[ulRandomLen]",
@@ -1287 +1362 @@
   CK_RV rv;
   enter("C_GetFunctionStatus");
   spy_dump_ulong_in("hSession", hSession);
+  CHECK_PO();
   rv = po->C_GetFunctionStatus(hSession);
   return retne(rv);
 }
@@ -1296 +1372 @@
   CK_RV rv;
   enter("C_CancelFunction");
   spy_dump_ulong_in("hSession", hSession);
+  CHECK_PO();
   rv = po->C_CancelFunction(hSession);
   return retne(rv);
 }
@@ -1306 +1383 @@
 {
   CK_RV rv;
   enter("C_WaitForSlotEvent");
+  CHECK_PO();
   rv = po->C_WaitForSlotEvent(flags, pSlot, pRserved);
   return retne(rv);
 }