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

testsuite/tcg/nv/Tspi_NV_DefineSpace09.c

Index: testsuite/tcg/nv/Tspi_NV_DefineSpace09.c
diff --git a/testsuite/tcg/nv/Tspi_NV_DefineSpace09.c b/testsuite/tcg/nv/Tspi_NV_DefineSpace09.c
index eddabbbe32e4efb35fb036ef938706fcf4ae71aa..3a31b4ce7f5e232a1f9abc61e216b1da2ad3d028 100644
--- a/testsuite/tcg/nv/Tspi_NV_DefineSpace09.c
+++ b/testsuite/tcg/nv/Tspi_NV_DefineSpace09.c
@@ -197,6 +197,16 @@ main_v1_2(char version)
         /*Define NV space*/
         result = Tspi_NV_DefineSpace(hNVStore, 0, 0);
       
+#ifdef CLEAR_TEST_INDEX
+       if (result== TSS_SUCCESS)
+       {
+		Tspi_Context_GetTpmObject(hContext, &hTPM);
+		Tspi_GetPolicyObject(hTPM, TSS_POLICY_USAGE, &hPolicy);
+		Tspi_Policy_SetSecret( hPolicy, TESTSUITE_OWNER_SECRET_MODE,
+					TESTSUITE_OWNER_SECRET_LEN, TESTSUITE_OWNER_SECRET);
+		Tspi_NV_ReleaseSpace(hNVStore);
+       }
+#endif
 #ifdef NV_LOCKED	
        if (TSS_ERROR_CODE(result)== TPM_E_BAD_DATASIZE
 		||TSS_ERROR_CODE(result)==TPM_E_BAD_PARAM_SIZE)