Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Unified Diff: tpm/tpm_authorization.c

Issue 660204: Upgrade to tpm-emulator version 0.7. (Closed)
Patch Set: Created 10 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tpm/tpm_audit.c ('k') | tpm/tpm_capability.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tpm/tpm_authorization.c
diff --git a/tpm/tpm_authorization.c b/tpm/tpm_authorization.c
index 23e59be103d90589d2cf8d9f9e516f729092b84e..e28580f2d3f356e346076b8e9b0f9b61ec042106 100644
--- a/tpm/tpm_authorization.c
+++ b/tpm/tpm_authorization.c
@@ -1,6 +1,5 @@
-/* Software-Based Trusted Platform Module (TPM) Emulator for Linux
- * Copyright (C) 2004 Mario Strasser <mast@gmx.net>,
- * Swiss Federal Institute of Technology (ETH) Zurich
+/* Software-based Trusted Platform Module (TPM) Emulator
+ * Copyright (C) 2004-2010 Mario Strasser <mast@gmx.net>
*
* This module is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published
@@ -12,7 +11,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * $Id$
+ * $Id: tpm_authorization.c 367 2010-02-13 15:52:18Z mast $
*/
#include "tpm_emulator.h"
@@ -197,6 +196,7 @@ TPM_RESULT TPM_OSAP(TPM_ENTITY_TYPE entityType, UINT32 entityValue,
debug("TPM_OSAP failed(): tpm_get_key(handle) == NULL");
break;
case TPM_ET_OWNER:
+ case TPM_ET_VERIFICATION_AUTH:
session->handle = TPM_KH_OWNER;
if (tpmData.permanent.flags.owned)
secret = &tpmData.permanent.data.ownerAuth;
« no previous file with comments | « tpm/tpm_audit.c ('k') | tpm/tpm_capability.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698