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

Index: testsuite/tcg/tpm/Tspi_TPM_KeyControlOwner01.c
diff --git a/testsuite/tcg/tpm/Tspi_TPM_KeyControlOwner01.c b/testsuite/tcg/tpm/Tspi_TPM_KeyControlOwner01.c
index d3fa3cdbf4238a67bd43edd51a2b5c60143d43ea..bcc6d132b4efa97194035a3f3001b2cc0ae042f3 100644
--- a/testsuite/tcg/tpm/Tspi_TPM_KeyControlOwner01.c
+++ b/testsuite/tcg/tpm/Tspi_TPM_KeyControlOwner01.c
@@ -191,7 +191,8 @@ main_v1_2(char version){
 
 		//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);
@@ -201,6 +202,9 @@ main_v1_2(char version){
 	} 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);