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

testsuite/tcg/nv/Tspi_NV_DefineSpace04.c

Index: testsuite/tcg/nv/Tspi_NV_DefineSpace04.c
diff --git a/testsuite/tcg/nv/Tspi_NV_DefineSpace04.c b/testsuite/tcg/nv/Tspi_NV_DefineSpace04.c
index c2b87c311cac659449c20b62dc94891bc675d9c1..b0dbe6eb6f2e3a61bbaa63a4fa5ec38c2a84e59d 100644
--- a/testsuite/tcg/nv/Tspi_NV_DefineSpace04.c
+++ b/testsuite/tcg/nv/Tspi_NV_DefineSpace04.c
@@ -195,6 +195,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)== TSS_E_BAD_PARAMETER)
        {
@@ -207,10 +217,6 @@ main_v1_2(char version)
        else{
 		print_error("Tspi_NV_DefineSpace", result);
 		print_end_test(nameOfFunction);
-       #ifdef CLEAR_TEST_INDEX
-                if ( result == TSS_SUCCESS )
-                        Tspi_NV_ReleaseSpace(hNVStore);
-       #endif
 		Tspi_Context_FreeMemory(hContext, NULL);
 		Tspi_Context_Close(hContext);
 		if ( result == TSS_SUCCESS )