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

src/tspi/tspi_nv.c

 /*
  * The Initial Developer of the Original Code is Intel Corporation.
  * Portions created by Intel Corporation are Copyright (C) 2007 Intel Corporation.
  * All Rights Reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the Common Public License as published by
  * IBM Corporation; either version 1 of the License, or (at your option)
  * any later version.
  *
@@ skipping 199 matching lines @@
         }
         free_tspi(tspContext, pResult);
 
         if (!defined_index) {
                 result = TSPERR(TSS_E_NV_AREA_NOT_EXIST);
                 return result;
         }
 
         nv_data_public.tag = TPM_TAG_NV_DATA_PUBLIC;
 
-        if ((result = obj_nvstore_create_pcrshortinfo(hNvstore, (TSS_HPCRS)0, &pPCR_len, &pPCR)))
+        if ((result = obj_nvstore_create_pcrshortinfo(hNvstore, NULL_HPCRS, &pPCR_len, &pPCR)))
                 return result;
 
         NVPublic_DataSize = 0;
         Trspi_LoadBlob_UINT16(&NVPublic_DataSize, TPM_TAG_NV_DATA_PUBLIC, NVPublicData);
         Trspi_LoadBlob_UINT32(&NVPublic_DataSize, nv_data_public.nvIndex, NVPublicData);
         /* load the read pcr short info */
         Trspi_LoadBlob(&NVPublic_DataSize, pPCR_len, NVPublicData, pPCR);
         /* load the write pcr short info */
         Trspi_LoadBlob(&NVPublic_DataSize, pPCR_len, NVPublicData, pPCR);
         Trspi_LoadBlob_UINT16(&NVPublic_DataSize, TPM_TAG_NV_ATTRIBUTES, NVPublicData);
@@ skipping 284 matching lines @@
                 }
         } else {
                 if ((result = TCS_API(tspContext)->NV_ReadValue(tspContext, nv_data_public.nvIndex,
                                                                 offset, ulDataLength, NULL,
                                                                 rgbDataRead)))
                         return result;
         }
 
         return result;
 }