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

src/tspi/obj_context.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2005, 2007
  *
  */
 
@@ skipping 169 matching lines @@
 
         if ((obj = obj_list_get_obj(&context_list, tspContext)) == NULL)
                 return TSPERR(TSS_E_INVALID_HANDLE);
 
         context = (struct tr_context_obj *)obj->data;
 
         if (context->machineNameLength == 0) {
                 *data = NULL;
                 *size = 0;
         } else {
-                *data = calloc_tspi(obj->tspContext, context->machineNameLength);
+                /*
+                 * Don't use calloc_tspi because this memory is
+                 * not freed using "free_tspi"
+                 */
+                *data = calloc(1, context->machineNameLength);
                 if (*data == NULL) {
                         LogError("malloc of %u bytes failed.",
                                         context->machineNameLength);
                         result = TSPERR(TSS_E_OUTOFMEMORY);
                         goto done;
                 }
                 *size = context->machineNameLength;
                 memcpy(*data, context->machineName, *size);
         }
 
@@ skipping 755 matching lines @@
                                                inLen, dec, &decLen))) {
                         free(dec);
                         return result;
                 }
 
                 break;
         }
         default:
                 LogDebug("Unknown algorithm for encrypted transport session: 0x%x",
                          transPub->algId);
+                free(dec);
                 return TSPERR(TSS_E_INTERNAL_ERROR);
         }
 
         *out = dec;
         *outLen = decLen;
 
         return result;
 }
 
 TSS_RESULT
@@ skipping 59 matching lines @@
                                                inLen, enc, &encLen))) {
                         free(enc);
                         return result;
                 }
 
                 break;
         }
         default:
                 LogDebug("Unknown algorithm for encrypted transport session: 0x%x",
                          transPub->algId);
+                free(enc);
                 return TSPERR(TSS_E_INTERNAL_ERROR);
         }
 
         *out = enc;
         *outLen = encLen;
 
         return result;
 }
 
 TSS_RESULT
@@ skipping 454 matching lines @@
                 case TSS_CONTEXT_FLAGS_TPM_VERSION_1:
                         *ordinal = TPM_ORD_LoadKey;
                         break;
         }
 
         obj_list_put(&context_list);
 
         return TSS_SUCCESS;
 }