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

src/tspi/tsp_auth.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2004-2007
  *
  */
 
@@ skipping 838 matching lines @@
                         goto error;
         } else
                 sess->parentMode = TSS_SECRET_MODE_NONE;
 
         switch (command) {
         /* Child is a Key object */
         case TPM_ORD_CreateWrapKey:
         case TPM_ORD_CMK_CreateKey:
                 if ((result = obj_rsakey_get_policies(obj_child, &sess->hUsageChild,
                                                       &sess->hMigChild, &authdatausage)))
-                        return result;
+                        goto error;
 
                 if (authdatausage && !sess->hUsageChild) {
                         result = TSPERR(TSS_E_TSP_AUTHREQUIRED);
                         goto error;
                 }
 
                 if (obj_rsakey_is_migratable(obj_child)) {
                         if (!sess->hMigChild) {
                                 result = TSPERR(TSS_E_KEY_NO_MIGRATION_POLICY);
                                 goto error;
@@ skipping 88 matching lines @@
          * is OK.  At this point, authsess->pAuth is NULL, so the TCS API will not get any
          * authdata. */
         if (req_auth == FALSE && sess->parentMode == TSS_SECRET_MODE_NONE)
                 goto done;
 
         if (get_child_auth) {
                 if ((result = obj_policy_get_xsap_params(sess->hUsageChild, 0, 0, NULL, NULL,
                                                          sess->encAuthUse.authdata, NULL, NULL,
                                                          &sess->cb_sealx, &sess->uMode,
                                                          new_secret)))
-                        return result;
+                        goto error;
         }
 
         if ((result = get_local_random(tspContext, FALSE, sizeof(TPM_NONCE),
                                        (BYTE **)sess->nonceOddxSAP.nonce)))
                 goto error;
 
         sess->obj_child = obj_child;
         sess->tspContext = tspContext;
         sess->pAuth = &sess->auth;
         sess->command = command;
@@ skipping 143 matching lines @@
 
 void
 authsess_free(struct authsess *xsap)
 {
         if (xsap) {
                 if (xsap->auth.AuthHandle && xsap->auth.fContinueAuthSession)
                         (void)__tspi_free_resource(xsap->tspContext, xsap->auth.AuthHandle, TPM_RT_AUTH);
 
                 free(xsap->entityValue);
                 free(xsap);
+                xsap = NULL;
         }
 }
 
 #ifdef TSS_BUILD_TRANSPORT
 TSS_RESULT
 Transport_OIAP(TSS_HCONTEXT    tspContext,   /* in */
                TCS_AUTHHANDLE* authHandle,   /* out */
                TPM_NONCE*      nonce0)       /* out */
 {
         TSS_RESULT result;
@@ skipping 75 matching lines @@
         }
 
         *handles = handle;
 
         result = obj_context_transport_execute(tspContext, TPM_ORD_Terminate_Handle, 0, NULL,
                                                NULL, &handlesLen, &handles, NULL, NULL, NULL, NULL);
 
         return result;
 }
 #endif