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

src/tcs/tcsi_own.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2004
  *
  */
 
@@ skipping 23 matching lines @@
                             UINT32 srkInfoSize, /*in */
                             BYTE * srkInfo,     /*in */
                             TPM_AUTH * ownerAuth,       /* in, out */
                             UINT32 * srkKeySize,        /*out */
                             BYTE ** srkKey)     /*out */
 {
         UINT64 offset;
         UINT32 paramSize;
         TSS_RESULT result;
         TSS_KEY srkKeyContainer;
+        BYTE fake_pubkey[256] = { 0, }, fake_srk[2048] = { 0, };
         BYTE oldAuthDataUsage;
         BYTE txBlob[TSS_TPM_TXBLOB_SIZE];
 
         if ((result = ctx_verify_context(hContext)))
                 goto done;
 
         if ((result = auth_mgr_check(hContext, &ownerAuth->AuthHandle)))
                 goto done;
 
         /* Check on the Atmel Bug Patch */
@@ skipping 24 matching lines @@
                         goto done;
                 }
 
                 if (srkKeyContainer.authDataUsage != oldAuthDataUsage) {
                         LogDebug("AuthDataUsage was changed by TPM.  Atmel Bug. Fixing it in PS");
                         srkKeyContainer.authDataUsage = oldAuthDataUsage;
                 }
 
 #ifdef TSS_BUILD_PS
                 {
-                        BYTE fake_pubkey[256] = { 0, }, fake_srk[2048] = { 0, };
                         BYTE *save;
 
                         /* Once the key file is created, it stays forever. There could be
                          * migratable keys in the hierarchy that are still useful to someone.
                          */
                         result = ps_remove_key(&SRK_UUID);
                         if (result != TSS_SUCCESS && result != TCSERR(TSS_E_PS_KEY_NOTFOUND)) {
                                 destroy_key_refs(&srkKeyContainer);
                                 LogError("Error removing SRK from key file.");
                                 *srkKeySize = 0;
@@ skipping 61 matching lines @@
         result = UnloadBlob_Header(txBlob, &paramSize);
         if (!result) {
                 result = tpm_rsp_parse(TPM_ORD_OwnerClear, txBlob, paramSize, ownerAuth);
         }
         LogResult("Ownerclear", result);
 done:
         auth_mgr_release_auth(ownerAuth, NULL, hContext);
         return result;
 }