Upgrade from trousers 0.3.3 to 0.3.6 and from testsuite 0.2 to 0.3.

src/tspi/tspi_seal.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2004-2007
  *
  */
 
@@ skipping 24 matching lines @@
         TSS_HPOLICY hPolicy, hEncPolicy;
         BYTE *encData = NULL;
         BYTE *pcrData = NULL;
         UINT32 encDataSize;
         UINT32 pcrDataSize;
         UINT32 pcrInfoType = TSS_PCRS_STRUCT_DEFAULT;
         UINT32 sealOrdinal = TPM_ORD_Seal;
         TCS_KEY_HANDLE tcsKeyHandle;
         TSS_HCONTEXT tspContext;
         Trspi_HashCtx hashCtx;
-        BYTE *sealData;
+        BYTE *sealData = NULL;
         struct authsess *xsap = NULL;
 #ifdef TSS_BUILD_SEALX
         UINT32 protectMode;
 #endif
 
         if (rgbDataToSeal == NULL)
                 return TSPERR(TSS_E_BAD_PARAMETER);
 
         if ((result = obj_encdata_get_tsp_context(hEncData, &tspContext)))
                 return result;
@@ skipping 28 matching lines @@
         /* If PCR's are of interest */
         pcrDataSize = 0;
         if (hPcrComposite) {
                 if ((result = obj_pcrs_create_info_type(hPcrComposite, &pcrInfoType, &pcrDataSize,
                                                         &pcrData)))
                         return result;
         }
 
         if ((result = authsess_xsap_init(tspContext, hEncKey, hEncData, TSS_AUTH_POLICY_REQUIRED,
                                          sealOrdinal, TPM_ET_KEYHANDLE, &xsap)))
-                return result;
+                goto error;
 
 #ifdef TSS_BUILD_SEALX
         if (sealOrdinal == TPM_ORD_Seal)
                 sealData = rgbDataToSeal;
         else {
-                sealData = NULL;
                 if ((sealData = (BYTE *)calloc(1, ulDataLength)) == NULL) {
                         LogError("malloc of %u bytes failed", ulDataLength);
                         result = TSPERR(TSS_E_OUTOFMEMORY);
                         goto error;
                 }
 
                 if ((result =
                      ((TSS_RESULT (*)(PVOID, TSS_HKEY, TSS_HENCDATA, TSS_ALGORITHM_ID,
                      UINT32, BYTE *, BYTE *, BYTE *, BYTE *, UINT32, BYTE *,
                      BYTE *))xsap->cb_sealx.callback)(xsap->cb_sealx.appData, hEncKey, hEncData,
@@ skipping 10 matching lines @@
 #endif
 
         result = Trspi_HashInit(&hashCtx, TSS_HASH_SHA1);
         result |= Trspi_Hash_UINT32(&hashCtx, sealOrdinal);
         result |= Trspi_Hash_ENCAUTH(&hashCtx, xsap->encAuthUse.authdata);
         result |= Trspi_Hash_UINT32(&hashCtx, pcrDataSize);
         result |= Trspi_HashUpdate(&hashCtx, pcrDataSize, pcrData);
         result |= Trspi_Hash_UINT32(&hashCtx, ulDataLength);
         result |= Trspi_HashUpdate(&hashCtx, ulDataLength, sealData);
         if ((result |= Trspi_HashFinal(&hashCtx, digest.digest))) {
-                if (sealData != rgbDataToSeal)
-                        free(sealData);
                 goto error;
         }
 
         if ((result = authsess_xsap_hmac(xsap, &digest)))
                 goto error;
 
 #ifdef TSS_BUILD_SEALX
         if (sealOrdinal == TPM_ORD_Seal) {
                 if ((result = TCS_API(tspContext)->Seal(tspContext, tcsKeyHandle, &xsap->encAuthUse,
                                                         pcrDataSize, pcrData, ulDataLength,
                                                         sealData, xsap->pAuth, &encDataSize,
-                                                        &encData)))
-                        return result;
+                                                        &encData))) {
+                        goto error;
+                }
         } else if (sealOrdinal == TPM_ORD_Sealx) {
-                result = TCS_API(tspContext)->Sealx(tspContext, tcsKeyHandle, &xsap->encAuthUse,
+                if ((result = TCS_API(tspContext)->Sealx(tspContext, tcsKeyHandle, &xsap->encAuthUse,
                                                     pcrDataSize, pcrData, ulDataLength, sealData,
-                                                    xsap->pAuth, &encDataSize, &encData);
-                free(sealData);
-
-                if (result != TSS_SUCCESS)
+                                                    xsap->pAuth, &encDataSize, &encData))) {
                         goto error;
+                }
         } else {
                 result = TSPERR(TSS_E_INTERNAL_ERROR);
                 goto error;
         }
 #else
         if ((result = TCS_API(tspContext)->Seal(tspContext, tcsKeyHandle, &xsap->encAuthUse,
                                                 pcrDataSize, pcrData, ulDataLength, sealData,
                                                 xsap->pAuth, &encDataSize, &encData)))
                 goto error;
 #endif
@@ skipping 12 matching lines @@
         if ((result = obj_encdata_set_data(hEncData, encDataSize, encData)))
                 goto error;
 
         if (pcrDataSize)
                 result = obj_encdata_set_pcr_info(hEncData, pcrInfoType, pcrData);
 
 error:
         authsess_free(xsap);
         free(encData);
         free(pcrData);
-
+        if (sealData != rgbDataToSeal)
+                free(sealData);
         return result;
 }
 
 TSS_RESULT
 Tspi_Data_Unseal(TSS_HENCDATA hEncData,         /* in */
                  TSS_HKEY hKey,                 /* in */
                  UINT32 * pulUnsealedDataLength,/* out */
                  BYTE ** prgbUnsealedData)      /* out */
 {
         UINT64 offset;
@@ skipping 124 matching lines @@
         *pulUnsealedDataLength = unSealedDataLen;
         *prgbUnsealedData = unSealedData;
 
 error:
         authsess_free(xsap);
         if (data)
                 free_tspi(tspContext, data);
 
         return result;
 }