File trousers-fixes.diff of Package trousers

--- src/include/obj_context.h
+++ src/include/obj_context.h
@@ -76,7 +76,7 @@
 TSS_RESULT obj_context_get_loadkey_ordinal(TSS_HCONTEXT, TPM_COMMAND_CODE *);
 void       obj_context_close(TSS_HCONTEXT);
 
-struct tcs_api_table *obj_context_get_tcs_api();
+struct tcs_api_table *obj_context_get_tcs_api(TSS_HCONTEXT tspContext);
 #define TCS_API(c) obj_context_get_tcs_api(c)
 
 
--- src/tspi/tspi_nv.c
+++ src/tspi/tspi_nv.c
@@ -217,7 +217,7 @@
 
 	nv_data_public.tag = TPM_TAG_NV_DATA_PUBLIC;
 
-	if ((result = obj_nvstore_create_pcrshortinfo(hNvstore, (TSS_HPCRS)NULL, &pPCR_len, &pPCR)))
+	if ((result = obj_nvstore_create_pcrshortinfo(hNvstore, (TSS_HPCRS)0, &pPCR_len, &pPCR)))
 		return result;
 
 	NVPublic_DataSize = 0;