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

testsuite/tcg/tpm/Tspi_TPM_KeyControlOwner01.c

 /*
  *
  *   Copyright (C) International Business Machines  Corp., 2007
  *
  *   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.
  *
  *   This program is distributed in the hope that it will be useful,
@@ skipping 173 matching lines @@
         result = Tspi_Key_LoadKey(hKey, hSRK);
         if (result != TSS_SUCCESS) {
                 print_error("Tspi_Key_LoadKey", result);
                 Tspi_Context_FreeMemory( hContext, NULL );
                 Tspi_Context_Close(hContext);
                 exit(result);
         }
 
                 //Set Ownerevict bit
         result = Tspi_TPM_KeyControlOwner(hTPM, hKey, TSS_TSPATTRIB_KEYCONTROL_OWNEREVICT,
-                                          TRUE, &Uuid);
+                                          FALSE, &Uuid);
+
         if (result != TSS_SUCCESS) {
                 print_error(nameOfFunction, result);
                 print_end_test(nameOfFunction);
                 Tspi_Context_FreeMemory( hContext, NULL );
                 Tspi_Context_Close(hContext);
                 exit(result);
         } else {
                 print_success(nameOfFunction, result);
                 print_end_test(nameOfFunction);
+                Tspi_TPM_KeyControlOwner(hTPM, hKey, TSS_TSPATTRIB_KEYCONTROL_OWNEREVICT,
+                                         FALSE, &Uuid);
+                Tspi_Key_UnloadKey(hKey);
                 Tspi_Context_FreeMemory( hContext, NULL );
                 Tspi_Context_Close(hContext);
                 exit(0);
         }
 }