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

Unified Diff: tpm/tpm_delegation.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_data.c ('k') | tpm/tpm_deprecated.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tpm/tpm_delegation.c
diff --git a/tpm/tpm_delegation.c b/tpm/tpm_delegation.c
index 25ea18f75761052fb0bf22ca7c69e828021f73fe..6954961f7b2c6e2c7ede1067f51b7b6f97baafc5 100644
--- a/tpm/tpm_delegation.c
+++ b/tpm/tpm_delegation.c
@@ -1,7 +1,5 @@
-/* Software-Based Trusted Platform Module (TPM) Emulator for Linux
- * Copyright (C) 2006 Mario Strasser <mast@gmx.net>,
- * Domenic Schröder <schroeder@gmx.ch>,
- * 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
@@ -13,7 +11,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * $Id$
+ * $Id: tpm_delegation.c 367 2010-02-13 15:52:18Z mast $
*/
#include "tpm_emulator.h"
@@ -555,13 +553,6 @@ TPM_RESULT TPM_Delegate_ReadTable(UINT32 *familyTableSize, BYTE **familyTable,
return TPM_SUCCESS;
}
-static TPM_TAG get_structure_tag(BYTE *ptr, UINT32 length)
-{
- TPM_TAG tag;
- if (tpm_unmarshal_TPM_TAG(&ptr, &length, &tag) != 0) return 0xffff;
- return tag;
-}
-
TPM_RESULT TPM_Delegate_UpdateVerification(UINT32 inputSize, BYTE *inputData,
TPM_AUTH *auth1, UINT32 *outputSize,
BYTE **outputData)
« no previous file with comments | « tpm/tpm_data.c ('k') | tpm/tpm_deprecated.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698