From e8e57e1d22f7fb121d633dd1733d7207f4e879d1 Mon Sep 17 00:00:00 2001 From: Stefan Berger Date: Thu, 12 Jul 2018 15:21:28 -0400 Subject: [PATCH] rev148: Remove unused include file Signed-off-by: Stefan Berger --- src/Makefile.am | 1 - src/tpm2/EncryptDecrypt_spt.c | 4 +- src/tpm2/EncryptDecrypt_spt.h | 78 ----------------------------------- 3 files changed, 2 insertions(+), 81 deletions(-) delete mode 100644 src/tpm2/EncryptDecrypt_spt.h diff --git a/src/Makefile.am b/src/Makefile.am index dbe945de..0ada97ce 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -333,7 +333,6 @@ noinst_HEADERS += \ tpm2/EC_Ephemeral_fp.h \ tpm2/EncryptDecrypt2_fp.h \ tpm2/EncryptDecrypt_fp.h \ - tpm2/EncryptDecrypt_spt.h \ tpm2/EncryptDecrypt_spt_fp.h \ tpm2/Entity_fp.h \ tpm2/EventSequenceComplete_fp.h \ diff --git a/src/tpm2/EncryptDecrypt_spt.c b/src/tpm2/EncryptDecrypt_spt.c index 36e8f2d9..01bce3c4 100644 --- a/src/tpm2/EncryptDecrypt_spt.c +++ b/src/tpm2/EncryptDecrypt_spt.c @@ -3,7 +3,7 @@ /* Encrypt Decrypt Support */ /* Written by Ken Goldman */ /* IBM Thomas J. Watson Research Center */ -/* $Id: EncryptDecrypt_spt.c 1259 2018-07-10 19:11:09Z kgoldman $ */ +/* $Id: EncryptDecrypt_spt.c 1264 2018-07-12 14:21:07Z kgoldman $ */ /* */ /* Licenses and Notices */ /* */ @@ -62,7 +62,7 @@ /* 7.7 Encrypt Decrypt Support (EncryptDecrypt_spt.c) */ #include "Tpm.h" #include "EncryptDecrypt_fp.h" -#include "EncryptDecrypt_spt.h" +#include "EncryptDecrypt_spt_fp.h" #if CC_EncryptDecrypt2 /* Error Returns Meaning */ /* TPM_RC_KEY is not a symmetric decryption key with both public and private portions loaded */ diff --git a/src/tpm2/EncryptDecrypt_spt.h b/src/tpm2/EncryptDecrypt_spt.h deleted file mode 100644 index 2fbe2a66..00000000 --- a/src/tpm2/EncryptDecrypt_spt.h +++ /dev/null @@ -1,78 +0,0 @@ -/********************************************************************************/ -/* */ -/* */ -/* Written by Ken Goldman */ -/* IBM Thomas J. Watson Research Center */ -/* $Id: EncryptDecrypt_spt.h 809 2016-11-16 18:31:54Z kgoldman $ */ -/* */ -/* Licenses and Notices */ -/* */ -/* 1. Copyright Licenses: */ -/* */ -/* - Trusted Computing Group (TCG) grants to the user of the source code in */ -/* this specification (the "Source Code") a worldwide, irrevocable, */ -/* nonexclusive, royalty free, copyright license to reproduce, create */ -/* derivative works, distribute, display and perform the Source Code and */ -/* derivative works thereof, and to grant others the rights granted herein. */ -/* */ -/* - The TCG grants to the user of the other parts of the specification */ -/* (other than the Source Code) the rights to reproduce, distribute, */ -/* display, and perform the specification solely for the purpose of */ -/* developing products based on such documents. */ -/* */ -/* 2. Source Code Distribution Conditions: */ -/* */ -/* - Redistributions of Source Code must retain the above copyright licenses, */ -/* this list of conditions and the following disclaimers. */ -/* */ -/* - Redistributions in binary form must reproduce the above copyright */ -/* licenses, this list of conditions and the following disclaimers in the */ -/* documentation and/or other materials provided with the distribution. */ -/* */ -/* 3. Disclaimers: */ -/* */ -/* - THE COPYRIGHT LICENSES SET FORTH ABOVE DO NOT REPRESENT ANY FORM OF */ -/* LICENSE OR WAIVER, EXPRESS OR IMPLIED, BY ESTOPPEL OR OTHERWISE, WITH */ -/* RESPECT TO PATENT RIGHTS HELD BY TCG MEMBERS (OR OTHER THIRD PARTIES) */ -/* THAT MAY BE NECESSARY TO IMPLEMENT THIS SPECIFICATION OR OTHERWISE. */ -/* Contact TCG Administration (admin@trustedcomputinggroup.org) for */ -/* information on specification licensing rights available through TCG */ -/* membership agreements. */ -/* */ -/* - THIS SPECIFICATION IS PROVIDED "AS IS" WITH NO EXPRESS OR IMPLIED */ -/* WARRANTIES WHATSOEVER, INCLUDING ANY WARRANTY OF MERCHANTABILITY OR */ -/* FITNESS FOR A PARTICULAR PURPOSE, ACCURACY, COMPLETENESS, OR */ -/* NONINFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS, OR ANY WARRANTY */ -/* OTHERWISE ARISING OUT OF ANY PROPOSAL, SPECIFICATION OR SAMPLE. */ -/* */ -/* - Without limitation, TCG and its members and licensors disclaim all */ -/* liability, including liability for infringement of any proprietary */ -/* rights, relating to use of information in this specification and to the */ -/* implementation of this specification, and TCG disclaims all liability for */ -/* cost of procurement of substitute goods or services, lost profits, loss */ -/* of use, loss of data or any incidental, consequential, direct, indirect, */ -/* or special damages, whether under contract, tort, warranty or otherwise, */ -/* arising in any way out of use or reliance upon this specification or any */ -/* information herein. */ -/* */ -/* (c) Copyright IBM Corp. and others, 2016 */ -/* */ -/********************************************************************************/ - -#ifndef ENCRYPTDECRYPT_SPT_H -#define ENCRYPTDECRYPT_SPT_H - -#include "EncryptDecrypt_fp.h" - -TPM_RC -EncryptDecryptShared( - TPMI_DH_OBJECT keyHandleIn, - TPMI_YES_NO decryptIn, - TPMI_ALG_SYM_MODE modeIn, - TPM2B_IV *ivIn, - TPM2B_MAX_BUFFER *inData, - EncryptDecrypt_Out *out - ); - - -#endif