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

testsuite/tcg/nv/Tspi_NV_DefineSpace02.c

Index: testsuite/tcg/nv/Tspi_NV_DefineSpace02.c
diff --git a/testsuite/tcg/nv/Tspi_NV_DefineSpace02.c b/testsuite/tcg/nv/Tspi_NV_DefineSpace02.c
index 4efb88f0d02fc06efa476462bc7effcef9b817c2..5ff877ff2ea17405f85fbca834a68e0b86ed8e7e 100644
--- a/testsuite/tcg/nv/Tspi_NV_DefineSpace02.c
+++ b/testsuite/tcg/nv/Tspi_NV_DefineSpace02.c
@@ -193,7 +193,23 @@ main_v1_2(char version)
 
       /*Define NV space*/
 	result = Tspi_NV_DefineSpace(hNVStore, 0, 0);
+	
+	/* Set password */
+	Tspi_Policy_SetSecret(hPolicy, TESTSUITE_OWNER_SECRET_MODE,
+					TESTSUITE_OWNER_SECRET_LEN,
+					TESTSUITE_OWNER_SECRET);
+	Tspi_TPM_SetStatus(hTPM, TSS_TPMSTATUS_RESETLOCK, 1);
       
+#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_AUTHFAIL)
        {