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

testsuite/tcg/nv/Tspi_NV_DefineSpace01.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 GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
@@ skipping 138 matching lines @@
         result = Tspi_Policy_SetSecret(hPolicy, TESTSUITE_OWNER_SECRET_MODE,
                                         TESTSUITE_OWNER_SECRET_LEN, TESTSUITE_OWNER_SECRET);
         if (result != TSS_SUCCESS)
         {
                 print_error("Tspi_Policy_SetSecret", result);
                 print_error_exit(nameOfFunction, err_string(result));
                 Tspi_Context_FreeMemory(hContext, NULL);
                 Tspi_Context_Close(hContext);
                 exit(result);
         }
+        
+        Tspi_TPM_SetStatus(hTPM, TSS_TPMSTATUS_RESETLOCK, 1);
 #endif
 
         /* Set the index to be defined. */
         result = Tspi_SetAttribUint32(hNVStore, TSS_TSPATTRIB_NV_INDEX, 0,0x00011101);
         if (result != TSS_SUCCESS)
         {
                 print_error("Tspi_SetAttribUint32 for setting NV index", result);
                 print_error_exit(nameOfFunction, err_string(result));
                 Tspi_Context_FreeMemory(hContext, NULL);
                 Tspi_Context_Close(hContext);
@@ skipping 69 matching lines @@
        }
        else{
                 print_error("Tspi_NV_DefineSpace", result);
                 print_end_test(nameOfFunction);
                 Tspi_Context_FreeMemory(hContext, NULL);
                 Tspi_Context_Close(hContext);
                 exit(result);
         }
 #endif
 }