From e91b1dd595927755af8ebb40e07b7a327662cf09 Mon Sep 17 00:00:00 2001 From: Stefan Berger Date: Mon, 11 Aug 2025 15:54:22 -0400 Subject: [PATCH] tpm2: Adopt the directory structure of upstream code repo Signed-off-by: Stefan Berger --- configure.ac | 2 +- scripts/meld-all | 4 +- src/Makefile.am | 839 +++++++++--------- src/tpm2/BackwardsCompatibilityBitArray.h | 2 +- src/tpm2/{crypto => }/CryptDes_fp.h | 0 src/tpm2/NVMarshal.c | 2 +- src/tpm2/NVMarshal.h | 2 +- src/tpm2/Platform.h | 26 - src/tpm2/Platform_fp.h | 3 +- src/tpm2/RuntimeAlgorithm.c | 2 +- src/tpm2/StateMarshal.h | 2 +- src/tpm2/TPMCmd/Platform/include/Platform.h | 28 + .../Platform/include}/PlatformACT.h | 0 .../Platform/include}/PlatformClock.h | 0 .../Platform/include}/PlatformData.h | 0 .../Platform/include}/PlatformInternal.h | 0 .../prototypes}/platform_public_interface.h | 0 src/tpm2/{ => TPMCmd/Platform/src}/Cancel.c | 0 src/tpm2/{ => TPMCmd/Platform/src}/Clock.c | 0 .../{ => TPMCmd/Platform/src}/DebugHelpers.c | 0 src/tpm2/{ => TPMCmd/Platform/src}/Entropy.c | 0 .../{ => TPMCmd/Platform/src}/ExtraData.c | 0 src/tpm2/{ => TPMCmd/Platform/src}/Failure.c | 0 src/tpm2/{ => TPMCmd/Platform/src}/Init.c | 0 .../{ => TPMCmd/Platform/src}/LocalityPlat.c | 0 src/tpm2/{ => TPMCmd/Platform/src}/NVMem.c | 0 .../{ => TPMCmd/Platform/src}/NVVirtual.c | 6 +- src/tpm2/{ => TPMCmd/Platform/src}/PPPlat.c | 0 .../{ => TPMCmd/Platform/src}/PlatformACT.c | 0 .../{ => TPMCmd/Platform/src}/PlatformData.c | 0 .../{ => TPMCmd/Platform/src}/PlatformPcr.c | 2 +- .../{ => TPMCmd/Platform/src}/PowerPlat.c | 0 .../{ => TPMCmd/Platform/src}/RunCommand.c | 0 src/tpm2/{ => TPMCmd/Platform/src}/SelfTest.c | 4 +- src/tpm2/{ => TPMCmd/Platform/src}/Unique.c | 0 .../{ => TPMCmd/Platform/src}/VendorInfo.c | 0 .../Simulator/include}/TpmTcpProtocol.h | 0 .../include/prototypes}/Simulator_fp.h | 0 src/tpm2/{ => TPMCmd/Simulator/src}/TPMCmdp.c | 0 .../Simulator/src}/simulatorPrivate.h | 37 +- .../Simulator/src}/simulator_sysheaders.h | 0 .../TpmConfiguration}/TpmBuildSwitches.h | 2 +- .../TpmConfiguration}/TpmProfile.h | 10 +- .../TpmProfile_CommandList.h | 2 +- .../TpmConfiguration}/TpmProfile_Common.h | 0 .../TpmConfiguration}/TpmProfile_ErrorCodes.h | 0 .../TpmConfiguration}/TpmProfile_Misc.h | 0 .../CommandAttributeData_s_ccAttr.inl | 0 ...mmandAttributeData_s_commandAttributes.inl | 0 .../CommandDispatchData_CommandStructures.inl | 2 +- ...CommandDispatchData_s_CommandDataArray.inl | 0 .../VendorCommands/VendorCommandList.h | 0 .../prototypes}/Vendor_TCG_Test_fp.h | 0 .../Vendor_TCG_Test.c | 7 +- .../EccRef}/TpmEcc_Signature_ECDSA.c | 0 .../tpm/cryptolibs/Ossl}/BnToOsslMath.c | 2 +- .../tpm/cryptolibs/Ossl}/ExpDCache.c | 0 .../tpm/cryptolibs/Ossl}/Helpers.c | 0 .../cryptolibs/Ossl}/TpmToOsslDesSupport.c | 0 .../tpm/cryptolibs/Ossl}/TpmToOsslSupport.c | 6 +- .../tpm/cryptolibs/Ossl/include}/BnOssl.h | 16 +- .../Ossl/include/Ossl}/BnToOsslMath.h | 4 +- .../Ossl/include/Ossl}/BnToOsslMath_fp.h | 0 .../Ossl/include/Ossl}/ExpDCache_fp.h | 0 .../Ossl/include/Ossl}/Helpers_fp.h | 2 +- .../include/Ossl}/TpmToOsslDesSupport_fp.h | 0 .../Ossl/include/Ossl}/TpmToOsslHash.h | 0 .../Ossl/include/Ossl}/TpmToOsslSupport_fp.h | 0 .../Ossl/include/Ossl}/TpmToOsslSym.h | 0 .../tpm/cryptolibs/RsaRef}/PrimeData.c | 0 .../tpm/cryptolibs/TpmBigNum}/BnConvert.c | 0 .../cryptolibs/TpmBigNum}/BnEccConstants.c | 4 +- .../tpm/cryptolibs/TpmBigNum}/BnMath.c | 0 .../tpm/cryptolibs/TpmBigNum}/BnMemory.c | 0 .../tpm/cryptolibs/TpmBigNum}/TpmBigNum.h | 16 +- .../cryptolibs/TpmBigNum}/TpmBigNumThunks.c | 0 .../TpmBigNum/include}/BnConvert_fp.h | 0 .../cryptolibs/TpmBigNum/include}/BnMath_fp.h | 0 .../TpmBigNum/include}/BnMemory_fp.h | 0 .../TpmBigNum/include}/BnSupport_Interface.h | 4 +- .../cryptolibs/TpmBigNum/include}/BnUtil_fp.h | 0 .../cryptolibs/TpmBigNum/include}/BnValues.h | 8 +- .../include/TpmBigNum}/TpmToTpmBigNumMath.h | 8 +- .../common/include}/CryptoInterface.h | 2 +- .../common/include}/EccConstantData.inl | 0 .../common/include}/MathLibraryInterface.h | 0 .../include}/MathLibraryInterfaceTypes.h | 0 .../include/platform_interface}/pcrstruct.h | 6 +- .../platform_to_tpm_interface.h | 10 + .../prototypes}/ExecCommand_fp.h | 0 .../prototypes}/Manufacture_fp.h | 0 .../prototypes}/_TPM_Hash_Data_fp.h | 0 .../prototypes}/_TPM_Hash_End_fp.h | 0 .../prototypes}/_TPM_Hash_Start_fp.h | 0 .../prototypes}/_TPM_Init_fp.h | 0 .../prototypes}/platform_failure_mode_fp.h | 0 .../prototypes}/platform_init_fp.h | 0 .../prototypes}/platform_pcr_fp.h | 6 +- .../prototypes}/platform_virtual_nv_fp.h | 4 +- .../tpm_to_platform_interface.h | 12 +- .../include/private}/CommandAttributeData.h | 4 +- .../tpm/include/private}/CommandAttributes.h | 0 .../include/private}/CommandDispatchData.h | 4 +- .../tpm/include/private}/CryptEcc.h | 0 .../tpm/include/private}/CryptHash.h | 0 .../tpm/include/private}/CryptRand.h | 0 .../tpm/include/private}/CryptRsa.h | 0 .../tpm/include/private}/CryptSym.h | 0 .../tpm/include/private}/CryptTest.h | 0 .../tpm/include/private}/EccTestData.h | 0 .../{ => TPMCmd/tpm/include/private}/Global.h | 10 +- .../tpm/include/private}/HashTestData.h | 0 .../tpm/include/private}/InternalRoutines.h | 33 +- .../tpm/include/private}/KdfTestData.h | 0 .../tpm/include/private}/LibSupport.h | 2 +- .../tpm/include/private}/Marshal.h | 0 .../{ => TPMCmd/tpm/include/private}/NV.h | 0 .../{ => TPMCmd/tpm/include/private}/OIDs.h | 0 .../tpm/include/private}/PRNG_TestVectors.h | 0 .../tpm/include/private}/RsaTestData.h | 0 .../tpm/include/private}/SelfTest.h | 0 .../tpm/include/private}/SymmetricTest.h | 0 .../tpm/include/private}/SymmetricTestData.h | 0 .../{ => TPMCmd/tpm/include/private}/Tpm.h | 6 +- .../tpm/include/private}/TpmASN1.h | 0 .../{ => TPMCmd/tpm/include/private}/X509.h | 0 .../private/prototypes}/ACT_SetTimeout_fp.h | 0 .../include/private/prototypes}/ACT_spt_fp.h | 0 .../prototypes}/ActivateCredential_fp.h | 0 .../private/prototypes}/AlgorithmCap_fp.h | 0 .../private/prototypes}/AlgorithmTests_fp.h | 0 .../private/prototypes}/Attest_spt_fp.h | 0 .../tpm/include/private/prototypes}/Bits_fp.h | 0 .../private/prototypes}/CertifyCreation_fp.h | 0 .../private/prototypes}/CertifyX509_fp.h | 0 .../include/private/prototypes}/Certify_fp.h | 0 .../private/prototypes}/ChangeEPS_fp.h | 0 .../private/prototypes}/ChangePPS_fp.h | 0 .../private/prototypes}/ClearControl_fp.h | 0 .../include/private/prototypes}/Clear_fp.h | 0 .../private/prototypes}/ClockRateAdjust_fp.h | 0 .../include/private/prototypes}/ClockSet_fp.h | 0 .../private/prototypes}/CommandAudit_fp.h | 0 .../prototypes}/CommandCodeAttributes_fp.h | 0 .../prototypes}/CommandDispatcher_fp.h | 0 .../include/private/prototypes}/Commit_fp.h | 0 .../private/prototypes}/ContextLoad_fp.h | 0 .../private/prototypes}/ContextSave_fp.h | 0 .../private/prototypes}/Context_spt_fp.h | 0 .../private/prototypes}/CreateLoaded_fp.h | 0 .../private/prototypes}/CreatePrimary_fp.h | 0 .../include/private/prototypes}/Create_fp.h | 0 .../private/prototypes}/CryptCmac_fp.h | 0 .../private/prototypes}/CryptEccCrypt_fp.h | 0 .../prototypes}/CryptEccKeyExchange_fp.h | 0 .../private/prototypes}/CryptEccMain_fp.h | 2 +- .../prototypes}/CryptEccSignature_fp.h | 0 .../private/prototypes}/CryptHash_fp.h | 0 .../private/prototypes}/CryptPrimeSieve_fp.h | 0 .../private/prototypes}/CryptPrime_fp.h | 0 .../private/prototypes}/CryptRand_fp.h | 0 .../include/private/prototypes}/CryptRsa_fp.h | 0 .../private/prototypes}/CryptSelfTest_fp.h | 0 .../private/prototypes}/CryptSmac_fp.h | 0 .../include/private/prototypes}/CryptSym_fp.h | 0 .../private/prototypes}/CryptUtil_fp.h | 0 .../tpm/include/private/prototypes}/DA_fp.h | 0 .../DictionaryAttackLockReset_fp.h | 0 .../DictionaryAttackParameters_fp.h | 0 .../private/prototypes}/Duplicate_fp.h | 0 .../private/prototypes}/ECC_Decrypt_fp.h | 0 .../private/prototypes}/ECC_Encrypt_fp.h | 0 .../private/prototypes}/ECC_Parameters_fp.h | 0 .../private/prototypes}/ECDH_KeyGen_fp.h | 0 .../private/prototypes}/ECDH_ZGen_fp.h | 0 .../private/prototypes}/EC_Ephemeral_fp.h | 0 .../private/prototypes}/EncryptDecrypt2_fp.h | 0 .../private/prototypes}/EncryptDecrypt_fp.h | 0 .../prototypes}/EncryptDecrypt_spt_fp.h | 0 .../include/private/prototypes}/Entity_fp.h | 0 .../prototypes}/EventSequenceComplete_fp.h | 0 .../private/prototypes}/EvictControl_fp.h | 0 .../private/prototypes}/FlushContext_fp.h | 0 .../private/prototypes}/GetCapability_fp.h | 0 .../prototypes}/GetCommandAuditDigest_fp.h | 0 .../private/prototypes}/GetRandom_fp.h | 0 .../prototypes}/GetSessionAuditDigest_fp.h | 0 .../private/prototypes}/GetTestResult_fp.h | 0 .../include/private/prototypes}/GetTime_fp.h | 0 .../private/prototypes}/HMAC_Start_fp.h | 0 .../tpm/include/private/prototypes}/HMAC_fp.h | 0 .../include/private/prototypes}/Handle_fp.h | 0 .../prototypes}/HashSequenceStart_fp.h | 0 .../tpm/include/private/prototypes}/Hash_fp.h | 0 .../prototypes}/HierarchyChangeAuth_fp.h | 0 .../private/prototypes}/HierarchyControl_fp.h | 0 .../private/prototypes}/Hierarchy_fp.h | 0 .../include/private/prototypes}/Import_fp.h | 0 .../prototypes}/IncrementalSelfTest_fp.h | 0 .../private/prototypes}/IoBuffers_fp.h | 0 .../private/prototypes}/LoadExternal_fp.h | 0 .../tpm/include/private/prototypes}/Load_fp.h | 0 .../include/private/prototypes}/Locality_fp.h | 0 .../private/prototypes}/MAC_Start_fp.h | 0 .../tpm/include/private/prototypes}/MAC_fp.h | 0 .../private/prototypes}/MakeCredential_fp.h | 0 .../include/private/prototypes}/Marshal_fp.h | 2 +- .../prototypes}/MathOnByteBuffers_fp.h | 0 .../include/private/prototypes}/Memory_fp.h | 0 .../private/prototypes}/NV_Certify_fp.h | 0 .../private/prototypes}/NV_ChangeAuth_fp.h | 0 .../private/prototypes}/NV_DefineSpace2_fp.h | 0 .../private/prototypes}/NV_DefineSpace_fp.h | 0 .../private/prototypes}/NV_Extend_fp.h | 0 .../prototypes}/NV_GlobalWriteLock_fp.h | 0 .../private/prototypes}/NV_Increment_fp.h | 0 .../private/prototypes}/NV_ReadLock_fp.h | 0 .../private/prototypes}/NV_ReadPublic2_fp.h | 0 .../private/prototypes}/NV_ReadPublic_fp.h | 0 .../include/private/prototypes}/NV_Read_fp.h | 0 .../private/prototypes}/NV_SetBits_fp.h | 0 .../prototypes}/NV_UndefineSpaceSpecial_fp.h | 0 .../private/prototypes}/NV_UndefineSpace_fp.h | 0 .../private/prototypes}/NV_WriteLock_fp.h | 0 .../include/private/prototypes}/NV_Write_fp.h | 0 .../include/private/prototypes}/NV_spt_fp.h | 0 .../private/prototypes}/NvDynamic_fp.h | 0 .../private/prototypes}/NvReserved_fp.h | 0 .../private/prototypes}/ObjectChangeAuth_fp.h | 0 .../include/private/prototypes}/Object_fp.h | 0 .../private/prototypes}/Object_spt_fp.h | 0 .../private/prototypes}/PCR_Allocate_fp.h | 0 .../private/prototypes}/PCR_Event_fp.h | 0 .../private/prototypes}/PCR_Extend_fp.h | 0 .../include/private/prototypes}/PCR_Read_fp.h | 0 .../private/prototypes}/PCR_Reset_fp.h | 0 .../prototypes}/PCR_SetAuthPolicy_fp.h | 0 .../private/prototypes}/PCR_SetAuthValue_fp.h | 0 .../tpm/include/private/prototypes}/PCR_fp.h | 0 .../private/prototypes}/PP_Commands_fp.h | 0 .../tpm/include/private/prototypes}/PP_fp.h | 0 .../private/prototypes}/PolicyAuthValue_fp.h | 0 .../prototypes}/PolicyAuthorizeNV_fp.h | 0 .../private/prototypes}/PolicyAuthorize_fp.h | 0 .../private/prototypes}/PolicyCapability_fp.h | 0 .../prototypes}/PolicyCommandCode_fp.h | 0 .../prototypes}/PolicyCounterTimer_fp.h | 0 .../private/prototypes}/PolicyCpHash_fp.h | 0 .../prototypes}/PolicyDuplicationSelect_fp.h | 0 .../private/prototypes}/PolicyGetDigest_fp.h | 0 .../private/prototypes}/PolicyLocality_fp.h | 0 .../include/private/prototypes}/PolicyNV_fp.h | 0 .../private/prototypes}/PolicyNameHash_fp.h | 0 .../private/prototypes}/PolicyNvWritten_fp.h | 0 .../include/private/prototypes}/PolicyOR_fp.h | 0 .../private/prototypes}/PolicyPCR_fp.h | 0 .../private/prototypes}/PolicyParameters_fp.h | 0 .../private/prototypes}/PolicyPassword_fp.h | 0 .../prototypes}/PolicyPhysicalPresence_fp.h | 0 .../private/prototypes}/PolicyRestart_fp.h | 0 .../private/prototypes}/PolicySecret_fp.h | 0 .../private/prototypes}/PolicySigned_fp.h | 0 .../private/prototypes}/PolicyTemplate_fp.h | 0 .../private/prototypes}/PolicyTicket_fp.h | 0 .../prototypes}/PolicyTransportSPDM_fp.h | 0 .../private/prototypes}/Policy_spt_fp.h | 0 .../include/private/prototypes}/Power_fp.h | 0 .../private/prototypes}/PropertyCap_fp.h | 0 .../include/private/prototypes}/Quote_fp.h | 0 .../private/prototypes}/RSA_Decrypt_fp.h | 0 .../private/prototypes}/RSA_Encrypt_fp.h | 0 .../private/prototypes}/ReadClock_fp.h | 0 .../private/prototypes}/ReadOnlyControl_fp.h | 0 .../private/prototypes}/ReadPublic_fp.h | 0 .../prototypes}/ResponseCodeProcessing_fp.h | 0 .../include/private/prototypes}/Response_fp.h | 0 .../include/private/prototypes}/Rewrap_fp.h | 0 .../private/prototypes}/SecChannel_fp.h | 0 .../include/private/prototypes}/SelfTest_fp.h | 0 .../private/prototypes}/SequenceComplete_fp.h | 0 .../private/prototypes}/SequenceUpdate_fp.h | 0 .../private/prototypes}/SessionProcess_fp.h | 0 .../include/private/prototypes}/Session_fp.h | 0 .../private/prototypes}/SetAlgorithmSet_fp.h | 0 .../private/prototypes}/SetCapability_fp.h | 0 .../SetCommandCodeAuditStatus_fp.h | 0 .../private/prototypes}/SetPrimaryPolicy_fp.h | 0 .../include/private/prototypes}/Shutdown_fp.h | 0 .../tpm/include/private/prototypes}/Sign_fp.h | 0 .../private/prototypes}/StartAuthSession_fp.h | 0 .../include/private/prototypes}/Startup_fp.h | 0 .../private/prototypes}/StirRandom_fp.h | 0 .../private/prototypes}/TestParms_fp.h | 0 .../include/private/prototypes}/Ticket_fp.h | 0 .../tpm/include/private/prototypes}/Time_fp.h | 0 .../include/private/prototypes}/TpmASN1_fp.h | 0 .../prototypes}/TpmEcc_Signature_ECDAA_fp.h | 0 .../prototypes}/TpmEcc_Signature_ECDSA_fp.h | 2 +- .../prototypes}/TpmEcc_Signature_SM2_fp.h | 0 .../prototypes}/TpmEcc_Signature_Schnorr_fp.h | 0 .../prototypes}/TpmEcc_Signature_Util_fp.h | 0 .../private/prototypes}/TpmEcc_Util_fp.h | 0 .../private/prototypes}/TpmMath_Debug_fp.h | 0 .../private/prototypes}/TpmMath_Util_fp.h | 0 .../private/prototypes}/TpmSizeChecks_fp.h | 0 .../include/private/prototypes}/Unseal_fp.h | 0 .../private/prototypes}/VerifySignature_fp.h | 0 .../include/private/prototypes}/X509_ECC_fp.h | 0 .../include/private/prototypes}/X509_RSA_fp.h | 0 .../include/private/prototypes}/X509_spt_fp.h | 0 .../private/prototypes}/ZGen_2Phase_fp.h | 0 .../{ => TPMCmd/tpm/include/tpm_public}/ACT.h | 2 +- .../tpm/include/tpm_public}/BaseTypes.h | 0 .../tpm/include/tpm_public}/Capabilities.h | 0 .../tpm_public}/CompilerDependencies.h | 0 .../tpm_public}/CompilerDependencies_gcc.h | 0 .../tpm_public}/CompilerDependencies_msvc.h | 0 .../tpm/include/tpm_public}/GpMacros.h | 5 +- .../tpm/include/tpm_public}/MinMax.h | 0 .../tpm/include/tpm_public}/TPMB.h | 2 +- .../include/tpm_public}/TpmAlgorithmDefines.h | 6 +- .../tpm_public}/TpmCalculatedAttributes.h | 4 +- .../tpm/include/tpm_public}/TpmTypes.h | 8 +- .../include/tpm_public}/VerifyConfiguration.h | 0 .../tpm/include/tpm_public}/endian_swap.h | 0 .../tpm_public/prototypes}/TpmFail_fp.h | 0 .../tpm/include/tpm_public}/tpm_debug.h | 2 +- .../tpm/include/tpm_public/tpm_public.h | 15 + .../tpm/include/tpm_public}/tpm_radix.h | 0 src/tpm2/{ => TPMCmd/tpm/src/X509}/TpmASN1.c | 0 src/tpm2/{ => TPMCmd/tpm/src/X509}/X509_ECC.c | 0 src/tpm2/{ => TPMCmd/tpm/src/X509}/X509_RSA.c | 0 src/tpm2/{ => TPMCmd/tpm/src/X509}/X509_spt.c | 0 .../tpm/src/command/Attestation}/Attest_spt.c | 0 .../tpm/src/command/Attestation}/Quote.c | 0 .../tpm/src/command/ClockTimer}/ACT_spt.c | 2 +- .../tpm/src/command/Context}/Context_spt.c | 0 .../tpm/src/command/Duplication}/Duplicate.c | 0 .../tpm/src/command/Duplication}/Import.c | 0 .../tpm/src/command/EA}/PolicyAuthorize.c | 0 .../tpm/src/command/EA}/PolicyAuthorizeNV.c | 0 .../tpm/src/command/EA}/PolicyPCR.c | 0 .../tpm/src/command/EA}/PolicySecret.c | 0 .../tpm/src/command/EA}/PolicySigned.c | 0 .../tpm/src/command/EA}/PolicyTicket.c | 0 .../tpm/src/command/EA}/PolicyTransportSPDM.c | 0 .../tpm/src/command/EA}/Policy_spt.c | 0 .../src/command/Hierarchy}/CreatePrimary.c | 0 .../src/command/Hierarchy}/ReadOnlyControl.c | 0 .../tpm/src/command/NVStorage}/NV_Read.c | 2 +- .../src/command/NVStorage}/NV_ReadPublic.c | 2 +- .../src/command/NVStorage}/NV_ReadPublic2.c | 2 +- .../tpm/src/command/NVStorage}/NV_spt.c | 0 .../tpm/src/command/Object}/Create.c | 0 .../tpm/src/command/Object}/CreateLoaded.c | 0 .../tpm/src/command/Object}/MakeCredential.c | 0 .../src/command/Object}/ObjectChangeAuth.c | 0 .../tpm/src/command/Object}/Object_spt.c | 0 .../tpm/src/command/PCR}/PCR_Read.c | 0 .../command/Symmetric}/EncryptDecrypt_spt.c | 0 .../tpm/src/crypt}/AlgorithmTests.c | 0 .../tpm/src/crypt}/CryptCmac.c | 0 .../tpm/src/crypt}/CryptDes.c | 0 .../tpm/src/crypt}/CryptEccCrypt.c | 0 .../{ => TPMCmd/tpm/src/crypt}/CryptEccData.c | 0 .../tpm/src/crypt}/CryptEccKeyExchange.c | 0 .../tpm/src/crypt}/CryptEccMain.c | 0 .../tpm/src/crypt}/CryptEccSignature.c | 0 .../tpm/src/crypt}/CryptHash.c | 0 .../tpm/src/crypt}/CryptPrime.c | 0 .../tpm/src/crypt}/CryptPrimeSieve.c | 0 .../tpm/src/crypt}/CryptRand.c | 0 .../tpm/src/crypt}/CryptRsa.c | 0 .../tpm/src/crypt}/CryptSelfTest.c | 0 .../tpm/src/crypt}/CryptSmac.c | 0 .../tpm/src/crypt}/CryptSym.c | 2 +- .../{ => TPMCmd/tpm/src/crypt}/CryptUtil.c | 0 src/tpm2/{ => TPMCmd/tpm/src/crypt}/Ticket.c | 0 .../src/crypt/ecc}/TpmEcc_Signature_ECDAA.c | 0 .../tpm/src/crypt/ecc}/TpmEcc_Signature_SM2.c | 0 .../src/crypt/ecc}/TpmEcc_Signature_Schnorr.c | 0 .../src/crypt/ecc}/TpmEcc_Signature_Util.c | 0 .../tpm/src/crypt/ecc}/TpmEcc_Util.c | 0 .../tpm/src/crypt/math}/TpmMath_Debug.c | 0 .../tpm/src/crypt/math}/TpmMath_Util.c | 0 .../{ => TPMCmd/tpm/src/events}/_TPM_Init.c | 5 +- .../tpm/src/main}/CommandDispatcher.c | 0 .../{ => TPMCmd/tpm/src/main}/ExecCommand.c | 2 +- .../tpm/src/main}/SessionProcess.c | 4 +- .../tpm/src/subsystem}/CommandAudit.c | 0 src/tpm2/{ => TPMCmd/tpm/src/subsystem}/DA.c | 0 .../tpm/src/subsystem}/Hierarchy.c | 0 .../tpm/src/subsystem}/NvDynamic.c | 2 +- .../tpm/src/subsystem}/NvReserved.c | 0 .../{ => TPMCmd/tpm/src/subsystem}/Object.c | 0 src/tpm2/{ => TPMCmd/tpm/src/subsystem}/PCR.c | 0 src/tpm2/{ => TPMCmd/tpm/src/subsystem}/PP.c | 0 .../{ => TPMCmd/tpm/src/subsystem}/Session.c | 0 .../{ => TPMCmd/tpm/src/subsystem}/Time.c | 0 .../tpm/src/support}/AlgorithmCap.c | 0 src/tpm2/{ => TPMCmd/tpm/src/support}/Bits.c | 0 .../tpm/src/support}/CommandCodeAttributes.c | 0 .../{ => TPMCmd/tpm/src/support}/Entity.c | 2 +- .../{ => TPMCmd/tpm/src/support}/Global.c | 0 .../{ => TPMCmd/tpm/src/support}/Handle.c | 0 .../{ => TPMCmd/tpm/src/support}/IoBuffers.c | 0 .../{ => TPMCmd/tpm/src/support}/Locality.c | 0 .../tpm/src/support}/Manufacture.c | 0 .../{ => TPMCmd/tpm/src/support}/Marshal.c | 0 .../tpm/src/support}/MathOnByteBuffers.c | 0 .../{ => TPMCmd/tpm/src/support}/Memory.c | 0 src/tpm2/{ => TPMCmd/tpm/src/support}/Power.c | 0 .../tpm/src/support}/PropertyCap.c | 0 .../{ => TPMCmd/tpm/src/support}/Response.c | 0 .../tpm/src/support}/ResponseCodeProcessing.c | 0 .../{ => TPMCmd/tpm/src/support}/SecChannel.c | 0 .../{ => TPMCmd/tpm/src/support}/TpmFail.c | 2 +- .../tpm/src/support}/TpmSizeChecks.c | 0 src/tpm2/Unmarshal_fp.h | 2 +- src/tpm2/Utils.h | 2 +- src/tpm2/Volatile.h | 2 +- src/tpm2/crypto/CryptSelfTest_fp.h | 127 --- src/tpm2/crypto/openssl/ConsttimeUtils.h | 100 --- src/tpm2/crypto/openssl/consttime.txt | 76 -- src/tpm2/crypto/openssl/consttime.txt' | 58 -- src/tpm2/platform_to_tpm_interface.h | 72 -- src/tpm2/tpm_public.h | 12 - src/tpm_tpm2_interface.c | 24 +- src/tpm_tpm2_tis.c | 13 +- tests/Makefile.am | 32 +- 430 files changed, 674 insertions(+), 1076 deletions(-) rename src/tpm2/{crypto => }/CryptDes_fp.h (100%) delete mode 100644 src/tpm2/Platform.h create mode 100644 src/tpm2/TPMCmd/Platform/include/Platform.h rename src/tpm2/{ => TPMCmd/Platform/include}/PlatformACT.h (100%) rename src/tpm2/{ => TPMCmd/Platform/include}/PlatformClock.h (100%) rename src/tpm2/{ => TPMCmd/Platform/include}/PlatformData.h (100%) rename src/tpm2/{ => TPMCmd/Platform/include}/PlatformInternal.h (100%) rename src/tpm2/{ => TPMCmd/Platform/include/prototypes}/platform_public_interface.h (100%) rename src/tpm2/{ => TPMCmd/Platform/src}/Cancel.c (100%) rename src/tpm2/{ => TPMCmd/Platform/src}/Clock.c (100%) rename src/tpm2/{ => TPMCmd/Platform/src}/DebugHelpers.c (100%) rename src/tpm2/{ => TPMCmd/Platform/src}/Entropy.c (100%) rename src/tpm2/{ => TPMCmd/Platform/src}/ExtraData.c (100%) rename src/tpm2/{ => TPMCmd/Platform/src}/Failure.c (100%) rename src/tpm2/{ => TPMCmd/Platform/src}/Init.c (100%) rename src/tpm2/{ => TPMCmd/Platform/src}/LocalityPlat.c (100%) rename src/tpm2/{ => TPMCmd/Platform/src}/NVMem.c (100%) rename src/tpm2/{ => TPMCmd/Platform/src}/NVVirtual.c (92%) rename src/tpm2/{ => TPMCmd/Platform/src}/PPPlat.c (100%) rename src/tpm2/{ => TPMCmd/Platform/src}/PlatformACT.c (100%) rename src/tpm2/{ => TPMCmd/Platform/src}/PlatformData.c (100%) rename src/tpm2/{ => TPMCmd/Platform/src}/PlatformPcr.c (99%) rename src/tpm2/{ => TPMCmd/Platform/src}/PowerPlat.c (100%) rename src/tpm2/{ => TPMCmd/Platform/src}/RunCommand.c (100%) rename src/tpm2/{ => TPMCmd/Platform/src}/SelfTest.c (83%) rename src/tpm2/{ => TPMCmd/Platform/src}/Unique.c (100%) rename src/tpm2/{ => TPMCmd/Platform/src}/VendorInfo.c (100%) rename src/tpm2/{ => TPMCmd/Simulator/include}/TpmTcpProtocol.h (100%) rename src/tpm2/{ => TPMCmd/Simulator/include/prototypes}/Simulator_fp.h (100%) rename src/tpm2/{ => TPMCmd/Simulator/src}/TPMCmdp.c (100%) rename src/tpm2/{ => TPMCmd/Simulator/src}/simulatorPrivate.h (66%) rename src/tpm2/{ => TPMCmd/Simulator/src}/simulator_sysheaders.h (100%) rename src/tpm2/{ => TPMCmd/TpmConfiguration/TpmConfiguration}/TpmBuildSwitches.h (99%) rename src/tpm2/{ => TPMCmd/TpmConfiguration/TpmConfiguration}/TpmProfile.h (72%) rename src/tpm2/{ => TPMCmd/TpmConfiguration/TpmConfiguration}/TpmProfile_CommandList.h (99%) rename src/tpm2/{ => TPMCmd/TpmConfiguration/TpmConfiguration}/TpmProfile_Common.h (100%) rename src/tpm2/{ => TPMCmd/TpmConfiguration/TpmConfiguration}/TpmProfile_ErrorCodes.h (100%) rename src/tpm2/{ => TPMCmd/TpmConfiguration/TpmConfiguration}/TpmProfile_Misc.h (100%) rename src/tpm2/{ => TPMCmd/TpmConfiguration/TpmConfiguration}/VendorCommands/CommandAttributeData_s_ccAttr.inl (100%) rename src/tpm2/{ => TPMCmd/TpmConfiguration/TpmConfiguration}/VendorCommands/CommandAttributeData_s_commandAttributes.inl (100%) rename src/tpm2/{ => TPMCmd/TpmConfiguration/TpmConfiguration}/VendorCommands/CommandDispatchData_CommandStructures.inl (95%) rename src/tpm2/{ => TPMCmd/TpmConfiguration/TpmConfiguration}/VendorCommands/CommandDispatchData_s_CommandDataArray.inl (100%) rename src/tpm2/{ => TPMCmd/TpmConfiguration/TpmConfiguration}/VendorCommands/VendorCommandList.h (100%) rename src/tpm2/{VendorCommands => TPMCmd/TpmConfiguration/TpmConfiguration/VendorCommands/prototypes}/Vendor_TCG_Test_fp.h (100%) rename src/tpm2/{VendorCommands => TPMCmd/TpmConfiguration/TpmVendorCommandHandlers}/Vendor_TCG_Test.c (68%) rename src/tpm2/{ => TPMCmd/tpm/cryptolibs/EccRef}/TpmEcc_Signature_ECDSA.c (100%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/cryptolibs/Ossl}/BnToOsslMath.c (99%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/cryptolibs/Ossl}/ExpDCache.c (100%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/cryptolibs/Ossl}/Helpers.c (100%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/cryptolibs/Ossl}/TpmToOsslDesSupport.c (100%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/cryptolibs/Ossl}/TpmToOsslSupport.c (98%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/cryptolibs/Ossl/include}/BnOssl.h (94%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/cryptolibs/Ossl/include/Ossl}/BnToOsslMath.h (99%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/cryptolibs/Ossl/include/Ossl}/BnToOsslMath_fp.h (100%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/cryptolibs/Ossl/include/Ossl}/ExpDCache_fp.h (100%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/cryptolibs/Ossl/include/Ossl}/Helpers_fp.h (99%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/cryptolibs/Ossl/include/Ossl}/TpmToOsslDesSupport_fp.h (100%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/cryptolibs/Ossl/include/Ossl}/TpmToOsslHash.h (100%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/cryptolibs/Ossl/include/Ossl}/TpmToOsslSupport_fp.h (100%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/cryptolibs/Ossl/include/Ossl}/TpmToOsslSym.h (100%) rename src/tpm2/{ => TPMCmd/tpm/cryptolibs/RsaRef}/PrimeData.c (100%) rename src/tpm2/{ => TPMCmd/tpm/cryptolibs/TpmBigNum}/BnConvert.c (100%) rename src/tpm2/{ => TPMCmd/tpm/cryptolibs/TpmBigNum}/BnEccConstants.c (99%) rename src/tpm2/{ => TPMCmd/tpm/cryptolibs/TpmBigNum}/BnMath.c (100%) rename src/tpm2/{ => TPMCmd/tpm/cryptolibs/TpmBigNum}/BnMemory.c (100%) rename src/tpm2/{ => TPMCmd/tpm/cryptolibs/TpmBigNum}/TpmBigNum.h (90%) rename src/tpm2/{ => TPMCmd/tpm/cryptolibs/TpmBigNum}/TpmBigNumThunks.c (100%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/cryptolibs/TpmBigNum/include}/BnConvert_fp.h (100%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/cryptolibs/TpmBigNum/include}/BnMath_fp.h (100%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/cryptolibs/TpmBigNum/include}/BnMemory_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/cryptolibs/TpmBigNum/include}/BnSupport_Interface.h (99%) rename src/tpm2/{ => TPMCmd/tpm/cryptolibs/TpmBigNum/include}/BnUtil_fp.h (100%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/cryptolibs/TpmBigNum/include}/BnValues.h (98%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/cryptolibs/TpmBigNum/include/TpmBigNum}/TpmToTpmBigNumMath.h (96%) rename src/tpm2/{ => TPMCmd/tpm/cryptolibs/common/include}/CryptoInterface.h (98%) rename src/tpm2/{ => TPMCmd/tpm/cryptolibs/common/include}/EccConstantData.inl (100%) rename src/tpm2/{ => TPMCmd/tpm/cryptolibs/common/include}/MathLibraryInterface.h (100%) rename src/tpm2/{ => TPMCmd/tpm/cryptolibs/common/include}/MathLibraryInterfaceTypes.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/platform_interface}/pcrstruct.h (98%) create mode 100644 src/tpm2/TPMCmd/tpm/include/platform_interface/platform_to_tpm_interface.h rename src/tpm2/{ => TPMCmd/tpm/include/platform_interface/prototypes}/ExecCommand_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/platform_interface/prototypes}/Manufacture_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/platform_interface/prototypes}/_TPM_Hash_Data_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/platform_interface/prototypes}/_TPM_Hash_End_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/platform_interface/prototypes}/_TPM_Hash_Start_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/platform_interface/prototypes}/_TPM_Init_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/platform_interface/prototypes}/platform_failure_mode_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/platform_interface/prototypes}/platform_init_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/platform_interface/prototypes}/platform_pcr_fp.h (97%) rename src/tpm2/{ => TPMCmd/tpm/include/platform_interface/prototypes}/platform_virtual_nv_fp.h (95%) rename src/tpm2/{ => TPMCmd/tpm/include/platform_interface}/tpm_to_platform_interface.h (98%) rename src/tpm2/{ => TPMCmd/tpm/include/private}/CommandAttributeData.h (99%) rename src/tpm2/{ => TPMCmd/tpm/include/private}/CommandAttributes.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private}/CommandDispatchData.h (99%) rename src/tpm2/{crypto => TPMCmd/tpm/include/private}/CryptEcc.h (100%) rename src/tpm2/{crypto => TPMCmd/tpm/include/private}/CryptHash.h (100%) rename src/tpm2/{crypto => TPMCmd/tpm/include/private}/CryptRand.h (100%) rename src/tpm2/{crypto => TPMCmd/tpm/include/private}/CryptRsa.h (100%) rename src/tpm2/{crypto => TPMCmd/tpm/include/private}/CryptSym.h (100%) rename src/tpm2/{crypto => TPMCmd/tpm/include/private}/CryptTest.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private}/EccTestData.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private}/Global.h (99%) rename src/tpm2/{ => TPMCmd/tpm/include/private}/HashTestData.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private}/InternalRoutines.h (71%) rename src/tpm2/{ => TPMCmd/tpm/include/private}/KdfTestData.h (100%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/include/private}/LibSupport.h (99%) rename src/tpm2/{ => TPMCmd/tpm/include/private}/Marshal.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private}/NV.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private}/OIDs.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private}/PRNG_TestVectors.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private}/RsaTestData.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private}/SelfTest.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private}/SymmetricTest.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private}/SymmetricTestData.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private}/Tpm.h (96%) rename src/tpm2/{ => TPMCmd/tpm/include/private}/TpmASN1.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private}/X509.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/ACT_SetTimeout_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/ACT_spt_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/ActivateCredential_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/AlgorithmCap_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/AlgorithmTests_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Attest_spt_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Bits_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/CertifyCreation_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/CertifyX509_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Certify_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/ChangeEPS_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/ChangePPS_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/ClearControl_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Clear_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/ClockRateAdjust_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/ClockSet_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/CommandAudit_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/CommandCodeAttributes_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/CommandDispatcher_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Commit_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/ContextLoad_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/ContextSave_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Context_spt_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/CreateLoaded_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/CreatePrimary_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Create_fp.h (100%) rename src/tpm2/{crypto => TPMCmd/tpm/include/private/prototypes}/CryptCmac_fp.h (100%) rename src/tpm2/{crypto => TPMCmd/tpm/include/private/prototypes}/CryptEccCrypt_fp.h (100%) rename src/tpm2/{crypto => TPMCmd/tpm/include/private/prototypes}/CryptEccKeyExchange_fp.h (100%) rename src/tpm2/{crypto => TPMCmd/tpm/include/private/prototypes}/CryptEccMain_fp.h (99%) rename src/tpm2/{crypto => TPMCmd/tpm/include/private/prototypes}/CryptEccSignature_fp.h (100%) rename src/tpm2/{crypto => TPMCmd/tpm/include/private/prototypes}/CryptHash_fp.h (100%) rename src/tpm2/{crypto => TPMCmd/tpm/include/private/prototypes}/CryptPrimeSieve_fp.h (100%) rename src/tpm2/{crypto => TPMCmd/tpm/include/private/prototypes}/CryptPrime_fp.h (100%) rename src/tpm2/{crypto => TPMCmd/tpm/include/private/prototypes}/CryptRand_fp.h (100%) rename src/tpm2/{crypto => TPMCmd/tpm/include/private/prototypes}/CryptRsa_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/CryptSelfTest_fp.h (100%) rename src/tpm2/{crypto => TPMCmd/tpm/include/private/prototypes}/CryptSmac_fp.h (100%) rename src/tpm2/{crypto => TPMCmd/tpm/include/private/prototypes}/CryptSym_fp.h (100%) rename src/tpm2/{crypto => TPMCmd/tpm/include/private/prototypes}/CryptUtil_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/DA_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/DictionaryAttackLockReset_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/DictionaryAttackParameters_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Duplicate_fp.h (100%) rename src/tpm2/{crypto => TPMCmd/tpm/include/private/prototypes}/ECC_Decrypt_fp.h (100%) rename src/tpm2/{crypto => TPMCmd/tpm/include/private/prototypes}/ECC_Encrypt_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/ECC_Parameters_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/ECDH_KeyGen_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/ECDH_ZGen_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/EC_Ephemeral_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/EncryptDecrypt2_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/EncryptDecrypt_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/EncryptDecrypt_spt_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Entity_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/EventSequenceComplete_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/EvictControl_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/FlushContext_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/GetCapability_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/GetCommandAuditDigest_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/GetRandom_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/GetSessionAuditDigest_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/GetTestResult_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/GetTime_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/HMAC_Start_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/HMAC_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Handle_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/HashSequenceStart_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Hash_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/HierarchyChangeAuth_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/HierarchyControl_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Hierarchy_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Import_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/IncrementalSelfTest_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/IoBuffers_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/LoadExternal_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Load_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Locality_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/MAC_Start_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/MAC_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/MakeCredential_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Marshal_fp.h (99%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/MathOnByteBuffers_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Memory_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/NV_Certify_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/NV_ChangeAuth_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/NV_DefineSpace2_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/NV_DefineSpace_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/NV_Extend_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/NV_GlobalWriteLock_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/NV_Increment_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/NV_ReadLock_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/NV_ReadPublic2_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/NV_ReadPublic_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/NV_Read_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/NV_SetBits_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/NV_UndefineSpaceSpecial_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/NV_UndefineSpace_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/NV_WriteLock_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/NV_Write_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/NV_spt_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/NvDynamic_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/NvReserved_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/ObjectChangeAuth_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Object_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Object_spt_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PCR_Allocate_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PCR_Event_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PCR_Extend_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PCR_Read_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PCR_Reset_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PCR_SetAuthPolicy_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PCR_SetAuthValue_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PCR_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PP_Commands_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PP_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PolicyAuthValue_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PolicyAuthorizeNV_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PolicyAuthorize_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PolicyCapability_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PolicyCommandCode_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PolicyCounterTimer_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PolicyCpHash_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PolicyDuplicationSelect_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PolicyGetDigest_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PolicyLocality_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PolicyNV_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PolicyNameHash_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PolicyNvWritten_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PolicyOR_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PolicyPCR_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PolicyParameters_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PolicyPassword_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PolicyPhysicalPresence_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PolicyRestart_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PolicySecret_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PolicySigned_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PolicyTemplate_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PolicyTicket_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PolicyTransportSPDM_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Policy_spt_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Power_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/PropertyCap_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Quote_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/RSA_Decrypt_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/RSA_Encrypt_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/ReadClock_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/ReadOnlyControl_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/ReadPublic_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/ResponseCodeProcessing_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Response_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Rewrap_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/SecChannel_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/SelfTest_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/SequenceComplete_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/SequenceUpdate_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/SessionProcess_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Session_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/SetAlgorithmSet_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/SetCapability_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/SetCommandCodeAuditStatus_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/SetPrimaryPolicy_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Shutdown_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Sign_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/StartAuthSession_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Startup_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/StirRandom_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/TestParms_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Ticket_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Time_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/TpmASN1_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/TpmEcc_Signature_ECDAA_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/TpmEcc_Signature_ECDSA_fp.h (97%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/TpmEcc_Signature_SM2_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/TpmEcc_Signature_Schnorr_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/TpmEcc_Signature_Util_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/TpmEcc_Util_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/TpmMath_Debug_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/TpmMath_Util_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/TpmSizeChecks_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/Unseal_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/VerifySignature_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/X509_ECC_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/X509_RSA_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/X509_spt_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/private/prototypes}/ZGen_2Phase_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/tpm_public}/ACT.h (99%) rename src/tpm2/{ => TPMCmd/tpm/include/tpm_public}/BaseTypes.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/tpm_public}/Capabilities.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/tpm_public}/CompilerDependencies.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/tpm_public}/CompilerDependencies_gcc.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/tpm_public}/CompilerDependencies_msvc.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/tpm_public}/GpMacros.h (99%) rename src/tpm2/{ => TPMCmd/tpm/include/tpm_public}/MinMax.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/tpm_public}/TPMB.h (97%) rename src/tpm2/{ => TPMCmd/tpm/include/tpm_public}/TpmAlgorithmDefines.h (99%) rename src/tpm2/{ => TPMCmd/tpm/include/tpm_public}/TpmCalculatedAttributes.h (99%) rename src/tpm2/{ => TPMCmd/tpm/include/tpm_public}/TpmTypes.h (99%) rename src/tpm2/{ => TPMCmd/tpm/include/tpm_public}/VerifyConfiguration.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/tpm_public}/endian_swap.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/tpm_public/prototypes}/TpmFail_fp.h (100%) rename src/tpm2/{ => TPMCmd/tpm/include/tpm_public}/tpm_debug.h (97%) create mode 100644 src/tpm2/TPMCmd/tpm/include/tpm_public/tpm_public.h rename src/tpm2/{crypto/openssl => TPMCmd/tpm/include/tpm_public}/tpm_radix.h (100%) rename src/tpm2/{ => TPMCmd/tpm/src/X509}/TpmASN1.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/X509}/X509_ECC.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/X509}/X509_RSA.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/X509}/X509_spt.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/command/Attestation}/Attest_spt.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/command/Attestation}/Quote.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/command/ClockTimer}/ACT_spt.c (99%) rename src/tpm2/{ => TPMCmd/tpm/src/command/Context}/Context_spt.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/command/Duplication}/Duplicate.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/command/Duplication}/Import.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/command/EA}/PolicyAuthorize.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/command/EA}/PolicyAuthorizeNV.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/command/EA}/PolicyPCR.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/command/EA}/PolicySecret.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/command/EA}/PolicySigned.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/command/EA}/PolicyTicket.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/command/EA}/PolicyTransportSPDM.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/command/EA}/Policy_spt.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/command/Hierarchy}/CreatePrimary.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/command/Hierarchy}/ReadOnlyControl.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/command/NVStorage}/NV_Read.c (97%) rename src/tpm2/{ => TPMCmd/tpm/src/command/NVStorage}/NV_ReadPublic.c (94%) rename src/tpm2/{ => TPMCmd/tpm/src/command/NVStorage}/NV_ReadPublic2.c (95%) rename src/tpm2/{ => TPMCmd/tpm/src/command/NVStorage}/NV_spt.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/command/Object}/Create.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/command/Object}/CreateLoaded.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/command/Object}/MakeCredential.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/command/Object}/ObjectChangeAuth.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/command/Object}/Object_spt.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/command/PCR}/PCR_Read.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/command/Symmetric}/EncryptDecrypt_spt.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/crypt}/AlgorithmTests.c (100%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/src/crypt}/CryptCmac.c (100%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/src/crypt}/CryptDes.c (100%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/src/crypt}/CryptEccCrypt.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/crypt}/CryptEccData.c (100%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/src/crypt}/CryptEccKeyExchange.c (100%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/src/crypt}/CryptEccMain.c (100%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/src/crypt}/CryptEccSignature.c (100%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/src/crypt}/CryptHash.c (100%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/src/crypt}/CryptPrime.c (100%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/src/crypt}/CryptPrimeSieve.c (100%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/src/crypt}/CryptRand.c (100%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/src/crypt}/CryptRsa.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/crypt}/CryptSelfTest.c (100%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/src/crypt}/CryptSmac.c (100%) rename src/tpm2/{crypto/openssl => TPMCmd/tpm/src/crypt}/CryptSym.c (99%) rename src/tpm2/{ => TPMCmd/tpm/src/crypt}/CryptUtil.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/crypt}/Ticket.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/crypt/ecc}/TpmEcc_Signature_ECDAA.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/crypt/ecc}/TpmEcc_Signature_SM2.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/crypt/ecc}/TpmEcc_Signature_Schnorr.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/crypt/ecc}/TpmEcc_Signature_Util.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/crypt/ecc}/TpmEcc_Util.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/crypt/math}/TpmMath_Debug.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/crypt/math}/TpmMath_Util.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/events}/_TPM_Init.c (94%) rename src/tpm2/{ => TPMCmd/tpm/src/main}/CommandDispatcher.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/main}/ExecCommand.c (99%) rename src/tpm2/{ => TPMCmd/tpm/src/main}/SessionProcess.c (99%) rename src/tpm2/{ => TPMCmd/tpm/src/subsystem}/CommandAudit.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/subsystem}/DA.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/subsystem}/Hierarchy.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/subsystem}/NvDynamic.c (99%) rename src/tpm2/{ => TPMCmd/tpm/src/subsystem}/NvReserved.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/subsystem}/Object.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/subsystem}/PCR.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/subsystem}/PP.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/subsystem}/Session.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/subsystem}/Time.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/support}/AlgorithmCap.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/support}/Bits.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/support}/CommandCodeAttributes.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/support}/Entity.c (99%) rename src/tpm2/{ => TPMCmd/tpm/src/support}/Global.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/support}/Handle.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/support}/IoBuffers.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/support}/Locality.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/support}/Manufacture.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/support}/Marshal.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/support}/MathOnByteBuffers.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/support}/Memory.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/support}/Power.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/support}/PropertyCap.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/support}/Response.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/support}/ResponseCodeProcessing.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/support}/SecChannel.c (100%) rename src/tpm2/{ => TPMCmd/tpm/src/support}/TpmFail.c (99%) rename src/tpm2/{ => TPMCmd/tpm/src/support}/TpmSizeChecks.c (100%) delete mode 100644 src/tpm2/crypto/CryptSelfTest_fp.h delete mode 100644 src/tpm2/crypto/openssl/ConsttimeUtils.h delete mode 100644 src/tpm2/crypto/openssl/consttime.txt delete mode 100644 src/tpm2/crypto/openssl/consttime.txt' delete mode 100644 src/tpm2/platform_to_tpm_interface.h delete mode 100644 src/tpm2/tpm_public.h diff --git a/configure.ac b/configure.ac index 565415b4..6334cf14 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE([foreign 1.6 subdir-objects]) +AM_INIT_AUTOMAKE([foreign 1.9 subdir-objects tar-pax]) AM_SILENT_RULES([yes]) LIBTPMS_VER_MAJOR=`echo $PACKAGE_VERSION | awk -F. '{print $1}'` diff --git a/scripts/meld-all b/scripts/meld-all index 716ca50b..dcfbc3eb 100755 --- a/scripts/meld-all +++ b/scripts/meld-all @@ -86,7 +86,9 @@ main() continue fi - upstream=$(find "${TCG_TPM_HOME}" | grep -E "/${fname}\$") + fn=${f:${#1}} + upstream="${TCG_TPM_HOME}/${fn}" + #echo "$upstream" if [ -n "${upstream}" ]; then # find first empty line presumably after license diff --git a/src/Makefile.am b/src/Makefile.am index 14f21967..3aa1ee80 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -186,134 +186,135 @@ libtpms_tpm2_la_CFLAGS += -D_POSIX_ libtpms_tpm2_la_CFLAGS += -DTPM_POSIX libtpms_tpm2_la_SOURCES = \ - tpm2/ACT_spt.c \ tpm2/ACTCommands.c \ - tpm2/AlgorithmCap.c \ - tpm2/AlgorithmTests.c \ tpm2/AsymmetricCommands.c \ tpm2/AttestationCommands.c \ - tpm2/Attest_spt.c \ tpm2/AuditCommands.c \ - tpm2/Bits.c \ - tpm2/BnEccConstants.c \ - tpm2/BnConvert.c \ - tpm2/BnMath.c \ - tpm2/BnMemory.c \ - tpm2/Cancel.c \ tpm2/CapabilityCommands.c \ - tpm2/Clock.c \ tpm2/ClockCommands.c \ - tpm2/CommandAudit.c \ - tpm2/CommandCodeAttributes.c \ - tpm2/CommandDispatcher.c \ tpm2/ContextCommands.c \ - tpm2/Context_spt.c \ - tpm2/Create.c \ - tpm2/CreateLoaded.c \ - tpm2/CreatePrimary.c \ - tpm2/CryptEccData.c \ - tpm2/CryptSelfTest.c \ - tpm2/CryptUtil.c \ - tpm2/DA.c \ - tpm2/DebugHelpers.c \ tpm2/DictionaryCommands.c \ - tpm2/Duplicate.c \ tpm2/DuplicationCommands.c \ tpm2/EACommands.c \ - tpm2/EncryptDecrypt_spt.c \ - tpm2/Entity.c \ - tpm2/Entropy.c \ tpm2/EphemeralCommands.c \ - tpm2/ExecCommand.c \ - tpm2/ExtraData.c \ - tpm2/Failure.c \ - tpm2/Global.c \ - tpm2/Handle.c \ tpm2/HashCommands.c \ - tpm2/Hierarchy.c \ tpm2/HierarchyCommands.c \ - tpm2/Import.c \ - tpm2/Init.c \ tpm2/IntegrityCommands.c \ - tpm2/IoBuffers.c \ - tpm2/Locality.c \ - tpm2/LocalityPlat.c \ - tpm2/MakeCredential.c \ tpm2/ManagementCommands.c \ - tpm2/Manufacture.c \ - tpm2/Marshal.c \ - tpm2/MathOnByteBuffers.c \ - tpm2/Memory.c \ tpm2/NVCommands.c \ - tpm2/NvDynamic.c \ - tpm2/NVMem.c \ - tpm2/NvReserved.c \ - tpm2/NVVirtual.c \ - tpm2/NV_Read.c \ - tpm2/NV_ReadPublic.c \ - tpm2/NV_ReadPublic2.c \ - tpm2/NV_spt.c \ - tpm2/Object.c \ - tpm2/ObjectChangeAuth.c \ tpm2/ObjectCommands.c \ - tpm2/Object_spt.c \ - tpm2/PCR.c \ - tpm2/PCR_Read.c \ - tpm2/PlatformACT.c \ - tpm2/PlatformData.c \ - tpm2/PlatformPcr.c \ - tpm2/Policy_spt.c \ - tpm2/PolicyAuthorize.c \ - tpm2/PolicyAuthorizeNV.c \ - tpm2/PolicyPCR.c \ - tpm2/PolicySecret.c \ - tpm2/PolicySigned.c \ - tpm2/PolicyTicket.c \ - tpm2/PolicyTransportSPDM.c \ - tpm2/Power.c \ - tpm2/PowerPlat.c \ - tpm2/PP.c \ - tpm2/PPPlat.c \ - tpm2/PrimeData.c \ - tpm2/PropertyCap.c \ - tpm2/Quote.c \ tpm2/RandomCommands.c \ - tpm2/ReadOnlyControl.c \ - tpm2/Response.c \ - tpm2/ResponseCodeProcessing.c \ - tpm2/RunCommand.c \ - tpm2/SecChannel.c \ - tpm2/SelfTest.c \ - tpm2/Session.c \ tpm2/SessionCommands.c \ - tpm2/SessionProcess.c \ tpm2/SigningCommands.c \ tpm2/StartupCommands.c \ tpm2/SymmetricCommands.c \ tpm2/TestingCommands.c \ - tpm2/Ticket.c \ - tpm2/Time.c \ - tpm2/TpmASN1.c \ - tpm2/TpmBigNumThunks.c \ - tpm2/TpmEcc_Signature_ECDAA.c \ - tpm2/TpmEcc_Signature_ECDSA.c \ - tpm2/TpmEcc_Signature_Schnorr.c \ - tpm2/TpmEcc_Signature_SM2.c \ - tpm2/TpmEcc_Signature_Util.c \ - tpm2/TpmEcc_Util.c \ - tpm2/TpmMath_Debug.c \ - tpm2/TpmMath_Util.c \ - tpm2/TpmSizeChecks.c \ - tpm2/TPMCmdp.c \ - tpm2/TpmFail.c \ - tpm2/Unique.c \ + tpm2/TPMCmd/Platform/src/Cancel.c \ + tpm2/TPMCmd/Platform/src/Clock.c \ + tpm2/TPMCmd/Platform/src/DebugHelpers.c \ + tpm2/TPMCmd/Platform/src/Entropy.c \ + tpm2/TPMCmd/Platform/src/ExtraData.c \ + tpm2/TPMCmd/Platform/src/Failure.c \ + tpm2/TPMCmd/Platform/src/Init.c \ + tpm2/TPMCmd/Platform/src/LocalityPlat.c \ + tpm2/TPMCmd/Platform/src/NVMem.c \ + tpm2/TPMCmd/Platform/src/NVVirtual.c \ + tpm2/TPMCmd/Platform/src/PlatformACT.c \ + tpm2/TPMCmd/Platform/src/PlatformData.c \ + tpm2/TPMCmd/Platform/src/PlatformPcr.c \ + tpm2/TPMCmd/Platform/src/PowerPlat.c \ + tpm2/TPMCmd/Platform/src/PPPlat.c \ + tpm2/TPMCmd/Platform/src/RunCommand.c \ + tpm2/TPMCmd/Platform/src/SelfTest.c \ + tpm2/TPMCmd/Platform/src/Unique.c \ + tpm2/TPMCmd/Platform/src/VendorInfo.c \ + tpm2/TPMCmd/Simulator/src/TPMCmdp.c \ + tpm2/TPMCmd/tpm/cryptolibs/EccRef/TpmEcc_Signature_ECDSA.c \ + tpm2/TPMCmd/tpm/cryptolibs/RsaRef/PrimeData.c \ + tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/BnConvert.c \ + tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/BnEccConstants.c \ + tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/BnMath.c \ + tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/BnMemory.c \ + tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/TpmBigNumThunks.c \ + tpm2/TPMCmd/tpm/src/command/Attestation/Attest_spt.c \ + tpm2/TPMCmd/tpm/src/command/Attestation/Quote.c \ + tpm2/TPMCmd/tpm/src/command/ClockTimer/ACT_spt.c \ + tpm2/TPMCmd/tpm/src/command/Context/Context_spt.c \ + tpm2/TPMCmd/tpm/src/command/Duplication/Duplicate.c \ + tpm2/TPMCmd/tpm/src/command/Duplication/Import.c \ + tpm2/TPMCmd/tpm/src/command/EA/PolicyAuthorize.c \ + tpm2/TPMCmd/tpm/src/command/EA/PolicyAuthorizeNV.c \ + tpm2/TPMCmd/tpm/src/command/EA/PolicyPCR.c \ + tpm2/TPMCmd/tpm/src/command/EA/PolicySecret.c \ + tpm2/TPMCmd/tpm/src/command/EA/PolicySigned.c \ + tpm2/TPMCmd/tpm/src/command/EA/Policy_spt.c \ + tpm2/TPMCmd/tpm/src/command/EA/PolicyTicket.c \ + tpm2/TPMCmd/tpm/src/command/EA/PolicyTransportSPDM.c \ + tpm2/TPMCmd/tpm/src/command/Hierarchy/CreatePrimary.c \ + tpm2/TPMCmd/tpm/src/command/Hierarchy/ReadOnlyControl.c \ + tpm2/TPMCmd/tpm/src/command/NVStorage/NV_Read.c \ + tpm2/TPMCmd/tpm/src/command/NVStorage/NV_ReadPublic2.c \ + tpm2/TPMCmd/tpm/src/command/NVStorage/NV_ReadPublic.c \ + tpm2/TPMCmd/tpm/src/command/NVStorage/NV_spt.c \ + tpm2/TPMCmd/tpm/src/command/Object/Create.c \ + tpm2/TPMCmd/tpm/src/command/Object/CreateLoaded.c \ + tpm2/TPMCmd/tpm/src/command/Object/MakeCredential.c \ + tpm2/TPMCmd/tpm/src/command/Object/ObjectChangeAuth.c \ + tpm2/TPMCmd/tpm/src/command/Object/Object_spt.c \ + tpm2/TPMCmd/tpm/src/command/PCR/PCR_Read.c \ + tpm2/TPMCmd/tpm/src/command/Symmetric/EncryptDecrypt_spt.c \ + tpm2/TPMCmd/tpm/src/crypt/AlgorithmTests.c \ + tpm2/TPMCmd/tpm/src/crypt/CryptEccData.c \ + tpm2/TPMCmd/tpm/src/crypt/CryptSelfTest.c \ + tpm2/TPMCmd/tpm/src/crypt/CryptUtil.c \ + tpm2/TPMCmd/tpm/src/crypt/ecc/TpmEcc_Signature_ECDAA.c \ + tpm2/TPMCmd/tpm/src/crypt/ecc/TpmEcc_Signature_Schnorr.c \ + tpm2/TPMCmd/tpm/src/crypt/ecc/TpmEcc_Signature_SM2.c \ + tpm2/TPMCmd/tpm/src/crypt/ecc/TpmEcc_Signature_Util.c \ + tpm2/TPMCmd/tpm/src/crypt/ecc/TpmEcc_Util.c \ + tpm2/TPMCmd/tpm/src/crypt/math/TpmMath_Debug.c \ + tpm2/TPMCmd/tpm/src/crypt/math/TpmMath_Util.c \ + tpm2/TPMCmd/tpm/src/crypt/Ticket.c \ + tpm2/TPMCmd/tpm/src/events/_TPM_Init.c \ + tpm2/TPMCmd/tpm/src/main/CommandDispatcher.c \ + tpm2/TPMCmd/tpm/src/main/ExecCommand.c \ + tpm2/TPMCmd/tpm/src/main/SessionProcess.c \ + tpm2/TPMCmd/tpm/src/subsystem/CommandAudit.c \ + tpm2/TPMCmd/tpm/src/subsystem/DA.c \ + tpm2/TPMCmd/tpm/src/subsystem/Hierarchy.c \ + tpm2/TPMCmd/tpm/src/subsystem/NvDynamic.c \ + tpm2/TPMCmd/tpm/src/subsystem/NvReserved.c \ + tpm2/TPMCmd/tpm/src/subsystem/Object.c \ + tpm2/TPMCmd/tpm/src/subsystem/PCR.c \ + tpm2/TPMCmd/tpm/src/subsystem/PP.c \ + tpm2/TPMCmd/tpm/src/subsystem/Session.c \ + tpm2/TPMCmd/tpm/src/subsystem/Time.c \ + tpm2/TPMCmd/tpm/src/support/AlgorithmCap.c \ + tpm2/TPMCmd/tpm/src/support/Bits.c \ + tpm2/TPMCmd/tpm/src/support/CommandCodeAttributes.c \ + tpm2/TPMCmd/tpm/src/support/Entity.c \ + tpm2/TPMCmd/tpm/src/support/Global.c \ + tpm2/TPMCmd/tpm/src/support/Handle.c \ + tpm2/TPMCmd/tpm/src/support/IoBuffers.c \ + tpm2/TPMCmd/tpm/src/support/Locality.c \ + tpm2/TPMCmd/tpm/src/support/Manufacture.c \ + tpm2/TPMCmd/tpm/src/support/Marshal.c \ + tpm2/TPMCmd/tpm/src/support/MathOnByteBuffers.c \ + tpm2/TPMCmd/tpm/src/support/Memory.c \ + tpm2/TPMCmd/tpm/src/support/Power.c \ + tpm2/TPMCmd/tpm/src/support/PropertyCap.c \ + tpm2/TPMCmd/tpm/src/support/Response.c \ + tpm2/TPMCmd/tpm/src/support/ResponseCodeProcessing.c \ + tpm2/TPMCmd/tpm/src/support/SecChannel.c \ + tpm2/TPMCmd/tpm/src/support/TpmFail.c \ + tpm2/TPMCmd/tpm/src/support/TpmSizeChecks.c \ + tpm2/TPMCmd/tpm/src/X509/TpmASN1.c \ + tpm2/TPMCmd/tpm/src/X509/X509_ECC.c \ + tpm2/TPMCmd/tpm/src/X509/X509_RSA.c \ + tpm2/TPMCmd/tpm/src/X509/X509_spt.c \ + tpm2/TPMCmd/TpmConfiguration/TpmVendorCommandHandlers/Vendor_TCG_Test.c \ tpm2/Unmarshal.c \ - tpm2/VendorInfo.c \ - tpm2/X509_ECC.c \ - tpm2/X509_RSA.c \ - tpm2/X509_spt.c \ - tpm2/VendorCommands/Vendor_TCG_Test.c \ - tpm2/_TPM_Init.c \ + \ tpm_tpm2_interface.c \ tpm_tpm2_tis.c \ \ @@ -330,283 +331,282 @@ libtpms_tpm2_la_SOURCES = \ noinst_HEADERS += \ compiler.h \ - tpm2/crypto/CryptCmac_fp.h \ - tpm2/crypto/CryptDes_fp.h \ - tpm2/crypto/CryptEcc.h \ - tpm2/crypto/CryptEccCrypt_fp.h \ - tpm2/crypto/CryptEccKeyExchange_fp.h \ - tpm2/crypto/CryptEccMain_fp.h \ - tpm2/crypto/CryptEccSignature_fp.h \ - tpm2/crypto/CryptHash_fp.h \ - tpm2/crypto/CryptHash.h \ - tpm2/crypto/CryptPrime_fp.h \ - tpm2/crypto/CryptPrimeSieve_fp.h \ - tpm2/crypto/CryptRand_fp.h \ - tpm2/crypto/CryptRand.h \ - tpm2/crypto/CryptRsa_fp.h \ - tpm2/crypto/CryptRsa.h \ - tpm2/crypto/CryptSelfTest_fp.h \ - tpm2/crypto/CryptSmac_fp.h \ - tpm2/crypto/CryptSym.h \ - tpm2/crypto/CryptSym_fp.h \ - tpm2/crypto/CryptTest.h \ - tpm2/crypto/CryptUtil_fp.h \ - tpm2/crypto/ECC_Decrypt_fp.h \ - tpm2/crypto/ECC_Encrypt_fp.h \ - tpm2/ACT.h \ - tpm2/ACT_spt_fp.h \ - tpm2/ACT_SetTimeout_fp.h \ - tpm2/ActivateCredential_fp.h \ - tpm2/AlgorithmCap_fp.h \ - tpm2/AlgorithmTests_fp.h \ - tpm2/Attest_spt_fp.h \ - tpm2/BaseTypes.h \ - tpm2/Bits_fp.h \ - tpm2/BnEccConstants.c \ - tpm2/BnSupport_Interface.h \ - tpm2/BnUtil_fp.h \ - tpm2/Capabilities.h \ - tpm2/CertifyCreation_fp.h \ - tpm2/CertifyX509_fp.h \ - tpm2/Certify_fp.h \ - tpm2/ChangeEPS_fp.h \ - tpm2/ChangePPS_fp.h \ - tpm2/ClearControl_fp.h \ - tpm2/Clear_fp.h \ - tpm2/ClockRateAdjust_fp.h \ - tpm2/ClockSet_fp.h \ - tpm2/CommandAttributeData.h \ - tpm2/CommandAttributes.h \ - tpm2/CommandAudit_fp.h \ - tpm2/CommandCodeAttributes_fp.h \ - tpm2/CommandDispatchData.h \ - tpm2/CommandDispatcher_fp.h \ - tpm2/Commit_fp.h \ - tpm2/CompilerDependencies.h \ - tpm2/CompilerDependencies_gcc.h \ - tpm2/CompilerDependencies_msvc.h \ - tpm2/ContextLoad_fp.h \ - tpm2/ContextSave_fp.h \ - tpm2/Context_spt_fp.h \ - tpm2/Create_fp.h \ - tpm2/CreateLoaded_fp.h \ - tpm2/CreatePrimary_fp.h \ - tpm2/CryptoInterface.h \ - tpm2/CryptSelfTest_fp.h \ - tpm2/DA_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/CryptCmac_fp.h \ + tpm2/CryptDes_fp.h \ tpm2/DebugHelpers_fp.h \ - tpm2/DictionaryAttackLockReset_fp.h \ - tpm2/DictionaryAttackParameters_fp.h \ - tpm2/Duplicate_fp.h \ - tpm2/EccConstantData.inl \ - tpm2/EccTestData.h \ - tpm2/ECC_Parameters_fp.h \ - tpm2/ECDH_KeyGen_fp.h \ - tpm2/ECDH_ZGen_fp.h \ - tpm2/EC_Ephemeral_fp.h \ - tpm2/EncryptDecrypt2_fp.h \ - tpm2/EncryptDecrypt_fp.h \ - tpm2/EncryptDecrypt_spt_fp.h \ - tpm2/endian_swap.h \ - tpm2/Entity_fp.h \ - tpm2/EventSequenceComplete_fp.h \ - tpm2/EvictControl_fp.h \ - tpm2/ExecCommand_fp.h \ - tpm2/FlushContext_fp.h \ - tpm2/GetCapability_fp.h \ - tpm2/GetCommandAuditDigest_fp.h \ - tpm2/GetRandom_fp.h \ - tpm2/GetSessionAuditDigest_fp.h \ - tpm2/GetTestResult_fp.h \ - tpm2/GetTime_fp.h \ - tpm2/Global.h \ - tpm2/GpMacros.h \ - tpm2/Handle_fp.h \ - tpm2/Hash_fp.h \ - tpm2/HashSequenceStart_fp.h \ - tpm2/HashTestData.h \ - tpm2/HierarchyChangeAuth_fp.h \ - tpm2/HierarchyControl_fp.h \ - tpm2/Hierarchy_fp.h \ - tpm2/HMAC_fp.h \ - tpm2/HMAC_Start_fp.h \ - tpm2/Import_fp.h \ - tpm2/IncrementalSelfTest_fp.h \ - tpm2/InternalRoutines.h \ - tpm2/IoBuffers_fp.h \ - tpm2/KdfTestData.h \ - tpm2/LoadExternal_fp.h \ - tpm2/Load_fp.h \ - tpm2/Locality_fp.h \ - tpm2/MAC_fp.h \ - tpm2/MAC_Start_fp.h \ - tpm2/MakeCredential_fp.h \ - tpm2/Manufacture_fp.h \ - tpm2/Marshal.h \ - tpm2/Marshal_fp.h \ - tpm2/MathLibraryInterface.h \ - tpm2/MathLibraryInterfaceTypes.h \ - tpm2/MathOnByteBuffers_fp.h \ - tpm2/Memory_fp.h \ - tpm2/MinMax.h \ - tpm2/NV_Certify_fp.h \ - tpm2/NV_ChangeAuth_fp.h \ - tpm2/NV_DefineSpace_fp.h \ - tpm2/NV_DefineSpace2_fp.h \ - tpm2/NvDynamic_fp.h \ - tpm2/NV_Extend_fp.h \ - tpm2/NV_GlobalWriteLock_fp.h \ - tpm2/NV.h \ - tpm2/NV_Increment_fp.h \ - tpm2/NV_Read_fp.h \ - tpm2/NV_ReadLock_fp.h \ - tpm2/NV_ReadPublic_fp.h \ - tpm2/NV_ReadPublic2_fp.h \ - tpm2/NvReserved_fp.h \ - tpm2/NV_SetBits_fp.h \ - tpm2/NV_spt_fp.h \ - tpm2/NV_UndefineSpace_fp.h \ - tpm2/NV_UndefineSpaceSpecial_fp.h \ - tpm2/NV_Write_fp.h \ - tpm2/NV_WriteLock_fp.h \ - tpm2/OIDs.h \ - tpm2/ObjectChangeAuth_fp.h \ - tpm2/Object_fp.h \ - tpm2/Object_spt_fp.h \ - tpm2/pcrstruct.h \ - tpm2/PCR_Allocate_fp.h \ - tpm2/PCR_Event_fp.h \ - tpm2/PCR_Extend_fp.h \ - tpm2/PCR_fp.h \ - tpm2/PCR_Read_fp.h \ - tpm2/PCR_Reset_fp.h \ - tpm2/PCR_SetAuthPolicy_fp.h \ - tpm2/PCR_SetAuthValue_fp.h \ - tpm2/Platform.h \ - tpm2/PlatformACT.h \ tpm2/PlatformACT_fp.h \ - tpm2/PlatformClock.h \ - tpm2/PlatformData.h \ - tpm2/PlatformInternal.h \ - tpm2/platform_failure_mode_fp.h \ - tpm2/platform_init_fp.h \ - tpm2/platform_virtual_nv_fp.h \ - tpm2/platform_public_interface.h \ - tpm2/platform_pcr_fp.h \ - tpm2/platform_to_tpm_interface.h \ tpm2/Platform_fp.h \ - tpm2/PolicyAuthorize_fp.h \ - tpm2/PolicyAuthorizeNV_fp.h \ - tpm2/PolicyAuthValue_fp.h \ - tpm2/PolicyCapability_fp.h \ - tpm2/PolicyCommandCode_fp.h \ - tpm2/PolicyCounterTimer_fp.h \ - tpm2/PolicyCpHash_fp.h \ - tpm2/PolicyDuplicationSelect_fp.h \ - tpm2/PolicyGetDigest_fp.h \ - tpm2/PolicyLocality_fp.h \ - tpm2/PolicyNameHash_fp.h \ - tpm2/PolicyNV_fp.h \ - tpm2/PolicyNvWritten_fp.h \ - tpm2/PolicyOR_fp.h \ - tpm2/PolicyParameters_fp.h \ - tpm2/PolicyPassword_fp.h \ - tpm2/PolicyPCR_fp.h \ - tpm2/PolicyPhysicalPresence_fp.h \ - tpm2/PolicyRestart_fp.h \ - tpm2/PolicySecret_fp.h \ - tpm2/PolicySigned_fp.h \ - tpm2/Policy_spt_fp.h \ - tpm2/PolicyTemplate_fp.h \ - tpm2/PolicyTicket_fp.h \ - tpm2/PolicyTransportSPDM_fp.h \ - tpm2/Power_fp.h \ - tpm2/PP_Commands_fp.h \ - tpm2/PP_fp.h \ - tpm2/PRNG_TestVectors.h \ - tpm2/PropertyCap_fp.h \ - tpm2/Quote_fp.h \ - tpm2/ReadClock_fp.h \ - tpm2/ReadOnlyControl_fp.h \ - tpm2/ReadPublic_fp.h \ - tpm2/ResponseCodeProcessing_fp.h \ - tpm2/Response_fp.h \ - tpm2/Rewrap_fp.h \ - tpm2/RsaTestData.h \ - tpm2/RSA_Decrypt_fp.h \ - tpm2/RSA_Encrypt_fp.h \ - tpm2/SecChannel_fp.h \ - tpm2/SelfTest.h \ - tpm2/SelfTest_fp.h \ - tpm2/SequenceComplete_fp.h \ - tpm2/SequenceUpdate_fp.h \ - tpm2/Session_fp.h \ - tpm2/SessionProcess_fp.h \ - tpm2/SetAlgorithmSet_fp.h \ - tpm2/SetCapability_fp.h \ - tpm2/SetCommandCodeAuditStatus_fp.h \ - tpm2/SetPrimaryPolicy_fp.h \ - tpm2/Shutdown_fp.h \ - tpm2/Sign_fp.h \ - tpm2/simulatorPrivate.h \ - tpm2/simulator_sysheaders.h \ - tpm2/Simulator_fp.h \ - tpm2/StartAuthSession_fp.h \ - tpm2/Startup_fp.h \ - tpm2/StirRandom_fp.h \ - tpm2/SymmetricTest.h \ - tpm2/SymmetricTestData.h \ tpm2/TcpServerPosix_fp.h \ - tpm2/TestParms_fp.h \ - tpm2/Ticket_fp.h \ - tpm2/Time_fp.h \ - tpm2/TPMB.h \ - tpm2/TpmAlgorithmDefines.h \ - tpm2/TpmASN1.h \ - tpm2/TpmASN1_fp.h \ - tpm2/TpmBuildSwitches.h \ - tpm2/TpmEcc_Signature_ECDAA_fp.h \ - tpm2/TpmEcc_Signature_ECDSA_fp.h \ - tpm2/TpmEcc_Signature_Schnorr_fp.h \ - tpm2/TpmEcc_Signature_SM2_fp.h \ - tpm2/TpmEcc_Signature_Util_fp.h \ - tpm2/TpmFail_fp.h \ - tpm2/TpmMath_Debug_fp.h \ - tpm2/TpmMath_Util_fp.h \ - tpm2/TpmProfile.h \ - tpm2/TpmProfile_CommandList.h \ - tpm2/TpmProfile_Common.h \ - tpm2/TpmProfile_ErrorCodes.h \ - tpm2/TpmProfile_Misc.h \ - tpm2/Tpm.h \ - tpm2/TpmBigNum.h \ - tpm2/tpm_debug.h \ - tpm2/tpm_public.h \ - tpm2/tpm_to_platform_interface.h \ - tpm2/_TPM_Hash_Data_fp.h \ - tpm2/_TPM_Hash_End_fp.h \ - tpm2/_TPM_Hash_Start_fp.h \ - tpm2/_TPM_Init_fp.h \ - tpm2/TpmCalculatedAttributes.h \ - tpm2/TpmEcc_Util_fp.h \ - tpm2/TpmSizeChecks_fp.h \ - tpm2/TpmTcpProtocol.h \ - tpm2/TpmTypes.h \ + tpm2/TPMCmd/Platform/include/PlatformACT.h \ + tpm2/TPMCmd/Platform/include/PlatformClock.h \ + tpm2/TPMCmd/Platform/include/PlatformData.h \ + tpm2/TPMCmd/Platform/include/Platform.h \ + tpm2/TPMCmd/Platform/include/PlatformInternal.h \ + tpm2/TPMCmd/Platform/include/prototypes/platform_public_interface.h \ + tpm2/TPMCmd/Simulator/include/prototypes/Simulator_fp.h \ + tpm2/TPMCmd/Simulator/include/TpmTcpProtocol.h \ + tpm2/TPMCmd/Simulator/src/simulatorPrivate.h \ + tpm2/TPMCmd/Simulator/src/simulator_sysheaders.h \ + tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/TpmBuildSwitches.h \ + tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/TpmProfile_CommandList.h \ + tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/TpmProfile_Common.h \ + tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/TpmProfile_ErrorCodes.h \ + tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/TpmProfile.h \ + tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/TpmProfile_Misc.h \ + tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/VendorCommands/CommandAttributeData_s_ccAttr.inl \ + tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/VendorCommands/CommandAttributeData_s_commandAttributes.inl \ + tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/VendorCommands/CommandDispatchData_CommandStructures.inl \ + tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/VendorCommands/CommandDispatchData_s_CommandDataArray.inl \ + tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/VendorCommands/prototypes/Vendor_TCG_Test_fp.h \ + tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/VendorCommands/VendorCommandList.h \ + tpm2/TPMCmd/tpm/cryptolibs/common/include/CryptoInterface.h \ + tpm2/TPMCmd/tpm/cryptolibs/common/include/EccConstantData.inl \ + tpm2/TPMCmd/tpm/cryptolibs/common/include/MathLibraryInterface.h \ + tpm2/TPMCmd/tpm/cryptolibs/common/include/MathLibraryInterfaceTypes.h \ + tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/BnEccConstants.c \ + tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnSupport_Interface.h \ + tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnUtil_fp.h \ + tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/TpmBigNum.h \ + tpm2/TPMCmd/tpm/include/platform_interface/pcrstruct.h \ + tpm2/TPMCmd/tpm/include/platform_interface/platform_to_tpm_interface.h \ + tpm2/TPMCmd/tpm/include/platform_interface/prototypes/ExecCommand_fp.h \ + tpm2/TPMCmd/tpm/include/platform_interface/prototypes/Manufacture_fp.h \ + tpm2/TPMCmd/tpm/include/platform_interface/prototypes/platform_failure_mode_fp.h \ + tpm2/TPMCmd/tpm/include/platform_interface/prototypes/platform_init_fp.h \ + tpm2/TPMCmd/tpm/include/platform_interface/prototypes/platform_pcr_fp.h \ + tpm2/TPMCmd/tpm/include/platform_interface/prototypes/platform_virtual_nv_fp.h \ + tpm2/TPMCmd/tpm/include/platform_interface/prototypes/_TPM_Hash_Data_fp.h \ + tpm2/TPMCmd/tpm/include/platform_interface/prototypes/_TPM_Hash_End_fp.h \ + tpm2/TPMCmd/tpm/include/platform_interface/prototypes/_TPM_Hash_Start_fp.h \ + tpm2/TPMCmd/tpm/include/platform_interface/prototypes/_TPM_Init_fp.h \ + tpm2/TPMCmd/tpm/include/platform_interface/tpm_to_platform_interface.h \ + tpm2/TPMCmd/tpm/include/private/CommandAttributeData.h \ + tpm2/TPMCmd/tpm/include/private/CommandAttributes.h \ + tpm2/TPMCmd/tpm/include/private/CommandDispatchData.h \ + tpm2/TPMCmd/tpm/include/private/CryptEcc.h \ + tpm2/TPMCmd/tpm/include/private/CryptHash.h \ + tpm2/TPMCmd/tpm/include/private/CryptRand.h \ + tpm2/TPMCmd/tpm/include/private/CryptRsa.h \ + tpm2/TPMCmd/tpm/include/private/CryptSym.h \ + tpm2/TPMCmd/tpm/include/private/CryptTest.h \ + tpm2/TPMCmd/tpm/include/private/EccTestData.h \ + tpm2/TPMCmd/tpm/include/private/Global.h \ + tpm2/TPMCmd/tpm/include/private/HashTestData.h \ + tpm2/TPMCmd/tpm/include/private/InternalRoutines.h \ + tpm2/TPMCmd/tpm/include/private/KdfTestData.h \ + tpm2/TPMCmd/tpm/include/private/Marshal.h \ + tpm2/TPMCmd/tpm/include/private/NV.h \ + tpm2/TPMCmd/tpm/include/private/OIDs.h \ + tpm2/TPMCmd/tpm/include/private/PRNG_TestVectors.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/ActivateCredential_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/ACT_SetTimeout_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/ACT_spt_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/AlgorithmCap_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/AlgorithmTests_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Attest_spt_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Bits_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/CertifyCreation_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Certify_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/CertifyX509_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/ChangeEPS_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/ChangePPS_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/ClearControl_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Clear_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/ClockRateAdjust_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/ClockSet_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/CommandAudit_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/CommandCodeAttributes_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/CommandDispatcher_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Commit_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/ContextLoad_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/ContextSave_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Context_spt_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Create_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/CreateLoaded_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/CreatePrimary_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/CryptEccCrypt_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/CryptEccKeyExchange_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/CryptEccMain_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/CryptEccSignature_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/CryptHash_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/CryptPrime_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/CryptPrimeSieve_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/CryptRand_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/CryptRsa_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/CryptSelfTest_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/CryptSmac_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/CryptSym_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/CryptUtil_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/DA_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/DictionaryAttackLockReset_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/DictionaryAttackParameters_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/ECC_Decrypt_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/ECC_Encrypt_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Duplicate_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/ECC_Parameters_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/ECDH_KeyGen_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/ECDH_ZGen_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/EC_Ephemeral_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/EncryptDecrypt2_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/EncryptDecrypt_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/EncryptDecrypt_spt_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Entity_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/EventSequenceComplete_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/EvictControl_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/FlushContext_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/GetCapability_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/GetCommandAuditDigest_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/GetRandom_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/GetSessionAuditDigest_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/GetTestResult_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/GetTime_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Handle_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Hash_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/HashSequenceStart_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/HierarchyChangeAuth_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/HierarchyControl_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Hierarchy_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/HMAC_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/HMAC_Start_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Import_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/IncrementalSelfTest_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/IoBuffers_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/LoadExternal_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Load_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Locality_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/MAC_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/MAC_Start_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/MakeCredential_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Marshal_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/MathOnByteBuffers_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Memory_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/NV_Certify_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/NV_ChangeAuth_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/NV_DefineSpace2_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/NV_DefineSpace_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/NvDynamic_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/NV_Extend_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/NV_GlobalWriteLock_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/NV_Increment_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/NV_Read_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/NV_ReadLock_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/NV_ReadPublic2_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/NV_ReadPublic_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/NvReserved_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/NV_SetBits_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/NV_spt_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/NV_UndefineSpace_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/NV_UndefineSpaceSpecial_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/NV_Write_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/NV_WriteLock_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/ObjectChangeAuth_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Object_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Object_spt_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PCR_Allocate_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PCR_Event_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PCR_Extend_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PCR_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PCR_Read_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PCR_Reset_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PCR_SetAuthPolicy_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PCR_SetAuthValue_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PolicyAuthorize_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PolicyAuthorizeNV_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PolicyAuthValue_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PolicyCapability_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PolicyCommandCode_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PolicyCounterTimer_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PolicyCpHash_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PolicyDuplicationSelect_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PolicyGetDigest_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PolicyLocality_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PolicyNameHash_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PolicyNV_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PolicyNvWritten_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PolicyOR_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PolicyParameters_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PolicyPassword_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PolicyPCR_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PolicyPhysicalPresence_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PolicyRestart_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PolicySecret_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PolicySigned_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Policy_spt_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PolicyTemplate_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PolicyTicket_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PolicyTransportSPDM_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Power_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PP_Commands_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PP_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/PropertyCap_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Quote_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/ReadClock_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/ReadOnlyControl_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/ReadPublic_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/ResponseCodeProcessing_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Response_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Rewrap_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/RSA_Decrypt_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/RSA_Encrypt_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/SecChannel_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/SelfTest_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/SequenceComplete_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/SequenceUpdate_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Session_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/SessionProcess_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/SetAlgorithmSet_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/SetCapability_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/SetCommandCodeAuditStatus_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/SetPrimaryPolicy_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Shutdown_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Sign_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/StartAuthSession_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Startup_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/StirRandom_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/TestParms_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Ticket_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Time_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/TpmASN1_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/TpmEcc_Signature_ECDAA_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/TpmEcc_Signature_ECDSA_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/TpmEcc_Signature_Schnorr_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/TpmEcc_Signature_SM2_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/TpmEcc_Signature_Util_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/TpmEcc_Util_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/TpmMath_Debug_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/TpmMath_Util_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/TpmSizeChecks_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/Unseal_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/VerifySignature_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/X509_ECC_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/X509_RSA_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/X509_spt_fp.h \ + tpm2/TPMCmd/tpm/include/private/prototypes/ZGen_2Phase_fp.h \ + tpm2/TPMCmd/tpm/include/private/RsaTestData.h \ + tpm2/TPMCmd/tpm/include/private/SelfTest.h \ + tpm2/TPMCmd/tpm/include/private/SymmetricTestData.h \ + tpm2/TPMCmd/tpm/include/private/SymmetricTest.h \ + tpm2/TPMCmd/tpm/include/private/TpmASN1.h \ + tpm2/TPMCmd/tpm/include/private/Tpm.h \ + tpm2/TPMCmd/tpm/include/private/X509.h \ + tpm2/TPMCmd/tpm/include/tpm_public/ACT.h \ + tpm2/TPMCmd/tpm/include/tpm_public/BaseTypes.h \ + tpm2/TPMCmd/tpm/include/tpm_public/Capabilities.h \ + tpm2/TPMCmd/tpm/include/tpm_public/CompilerDependencies_gcc.h \ + tpm2/TPMCmd/tpm/include/tpm_public/CompilerDependencies.h \ + tpm2/TPMCmd/tpm/include/tpm_public/CompilerDependencies_msvc.h \ + tpm2/TPMCmd/tpm/include/tpm_public/endian_swap.h \ + tpm2/TPMCmd/tpm/include/tpm_public/GpMacros.h \ + tpm2/TPMCmd/tpm/include/tpm_public/MinMax.h \ + tpm2/TPMCmd/tpm/include/tpm_public/prototypes/TpmFail_fp.h \ + tpm2/TPMCmd/tpm/include/tpm_public/TpmAlgorithmDefines.h \ + tpm2/TPMCmd/tpm/include/tpm_public/TPMB.h \ + tpm2/TPMCmd/tpm/include/tpm_public/TpmCalculatedAttributes.h \ + tpm2/TPMCmd/tpm/include/tpm_public/tpm_debug.h \ + tpm2/TPMCmd/tpm/include/tpm_public/tpm_public.h \ + tpm2/TPMCmd/tpm/include/tpm_public/TpmTypes.h \ + tpm2/TPMCmd/tpm/include/tpm_public/VerifyConfiguration.h \ tpm2/Unmarshal_fp.h \ - tpm2/Unseal_fp.h \ - tpm2/VerifyConfiguration.h \ - tpm2/VerifySignature_fp.h \ - tpm2/X509.h \ - tpm2/X509_ECC_fp.h \ - tpm2/X509_RSA_fp.h \ - tpm2/X509_spt_fp.h \ - tpm2/ZGen_2Phase_fp.h \ - tpm2/VendorCommands/CommandAttributeData_s_ccAttr.inl \ - tpm2/VendorCommands/CommandAttributeData_s_commandAttributes.inl \ - tpm2/VendorCommands/CommandDispatchData_CommandStructures.inl \ - tpm2/VendorCommands/CommandDispatchData_s_CommandDataArray.inl \ - tpm2/VendorCommands/Vendor_TCG_Test_fp.h \ - tpm2/VendorCommands/VendorCommandList.h \ \ tpm2/BackwardsCompatibility.h \ tpm2/BackwardsCompatibilityBitArray.h \ @@ -624,49 +624,60 @@ noinst_HEADERS += \ if LIBTPMS_USE_OPENSSL libtpms_tpm2_la_SOURCES += \ - tpm2/crypto/openssl/BnToOsslMath.c \ - tpm2/crypto/openssl/CryptCmac.c \ - tpm2/crypto/openssl/CryptDes.c \ - tpm2/crypto/openssl/CryptEccCrypt.c \ - tpm2/crypto/openssl/CryptEccKeyExchange.c \ - tpm2/crypto/openssl/CryptEccMain.c \ - tpm2/crypto/openssl/CryptEccSignature.c \ - tpm2/crypto/openssl/CryptHash.c \ - tpm2/crypto/openssl/CryptPrime.c \ - tpm2/crypto/openssl/CryptPrimeSieve.c \ - tpm2/crypto/openssl/CryptRand.c \ - tpm2/crypto/openssl/CryptRsa.c \ - tpm2/crypto/openssl/CryptSmac.c \ - tpm2/crypto/openssl/CryptSym.c \ - tpm2/crypto/openssl/ExpDCache.c \ - tpm2/crypto/openssl/Helpers.c \ - tpm2/crypto/openssl/TpmToOsslDesSupport.c \ - tpm2/crypto/openssl/TpmToOsslSupport.c + tpm2/TPMCmd/tpm/cryptolibs/Ossl/BnToOsslMath.c \ + tpm2/TPMCmd/tpm/src/crypt/CryptCmac.c \ + tpm2/TPMCmd/tpm/src/crypt/CryptDes.c \ + tpm2/TPMCmd/tpm/src/crypt/CryptEccCrypt.c \ + tpm2/TPMCmd/tpm/src/crypt/CryptEccKeyExchange.c \ + tpm2/TPMCmd/tpm/src/crypt/CryptEccMain.c \ + tpm2/TPMCmd/tpm/src/crypt/CryptEccSignature.c \ + tpm2/TPMCmd/tpm/src/crypt/CryptHash.c \ + tpm2/TPMCmd/tpm/src/crypt/CryptPrime.c \ + tpm2/TPMCmd/tpm/src/crypt/CryptPrimeSieve.c \ + tpm2/TPMCmd/tpm/src/crypt/CryptRand.c \ + tpm2/TPMCmd/tpm/src/crypt/CryptRsa.c \ + tpm2/TPMCmd/tpm/src/crypt/CryptSmac.c \ + tpm2/TPMCmd/tpm/src/crypt/CryptSym.c \ + tpm2/TPMCmd/tpm/cryptolibs/Ossl/ExpDCache.c \ + tpm2/TPMCmd/tpm/cryptolibs/Ossl/Helpers.c \ + tpm2/TPMCmd/tpm/cryptolibs/Ossl/TpmToOsslDesSupport.c \ + tpm2/TPMCmd/tpm/cryptolibs/Ossl/TpmToOsslSupport.c noinst_HEADERS += \ - tpm2/crypto/openssl/BnOssl.h \ - tpm2/crypto/openssl/BnToOsslMath_fp.h \ - tpm2/crypto/openssl/BnToOsslMath.h \ - tpm2/crypto/openssl/ConsttimeUtils.h \ - tpm2/crypto/openssl/BnConvert_fp.h \ - tpm2/crypto/openssl/BnMath_fp.h \ - tpm2/crypto/openssl/BnMemory_fp.h \ - tpm2/crypto/openssl/BnValues.h \ - tpm2/crypto/openssl/ExpDCache_fp.h \ - tpm2/crypto/openssl/Helpers_fp.h \ - tpm2/crypto/openssl/LibSupport.h \ - tpm2/crypto/openssl/TpmToTpmBigNumMath.h \ - tpm2/crypto/openssl/TpmToOsslDesSupport_fp.h \ - tpm2/crypto/openssl/TpmToOsslHash.h \ - tpm2/crypto/openssl/TpmToOsslSupport_fp.h \ - tpm2/crypto/openssl/TpmToOsslSym.h \ - tpm2/crypto/openssl/tpm_radix.h + tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/BnOssl.h \ + tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/BnToOsslMath_fp.h \ + tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnConvert_fp.h \ + tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnMath_fp.h \ + tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnMemory_fp.h \ + tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnValues.h \ + tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/BnToOsslMath.h \ + tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/ExpDCache_fp.h \ + tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/Helpers_fp.h \ + tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/TpmToOsslDesSupport_fp.h \ + tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/TpmToOsslHash.h \ + tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/TpmToOsslSupport_fp.h \ + tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/TpmToOsslSym.h \ + tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/TpmBigNum/TpmToTpmBigNumMath.h \ + tpm2/TPMCmd/tpm/include/private/LibSupport.h \ + tpm2/TPMCmd/tpm/include/tpm_public/tpm_radix.h libtpms_tpm2_la_CFLAGS += \ -I $(srcdir)/tpm2 \ - -I $(srcdir)/tpm2/crypto \ - -I $(srcdir)/tpm2/crypto/openssl - + -I $(srcdir)/tpm2/crypto/openssl \ + -I $(srcdir)/tpm2/TPMCmd/Platform/include/ \ + -I $(srcdir)/tpm2/TPMCmd/Simulator/include/ \ + -I $(srcdir)/tpm2/TPMCmd/Simulator/include/prototypes \ + -I $(srcdir)/tpm2/TPMCmd/TpmConfiguration \ + -I $(srcdir)/tpm2/TPMCmd/tpm/include/ \ + -I $(srcdir)/tpm2/TPMCmd/tpm/include/private \ + -I $(srcdir)/tpm2/TPMCmd/tpm/include/private/prototypes/ \ + -I $(srcdir)/tpm2/TPMCmd/tpm/cryptolibs/common/include/ \ + -I $(srcdir)/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/ \ + -I $(srcdir)/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/TpmBigNum/ \ + -I $(srcdir)/tpm2/TPMCmd/tpm/cryptolibs/ \ + -I $(srcdir)/tpm2/TPMCmd/tpm/cryptolibs/Ossl/ \ + -I $(srcdir)/tpm2/TPMCmd/tpm/cryptolibs/Ossl/include \ + -I $(srcdir)/tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/ libtpms_tpm2_la_LIBADD += -lcrypto diff --git a/src/tpm2/BackwardsCompatibilityBitArray.h b/src/tpm2/BackwardsCompatibilityBitArray.h index 0d5002ee..f9d5170c 100644 --- a/src/tpm2/BackwardsCompatibilityBitArray.h +++ b/src/tpm2/BackwardsCompatibilityBitArray.h @@ -40,7 +40,7 @@ #define BACKWARDS_COMPATIBILITY_BIT_ARRAY_H #include "Tpm.h" -#include "TpmTypes.h" +#include TPM_RC ConvertFromCompressedBitArray(BYTE *inAuditCommands, diff --git a/src/tpm2/crypto/CryptDes_fp.h b/src/tpm2/CryptDes_fp.h similarity index 100% rename from src/tpm2/crypto/CryptDes_fp.h rename to src/tpm2/CryptDes_fp.h diff --git a/src/tpm2/NVMarshal.c b/src/tpm2/NVMarshal.c index d57961c2..f94c5a52 100644 --- a/src/tpm2/NVMarshal.c +++ b/src/tpm2/NVMarshal.c @@ -56,7 +56,7 @@ #include "Simulator_fp.h" #include "BackwardsCompatibilityBitArray.h" #include "BackwardsCompatibilityObject.h" -#include "platform_failure_mode_fp.h" +#include #define TPM_HAVE_TPM2_DECLARATIONS #include "tpm_library_intern.h" diff --git a/src/tpm2/NVMarshal.h b/src/tpm2/NVMarshal.h index 7b06e40a..0ff265f6 100644 --- a/src/tpm2/NVMarshal.h +++ b/src/tpm2/NVMarshal.h @@ -42,7 +42,7 @@ #include #include "Tpm.h" -#include "TpmTypes.h" +#include "tpm_public/TpmTypes.h" #include "RuntimeProfile_fp.h" #define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) diff --git a/src/tpm2/Platform.h b/src/tpm2/Platform.h deleted file mode 100644 index e1c9f599..00000000 --- a/src/tpm2/Platform.h +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-License-Identifier: BSD-2-Clause - - -#ifndef _PLATFORM_H_ -#define _PLATFORM_H_ - -#include "TpmBuildSwitches.h" -#include "TpmProfile.h" -#include "BaseTypes.h" -#include "TPMB.h" -#include "MinMax.h" - -#include "PlatformACT.h" -#include "PlatformClock.h" -#include "PlatformData.h" -#include "platform_public_interface.h" -#include "tpm_to_platform_interface.h" -#include "platform_to_tpm_interface.h" -#include "PlatformInternal.h" - -#define GLOBAL_C -#define NV_C -#include "pcrstruct.h" -#include "platform_pcr_fp.h" - -#endif // _PLATFORM_H_ diff --git a/src/tpm2/Platform_fp.h b/src/tpm2/Platform_fp.h index 71c4cff3..a428cc7b 100644 --- a/src/tpm2/Platform_fp.h +++ b/src/tpm2/Platform_fp.h @@ -58,4 +58,5 @@ /* */ /********************************************************************************/ -#include "platform_public_interface.h" // libtpms added +#include // libtpms added + diff --git a/src/tpm2/RuntimeAlgorithm.c b/src/tpm2/RuntimeAlgorithm.c index 0bec7bbd..ba81bd61 100644 --- a/src/tpm2/RuntimeAlgorithm.c +++ b/src/tpm2/RuntimeAlgorithm.c @@ -45,7 +45,7 @@ #include "Tpm.h" #include "NVMarshal.h" -#include "GpMacros.h" +#include "tpm_public/GpMacros.h" #include "tpm_library_intern.h" #define ALGO_SEPARATOR_C ',' diff --git a/src/tpm2/StateMarshal.h b/src/tpm2/StateMarshal.h index 6fc6d146..29bed70a 100644 --- a/src/tpm2/StateMarshal.h +++ b/src/tpm2/StateMarshal.h @@ -40,7 +40,7 @@ #define STATE_MARSHAL_H #include "Tpm.h" -#include "TpmTypes.h" +#include /* * we keep these in a separate file to avoid symbol clashes when diff --git a/src/tpm2/TPMCmd/Platform/include/Platform.h b/src/tpm2/TPMCmd/Platform/include/Platform.h new file mode 100644 index 00000000..c6d0f11b --- /dev/null +++ b/src/tpm2/TPMCmd/Platform/include/Platform.h @@ -0,0 +1,28 @@ +// SPDX-License-Identifier: BSD-2-Clause + + +#ifndef _PLATFORM_H_ +#define _PLATFORM_H_ + +#include +#include +// TODO_RENAME_INC_FOLDER: public refers to the TPM_CoreLib public headers +#include +#include +#include + +#include "PlatformACT.h" +#include "PlatformClock.h" +#include "PlatformData.h" +#include "prototypes/platform_public_interface.h" +// TODO_RENAME_INC_FOLDER:platform_interface refers to the TPM_CoreLib platform interface +#include +#include +#include "PlatformInternal.h" + +#define GLOBAL_C +#define NV_C +#include +#include + +#endif // _PLATFORM_H_ diff --git a/src/tpm2/PlatformACT.h b/src/tpm2/TPMCmd/Platform/include/PlatformACT.h similarity index 100% rename from src/tpm2/PlatformACT.h rename to src/tpm2/TPMCmd/Platform/include/PlatformACT.h diff --git a/src/tpm2/PlatformClock.h b/src/tpm2/TPMCmd/Platform/include/PlatformClock.h similarity index 100% rename from src/tpm2/PlatformClock.h rename to src/tpm2/TPMCmd/Platform/include/PlatformClock.h diff --git a/src/tpm2/PlatformData.h b/src/tpm2/TPMCmd/Platform/include/PlatformData.h similarity index 100% rename from src/tpm2/PlatformData.h rename to src/tpm2/TPMCmd/Platform/include/PlatformData.h diff --git a/src/tpm2/PlatformInternal.h b/src/tpm2/TPMCmd/Platform/include/PlatformInternal.h similarity index 100% rename from src/tpm2/PlatformInternal.h rename to src/tpm2/TPMCmd/Platform/include/PlatformInternal.h diff --git a/src/tpm2/platform_public_interface.h b/src/tpm2/TPMCmd/Platform/include/prototypes/platform_public_interface.h similarity index 100% rename from src/tpm2/platform_public_interface.h rename to src/tpm2/TPMCmd/Platform/include/prototypes/platform_public_interface.h diff --git a/src/tpm2/Cancel.c b/src/tpm2/TPMCmd/Platform/src/Cancel.c similarity index 100% rename from src/tpm2/Cancel.c rename to src/tpm2/TPMCmd/Platform/src/Cancel.c diff --git a/src/tpm2/Clock.c b/src/tpm2/TPMCmd/Platform/src/Clock.c similarity index 100% rename from src/tpm2/Clock.c rename to src/tpm2/TPMCmd/Platform/src/Clock.c diff --git a/src/tpm2/DebugHelpers.c b/src/tpm2/TPMCmd/Platform/src/DebugHelpers.c similarity index 100% rename from src/tpm2/DebugHelpers.c rename to src/tpm2/TPMCmd/Platform/src/DebugHelpers.c diff --git a/src/tpm2/Entropy.c b/src/tpm2/TPMCmd/Platform/src/Entropy.c similarity index 100% rename from src/tpm2/Entropy.c rename to src/tpm2/TPMCmd/Platform/src/Entropy.c diff --git a/src/tpm2/ExtraData.c b/src/tpm2/TPMCmd/Platform/src/ExtraData.c similarity index 100% rename from src/tpm2/ExtraData.c rename to src/tpm2/TPMCmd/Platform/src/ExtraData.c diff --git a/src/tpm2/Failure.c b/src/tpm2/TPMCmd/Platform/src/Failure.c similarity index 100% rename from src/tpm2/Failure.c rename to src/tpm2/TPMCmd/Platform/src/Failure.c diff --git a/src/tpm2/Init.c b/src/tpm2/TPMCmd/Platform/src/Init.c similarity index 100% rename from src/tpm2/Init.c rename to src/tpm2/TPMCmd/Platform/src/Init.c diff --git a/src/tpm2/LocalityPlat.c b/src/tpm2/TPMCmd/Platform/src/LocalityPlat.c similarity index 100% rename from src/tpm2/LocalityPlat.c rename to src/tpm2/TPMCmd/Platform/src/LocalityPlat.c diff --git a/src/tpm2/NVMem.c b/src/tpm2/TPMCmd/Platform/src/NVMem.c similarity index 100% rename from src/tpm2/NVMem.c rename to src/tpm2/TPMCmd/Platform/src/NVMem.c diff --git a/src/tpm2/NVVirtual.c b/src/tpm2/TPMCmd/Platform/src/NVVirtual.c similarity index 92% rename from src/tpm2/NVVirtual.c rename to src/tpm2/TPMCmd/Platform/src/NVVirtual.c index cde23aaf..83fc47b3 100644 --- a/src/tpm2/NVVirtual.c +++ b/src/tpm2/TPMCmd/Platform/src/NVVirtual.c @@ -1,9 +1,9 @@ // SPDX-License-Identifier: BSD-2-Clause #include "Platform.h" -#include "TpmAlgorithmDefines.h" -#include "TpmTypes.h" -#include "platform_virtual_nv_fp.h" +#include +#include +#include // NV Index handles for EKICA and EK Certificates. #define RSA_2048_EK_CERT_HANDLE (0x01c00002) diff --git a/src/tpm2/PPPlat.c b/src/tpm2/TPMCmd/Platform/src/PPPlat.c similarity index 100% rename from src/tpm2/PPPlat.c rename to src/tpm2/TPMCmd/Platform/src/PPPlat.c diff --git a/src/tpm2/PlatformACT.c b/src/tpm2/TPMCmd/Platform/src/PlatformACT.c similarity index 100% rename from src/tpm2/PlatformACT.c rename to src/tpm2/TPMCmd/Platform/src/PlatformACT.c diff --git a/src/tpm2/PlatformData.c b/src/tpm2/TPMCmd/Platform/src/PlatformData.c similarity index 100% rename from src/tpm2/PlatformData.c rename to src/tpm2/TPMCmd/Platform/src/PlatformData.c diff --git a/src/tpm2/PlatformPcr.c b/src/tpm2/TPMCmd/Platform/src/PlatformPcr.c similarity index 99% rename from src/tpm2/PlatformPcr.c rename to src/tpm2/TPMCmd/Platform/src/PlatformPcr.c index b347e92f..67042544 100644 --- a/src/tpm2/PlatformPcr.c +++ b/src/tpm2/TPMCmd/Platform/src/PlatformPcr.c @@ -3,7 +3,7 @@ // PCR platform interface functions #include "Platform.h" -#include "TpmAlgorithmDefines.h" +#include // use this as a convenient lookup for hash size for PCRs. UINT16 CryptHashGetDigestSize(TPM_ALG_ID hashAlg // IN: hash algorithm to look up diff --git a/src/tpm2/PowerPlat.c b/src/tpm2/TPMCmd/Platform/src/PowerPlat.c similarity index 100% rename from src/tpm2/PowerPlat.c rename to src/tpm2/TPMCmd/Platform/src/PowerPlat.c diff --git a/src/tpm2/RunCommand.c b/src/tpm2/TPMCmd/Platform/src/RunCommand.c similarity index 100% rename from src/tpm2/RunCommand.c rename to src/tpm2/TPMCmd/Platform/src/RunCommand.c diff --git a/src/tpm2/SelfTest.c b/src/tpm2/TPMCmd/Platform/src/SelfTest.c similarity index 83% rename from src/tpm2/SelfTest.c rename to src/tpm2/TPMCmd/Platform/src/SelfTest.c index 7d3a1c83..1b47c440 100644 --- a/src/tpm2/SelfTest.c +++ b/src/tpm2/TPMCmd/Platform/src/SelfTest.c @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-2-Clause #include "Platform.h" -#include "TpmAlgorithmDefines.h" -#include "TpmTypes.h" +#include +#include LIB_EXPORT void _plat_GetEnabledSelfTest( uint8_t fullTest, // IN: full test or not diff --git a/src/tpm2/Unique.c b/src/tpm2/TPMCmd/Platform/src/Unique.c similarity index 100% rename from src/tpm2/Unique.c rename to src/tpm2/TPMCmd/Platform/src/Unique.c diff --git a/src/tpm2/VendorInfo.c b/src/tpm2/TPMCmd/Platform/src/VendorInfo.c similarity index 100% rename from src/tpm2/VendorInfo.c rename to src/tpm2/TPMCmd/Platform/src/VendorInfo.c diff --git a/src/tpm2/TpmTcpProtocol.h b/src/tpm2/TPMCmd/Simulator/include/TpmTcpProtocol.h similarity index 100% rename from src/tpm2/TpmTcpProtocol.h rename to src/tpm2/TPMCmd/Simulator/include/TpmTcpProtocol.h diff --git a/src/tpm2/Simulator_fp.h b/src/tpm2/TPMCmd/Simulator/include/prototypes/Simulator_fp.h similarity index 100% rename from src/tpm2/Simulator_fp.h rename to src/tpm2/TPMCmd/Simulator/include/prototypes/Simulator_fp.h diff --git a/src/tpm2/TPMCmdp.c b/src/tpm2/TPMCmd/Simulator/src/TPMCmdp.c similarity index 100% rename from src/tpm2/TPMCmdp.c rename to src/tpm2/TPMCmd/Simulator/src/TPMCmdp.c diff --git a/src/tpm2/simulatorPrivate.h b/src/tpm2/TPMCmd/Simulator/src/simulatorPrivate.h similarity index 66% rename from src/tpm2/simulatorPrivate.h rename to src/tpm2/TPMCmd/Simulator/src/simulatorPrivate.h index 003c044f..c578f929 100644 --- a/src/tpm2/simulatorPrivate.h +++ b/src/tpm2/TPMCmd/Simulator/src/simulatorPrivate.h @@ -8,27 +8,24 @@ /* */ /* 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. */ +/* (c) Copyright IBM Corporation, 2020-2025 */ /* */ -/* - 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. */ +/* All rights reserved. */ /* */ -/* 2. Source Code Distribution Conditions: */ +/* Redistribution and use in source and binary forms, with or without */ +/* modification, are permitted provided that the following conditions are */ +/* met: */ /* */ -/* - Redistributions of Source Code must retain the above copyright licenses, */ -/* this list of conditions and the following disclaimers. */ +/* Redistributions of source code must retain the above copyright notice, */ +/* this list of conditions and the following disclaimer. */ /* */ -/* - 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. */ +/* Redistributions in binary form must reproduce the above copyright */ +/* notice, this list of conditions and the following disclaimer in the */ +/* documentation and/or other materials provided with the distribution. */ /* */ -/* 3. Disclaimers: */ +/* Neither the names of the IBM Corporation nor the names of its */ +/* contributors may be used to endorse or promote products derived from */ +/* this software without specific prior written permission. */ /* */ /* - THE COPYRIGHT LICENSES SET FORTH ABOVE DO NOT REPRESENT ANY FORM OF */ /* LICENSE OR WAIVER, EXPRESS OR IMPLIED, BY ESTOPPEL OR OTHERWISE, WITH */ @@ -65,15 +62,15 @@ #define SIMULATOR_PRIVATE_H //** Includes, Locals, Defines and Function Prototypes -#include "tpm_public.h" +#include #include "simulator_sysheaders.h" // TODO_RENAME_INC_FOLDER:prototypes refers to the platform library -#include "platform_public_interface.h" +#include // TODO_RENAME_INC_FOLDER:platform_interface refers to the TPM_CoreLib platform interface -#include "tpm_to_platform_interface.h" -#include "platform_to_tpm_interface.h" +#include +#include #include "TpmTcpProtocol.h" #include "Simulator_fp.h" diff --git a/src/tpm2/simulator_sysheaders.h b/src/tpm2/TPMCmd/Simulator/src/simulator_sysheaders.h similarity index 100% rename from src/tpm2/simulator_sysheaders.h rename to src/tpm2/TPMCmd/Simulator/src/simulator_sysheaders.h diff --git a/src/tpm2/TpmBuildSwitches.h b/src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/TpmBuildSwitches.h similarity index 99% rename from src/tpm2/TpmBuildSwitches.h rename to src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/TpmBuildSwitches.h index fa9cb2e1..e7ca4670 100644 --- a/src/tpm2/TpmBuildSwitches.h +++ b/src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/TpmBuildSwitches.h @@ -200,6 +200,6 @@ #define FAIL_TRACE YES // TODO_RENAME_INC_FOLDER: public refers to the TPM_CoreLib public headers -#include "CompilerDependencies.h" +#include #endif // _TPM_BUILD_SWITCHES_H_ diff --git a/src/tpm2/TpmProfile.h b/src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/TpmProfile.h similarity index 72% rename from src/tpm2/TpmProfile.h rename to src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/TpmProfile.h index 0acc9a87..5271f812 100644 --- a/src/tpm2/TpmProfile.h +++ b/src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/TpmProfile.h @@ -8,11 +8,11 @@ #ifndef _TPM_PROFILE_H_ #define _TPM_PROFILE_H_ -#include "TpmBuildSwitches.h" -#include "TpmProfile_Common.h" -#include "TpmProfile_CommandList.h" -#include "TpmProfile_Misc.h" -#include "TpmProfile_ErrorCodes.h" +#include +#include +#include +#include +#include // libtpms: added begin #ifndef HASH_LIB diff --git a/src/tpm2/TpmProfile_CommandList.h b/src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/TpmProfile_CommandList.h similarity index 99% rename from src/tpm2/TpmProfile_CommandList.h rename to src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/TpmProfile_CommandList.h index 11392c0c..259e4432 100644 --- a/src/tpm2/TpmProfile_CommandList.h +++ b/src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/TpmProfile_CommandList.h @@ -170,6 +170,6 @@ // clang-format on -#include "VendorCommands/VendorCommandList.h" +#include #endif // _TPM_PROFILE_COMMAND_LIST_H_ diff --git a/src/tpm2/TpmProfile_Common.h b/src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/TpmProfile_Common.h similarity index 100% rename from src/tpm2/TpmProfile_Common.h rename to src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/TpmProfile_Common.h diff --git a/src/tpm2/TpmProfile_ErrorCodes.h b/src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/TpmProfile_ErrorCodes.h similarity index 100% rename from src/tpm2/TpmProfile_ErrorCodes.h rename to src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/TpmProfile_ErrorCodes.h diff --git a/src/tpm2/TpmProfile_Misc.h b/src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/TpmProfile_Misc.h similarity index 100% rename from src/tpm2/TpmProfile_Misc.h rename to src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/TpmProfile_Misc.h diff --git a/src/tpm2/VendorCommands/CommandAttributeData_s_ccAttr.inl b/src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/VendorCommands/CommandAttributeData_s_ccAttr.inl similarity index 100% rename from src/tpm2/VendorCommands/CommandAttributeData_s_ccAttr.inl rename to src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/VendorCommands/CommandAttributeData_s_ccAttr.inl diff --git a/src/tpm2/VendorCommands/CommandAttributeData_s_commandAttributes.inl b/src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/VendorCommands/CommandAttributeData_s_commandAttributes.inl similarity index 100% rename from src/tpm2/VendorCommands/CommandAttributeData_s_commandAttributes.inl rename to src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/VendorCommands/CommandAttributeData_s_commandAttributes.inl diff --git a/src/tpm2/VendorCommands/CommandDispatchData_CommandStructures.inl b/src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/VendorCommands/CommandDispatchData_CommandStructures.inl similarity index 95% rename from src/tpm2/VendorCommands/CommandDispatchData_CommandStructures.inl rename to src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/VendorCommands/CommandDispatchData_CommandStructures.inl index a0d094ca..0435a751 100644 --- a/src/tpm2/VendorCommands/CommandDispatchData_CommandStructures.inl +++ b/src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/VendorCommands/CommandDispatchData_CommandStructures.inl @@ -14,7 +14,7 @@ #endif #if CC_Vendor_TCG_Test -# include "Vendor_TCG_Test_fp.h" // libtpms: changed +# include "TpmConfiguration/VendorCommands/prototypes/Vendor_TCG_Test_fp.h" typedef TPM_RC(Vendor_TCG_Test_Entry)(Vendor_TCG_Test_In* in, Vendor_TCG_Test_Out* out); diff --git a/src/tpm2/VendorCommands/CommandDispatchData_s_CommandDataArray.inl b/src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/VendorCommands/CommandDispatchData_s_CommandDataArray.inl similarity index 100% rename from src/tpm2/VendorCommands/CommandDispatchData_s_CommandDataArray.inl rename to src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/VendorCommands/CommandDispatchData_s_CommandDataArray.inl diff --git a/src/tpm2/VendorCommands/VendorCommandList.h b/src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/VendorCommands/VendorCommandList.h similarity index 100% rename from src/tpm2/VendorCommands/VendorCommandList.h rename to src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/VendorCommands/VendorCommandList.h diff --git a/src/tpm2/VendorCommands/Vendor_TCG_Test_fp.h b/src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/VendorCommands/prototypes/Vendor_TCG_Test_fp.h similarity index 100% rename from src/tpm2/VendorCommands/Vendor_TCG_Test_fp.h rename to src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/VendorCommands/prototypes/Vendor_TCG_Test_fp.h diff --git a/src/tpm2/VendorCommands/Vendor_TCG_Test.c b/src/tpm2/TPMCmd/TpmConfiguration/TpmVendorCommandHandlers/Vendor_TCG_Test.c similarity index 68% rename from src/tpm2/VendorCommands/Vendor_TCG_Test.c rename to src/tpm2/TPMCmd/TpmConfiguration/TpmVendorCommandHandlers/Vendor_TCG_Test.c index 2528d85e..c6233510 100644 --- a/src/tpm2/VendorCommands/Vendor_TCG_Test.c +++ b/src/tpm2/TPMCmd/TpmConfiguration/TpmVendorCommandHandlers/Vendor_TCG_Test.c @@ -1,11 +1,10 @@ -// SPDX-License-Identifier: BSD-2-Clause -#include "tpm_public.h" +#include #if CC_Vendor_TCG_Test // Conditional expansion of this file -# include "TpmTypes.h" -# include "Vendor_TCG_Test_fp.h" +# include +# include TPM_RC TPM2_Vendor_TCG_Test(Vendor_TCG_Test_In* in, // IN: input parameter list diff --git a/src/tpm2/TpmEcc_Signature_ECDSA.c b/src/tpm2/TPMCmd/tpm/cryptolibs/EccRef/TpmEcc_Signature_ECDSA.c similarity index 100% rename from src/tpm2/TpmEcc_Signature_ECDSA.c rename to src/tpm2/TPMCmd/tpm/cryptolibs/EccRef/TpmEcc_Signature_ECDSA.c diff --git a/src/tpm2/crypto/openssl/BnToOsslMath.c b/src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/BnToOsslMath.c similarity index 99% rename from src/tpm2/crypto/openssl/BnToOsslMath.c rename to src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/BnToOsslMath.c index 685b2134..a71c8dc3 100644 --- a/src/tpm2/crypto/openssl/BnToOsslMath.c +++ b/src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/BnToOsslMath.c @@ -26,7 +26,7 @@ #include "BnOssl.h" #ifdef MATH_LIB_OSSL -# include "BnToOsslMath_fp.h" +# include //** Functions diff --git a/src/tpm2/crypto/openssl/ExpDCache.c b/src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/ExpDCache.c similarity index 100% rename from src/tpm2/crypto/openssl/ExpDCache.c rename to src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/ExpDCache.c diff --git a/src/tpm2/crypto/openssl/Helpers.c b/src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/Helpers.c similarity index 100% rename from src/tpm2/crypto/openssl/Helpers.c rename to src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/Helpers.c diff --git a/src/tpm2/crypto/openssl/TpmToOsslDesSupport.c b/src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/TpmToOsslDesSupport.c similarity index 100% rename from src/tpm2/crypto/openssl/TpmToOsslDesSupport.c rename to src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/TpmToOsslDesSupport.c diff --git a/src/tpm2/crypto/openssl/TpmToOsslSupport.c b/src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/TpmToOsslSupport.c similarity index 98% rename from src/tpm2/crypto/openssl/TpmToOsslSupport.c rename to src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/TpmToOsslSupport.c index b2b421d1..8965d607 100644 --- a/src/tpm2/crypto/openssl/TpmToOsslSupport.c +++ b/src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/TpmToOsslSupport.c @@ -66,9 +66,9 @@ //** Defines and Includes #include "BnOssl.h" -#include "CryptoInterface.h" -#include "TpmToOsslSym.h" -#include "TpmToOsslHash.h" +#include +#include +#include #include #include diff --git a/src/tpm2/crypto/openssl/BnOssl.h b/src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/BnOssl.h similarity index 94% rename from src/tpm2/crypto/openssl/BnOssl.h rename to src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/BnOssl.h index 004d9f49..660d2cd5 100644 --- a/src/tpm2/crypto/openssl/BnOssl.h +++ b/src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/BnOssl.h @@ -64,15 +64,15 @@ #ifndef _BNOSSL_H_ #define _BNOSSL_H_ // TODO_RENAME_INC_FOLDER: public refers to the TPM_CoreLib public headers -#include "tpm_public.h" -#include "TpmFail_fp.h" -#include "BnToOsslMath.h" +#include +#include +#include // TODO_RENAME_INC_FOLDER: these refer to TpmBigNum protected headers -#include "BnSupport_Interface.h" -#include "BnUtil_fp.h" -#include "BnMemory_fp.h" -#include "BnMath_fp.h" -#include "BnConvert_fp.h" +#include +#include +#include +#include +#include #if CRYPTO_LIB_REPORTING # include diff --git a/src/tpm2/crypto/openssl/BnToOsslMath.h b/src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/BnToOsslMath.h similarity index 99% rename from src/tpm2/crypto/openssl/BnToOsslMath.h rename to src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/BnToOsslMath.h index ccfd02af..4bd9cc75 100644 --- a/src/tpm2/crypto/openssl/BnToOsslMath.h +++ b/src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/BnToOsslMath.h @@ -72,7 +72,7 @@ # error this OpenSSL Interface expects to be used from TpmBigNum #endif -#include "BnValues.h" +#include #include #include #include @@ -149,7 +149,7 @@ TPM_INLINE const TPMBN_ECC_CURVE_CONSTANTS* AccessCurveConstants( return E->C; } -#include "TpmToOsslSupport_fp.h" +#include // Start and end a context within which the OpenSSL memory management works #define OSSL_ENTER() BN_CTX* CTX = OsslContextEnter() diff --git a/src/tpm2/crypto/openssl/BnToOsslMath_fp.h b/src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/BnToOsslMath_fp.h similarity index 100% rename from src/tpm2/crypto/openssl/BnToOsslMath_fp.h rename to src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/BnToOsslMath_fp.h diff --git a/src/tpm2/crypto/openssl/ExpDCache_fp.h b/src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/ExpDCache_fp.h similarity index 100% rename from src/tpm2/crypto/openssl/ExpDCache_fp.h rename to src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/ExpDCache_fp.h diff --git a/src/tpm2/crypto/openssl/Helpers_fp.h b/src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/Helpers_fp.h similarity index 99% rename from src/tpm2/crypto/openssl/Helpers_fp.h rename to src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/Helpers_fp.h index 7cc86169..56614cc4 100644 --- a/src/tpm2/crypto/openssl/Helpers_fp.h +++ b/src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/Helpers_fp.h @@ -43,7 +43,7 @@ #ifndef HELPERS_FP_H #define HELPERS_FP_H -#include "TpmTypes.h" +#include "tpm_public/TpmTypes.h" #include diff --git a/src/tpm2/crypto/openssl/TpmToOsslDesSupport_fp.h b/src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/TpmToOsslDesSupport_fp.h similarity index 100% rename from src/tpm2/crypto/openssl/TpmToOsslDesSupport_fp.h rename to src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/TpmToOsslDesSupport_fp.h diff --git a/src/tpm2/crypto/openssl/TpmToOsslHash.h b/src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/TpmToOsslHash.h similarity index 100% rename from src/tpm2/crypto/openssl/TpmToOsslHash.h rename to src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/TpmToOsslHash.h diff --git a/src/tpm2/crypto/openssl/TpmToOsslSupport_fp.h b/src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/TpmToOsslSupport_fp.h similarity index 100% rename from src/tpm2/crypto/openssl/TpmToOsslSupport_fp.h rename to src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/TpmToOsslSupport_fp.h diff --git a/src/tpm2/crypto/openssl/TpmToOsslSym.h b/src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/TpmToOsslSym.h similarity index 100% rename from src/tpm2/crypto/openssl/TpmToOsslSym.h rename to src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/TpmToOsslSym.h diff --git a/src/tpm2/PrimeData.c b/src/tpm2/TPMCmd/tpm/cryptolibs/RsaRef/PrimeData.c similarity index 100% rename from src/tpm2/PrimeData.c rename to src/tpm2/TPMCmd/tpm/cryptolibs/RsaRef/PrimeData.c diff --git a/src/tpm2/BnConvert.c b/src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/BnConvert.c similarity index 100% rename from src/tpm2/BnConvert.c rename to src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/BnConvert.c diff --git a/src/tpm2/BnEccConstants.c b/src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/BnEccConstants.c similarity index 99% rename from src/tpm2/BnEccConstants.c rename to src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/BnEccConstants.c index 346632cc..3d4b5e73 100644 --- a/src/tpm2/BnEccConstants.c +++ b/src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/BnEccConstants.c @@ -7,7 +7,7 @@ #include "TpmBigNum.h" //#include "Tpm.h" // TODO_RENAME_INC_FOLDER:private refers to the TPM_CoreLib private headers -#include "OIDs.h" +#include #if ALG_ECC @@ -46,7 +46,7 @@ // This file contains the raw data for ECC curve constants. The data is wrapped // in macros so this file can be included in other files that format the data in // a memory format desired by the user. This file itself is never used alone. -# include "EccConstantData.inl" +# include // now define the TPMBN_ECC_CURVE_CONSTANTS objects for the known curves diff --git a/src/tpm2/BnMath.c b/src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/BnMath.c similarity index 100% rename from src/tpm2/BnMath.c rename to src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/BnMath.c diff --git a/src/tpm2/BnMemory.c b/src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/BnMemory.c similarity index 100% rename from src/tpm2/BnMemory.c rename to src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/BnMemory.c diff --git a/src/tpm2/TpmBigNum.h b/src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/TpmBigNum.h similarity index 90% rename from src/tpm2/TpmBigNum.h rename to src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/TpmBigNum.h index 725e5bca..bc90c972 100644 --- a/src/tpm2/TpmBigNum.h +++ b/src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/TpmBigNum.h @@ -61,17 +61,17 @@ //** Introduction // This file contains the headers necessary to build the tpm big num library. // TODO_RENAME_INC_FOLDER: public refers to the TPM_CoreLib public headers -#include "tpm_public.h" -#include "TpmFail_fp.h" +#include +#include // TODO_RENAME_INC_FOLDER: private refers to the TPM_CoreLib private(protected) headers -#include "TpmAlgorithmDefines.h" -#include "GpMacros.h" // required for TpmFail_fp.h -#include "Capabilities.h" -#include "TpmTypes.h" // requires capabilities & GpMacros -#include "TpmToTpmBigNumMath.h" +#include +#include // required for TpmFail_fp.h +#include +#include // requires capabilities & GpMacros +#include #include "BnSupport_Interface.h" #include "BnConvert_fp.h" #include "BnMemory_fp.h" #include "BnMath_fp.h" #include "BnUtil_fp.h" -#include "MathLibraryInterface.h" +#include diff --git a/src/tpm2/TpmBigNumThunks.c b/src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/TpmBigNumThunks.c similarity index 100% rename from src/tpm2/TpmBigNumThunks.c rename to src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/TpmBigNumThunks.c diff --git a/src/tpm2/crypto/openssl/BnConvert_fp.h b/src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnConvert_fp.h similarity index 100% rename from src/tpm2/crypto/openssl/BnConvert_fp.h rename to src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnConvert_fp.h diff --git a/src/tpm2/crypto/openssl/BnMath_fp.h b/src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnMath_fp.h similarity index 100% rename from src/tpm2/crypto/openssl/BnMath_fp.h rename to src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnMath_fp.h diff --git a/src/tpm2/crypto/openssl/BnMemory_fp.h b/src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnMemory_fp.h similarity index 100% rename from src/tpm2/crypto/openssl/BnMemory_fp.h rename to src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnMemory_fp.h diff --git a/src/tpm2/BnSupport_Interface.h b/src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnSupport_Interface.h similarity index 99% rename from src/tpm2/BnSupport_Interface.h rename to src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnSupport_Interface.h index 5928a02f..376c98cd 100644 --- a/src/tpm2/BnSupport_Interface.h +++ b/src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnSupport_Interface.h @@ -78,8 +78,8 @@ #ifndef BN_SUPPORT_INTERFACE_H #define BN_SUPPORT_INTERFACE_H // TODO_RENAME_INC_FOLDER:private refers to the TPM_CoreLib private headers -#include "GpMacros.h" -#include "CryptoInterface.h" +#include "tpm_public/GpMacros.h" +#include #include "BnValues.h" //** BnSupportLibInit() diff --git a/src/tpm2/BnUtil_fp.h b/src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnUtil_fp.h similarity index 100% rename from src/tpm2/BnUtil_fp.h rename to src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnUtil_fp.h diff --git a/src/tpm2/crypto/openssl/BnValues.h b/src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnValues.h similarity index 98% rename from src/tpm2/crypto/openssl/BnValues.h rename to src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnValues.h index 0f05db68..301bb91d 100644 --- a/src/tpm2/crypto/openssl/BnValues.h +++ b/src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnValues.h @@ -26,10 +26,10 @@ #ifndef _BN_NUMBERS_H #define _BN_NUMBERS_H // TODO_RENAME_INC_FOLDER:private refers to the TPM_CoreLib private headers -#include "TpmAlgorithmDefines.h" -#include "GpMacros.h" // required for TpmFail_fp.h -#include "Capabilities.h" -#include "TpmTypes.h" // requires capabilities & GpMacros +#include +#include // required for TpmFail_fp.h +#include +#include // requires capabilities & GpMacros // These are the basic big number formats. This is convertible to the library- // specific format without too much difficulty. For the math performed using diff --git a/src/tpm2/crypto/openssl/TpmToTpmBigNumMath.h b/src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/TpmBigNum/TpmToTpmBigNumMath.h similarity index 96% rename from src/tpm2/crypto/openssl/TpmToTpmBigNumMath.h rename to src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/TpmBigNum/TpmToTpmBigNumMath.h index dbd625ce..55879aad 100644 --- a/src/tpm2/crypto/openssl/TpmToTpmBigNumMath.h +++ b/src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/TpmBigNum/TpmToTpmBigNumMath.h @@ -74,9 +74,9 @@ #define MATH_LIB_TPMBIGNUM // TODO_RENAME_INC_FOLDER: private refers to the TPM_CoreLib private headers -#include "GpMacros.h" // required for TpmFail_fp.h -#include "Capabilities.h" -#include "TpmTypes.h" // requires capabilities & GpMacros +#include // required for TpmFail_fp.h +#include +#include // requires capabilities & GpMacros #include "BnValues.h" #ifndef LIB_INCLUDE @@ -115,6 +115,6 @@ // now include the math library functional interface and instantiate the // Crypt_Int & related types // TODO_RENAME_INC_FOLDER: This should have a Tpm_Cryptolib_Common component prefix. -#include "MathLibraryInterface.h" +#include #endif // _TPM_TO_TPMBIGNUM_MATH_H_ diff --git a/src/tpm2/CryptoInterface.h b/src/tpm2/TPMCmd/tpm/cryptolibs/common/include/CryptoInterface.h similarity index 98% rename from src/tpm2/CryptoInterface.h rename to src/tpm2/TPMCmd/tpm/cryptolibs/common/include/CryptoInterface.h index 0550c747..15fc5b19 100644 --- a/src/tpm2/CryptoInterface.h +++ b/src/tpm2/TPMCmd/tpm/cryptolibs/common/include/CryptoInterface.h @@ -43,7 +43,7 @@ #ifndef CRYPTO_INTERFACE_H #define CRYPTO_INTERFACE_H -#include "TpmBuildSwitches.h" +#include "TpmConfiguration/TpmBuildSwitches.h" #if SIMULATION && CRYPTO_LIB_REPORTING diff --git a/src/tpm2/EccConstantData.inl b/src/tpm2/TPMCmd/tpm/cryptolibs/common/include/EccConstantData.inl similarity index 100% rename from src/tpm2/EccConstantData.inl rename to src/tpm2/TPMCmd/tpm/cryptolibs/common/include/EccConstantData.inl diff --git a/src/tpm2/MathLibraryInterface.h b/src/tpm2/TPMCmd/tpm/cryptolibs/common/include/MathLibraryInterface.h similarity index 100% rename from src/tpm2/MathLibraryInterface.h rename to src/tpm2/TPMCmd/tpm/cryptolibs/common/include/MathLibraryInterface.h diff --git a/src/tpm2/MathLibraryInterfaceTypes.h b/src/tpm2/TPMCmd/tpm/cryptolibs/common/include/MathLibraryInterfaceTypes.h similarity index 100% rename from src/tpm2/MathLibraryInterfaceTypes.h rename to src/tpm2/TPMCmd/tpm/cryptolibs/common/include/MathLibraryInterfaceTypes.h diff --git a/src/tpm2/pcrstruct.h b/src/tpm2/TPMCmd/tpm/include/platform_interface/pcrstruct.h similarity index 98% rename from src/tpm2/pcrstruct.h rename to src/tpm2/TPMCmd/tpm/include/platform_interface/pcrstruct.h index 8025888d..2970a885 100644 --- a/src/tpm2/pcrstruct.h +++ b/src/tpm2/TPMCmd/tpm/include/platform_interface/pcrstruct.h @@ -66,9 +66,9 @@ #ifndef _PCRSTRUCT_H_ #define _PCRSTRUCT_H_ -#include "BaseTypes.h" -#include "TpmAlgorithmDefines.h" -#include "TpmTypes.h" +#include +#include +#include // a single PCR typedef struct diff --git a/src/tpm2/TPMCmd/tpm/include/platform_interface/platform_to_tpm_interface.h b/src/tpm2/TPMCmd/tpm/include/platform_interface/platform_to_tpm_interface.h new file mode 100644 index 00000000..9fb0f225 --- /dev/null +++ b/src/tpm2/TPMCmd/tpm/include/platform_interface/platform_to_tpm_interface.h @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: BSD-2-Clause + +#include +#include +#include +#include +#include +#include +// TODO_RENAME_INC_FOLDER: public refers to the TPM_CoreLib public headers +#include diff --git a/src/tpm2/ExecCommand_fp.h b/src/tpm2/TPMCmd/tpm/include/platform_interface/prototypes/ExecCommand_fp.h similarity index 100% rename from src/tpm2/ExecCommand_fp.h rename to src/tpm2/TPMCmd/tpm/include/platform_interface/prototypes/ExecCommand_fp.h diff --git a/src/tpm2/Manufacture_fp.h b/src/tpm2/TPMCmd/tpm/include/platform_interface/prototypes/Manufacture_fp.h similarity index 100% rename from src/tpm2/Manufacture_fp.h rename to src/tpm2/TPMCmd/tpm/include/platform_interface/prototypes/Manufacture_fp.h diff --git a/src/tpm2/_TPM_Hash_Data_fp.h b/src/tpm2/TPMCmd/tpm/include/platform_interface/prototypes/_TPM_Hash_Data_fp.h similarity index 100% rename from src/tpm2/_TPM_Hash_Data_fp.h rename to src/tpm2/TPMCmd/tpm/include/platform_interface/prototypes/_TPM_Hash_Data_fp.h diff --git a/src/tpm2/_TPM_Hash_End_fp.h b/src/tpm2/TPMCmd/tpm/include/platform_interface/prototypes/_TPM_Hash_End_fp.h similarity index 100% rename from src/tpm2/_TPM_Hash_End_fp.h rename to src/tpm2/TPMCmd/tpm/include/platform_interface/prototypes/_TPM_Hash_End_fp.h diff --git a/src/tpm2/_TPM_Hash_Start_fp.h b/src/tpm2/TPMCmd/tpm/include/platform_interface/prototypes/_TPM_Hash_Start_fp.h similarity index 100% rename from src/tpm2/_TPM_Hash_Start_fp.h rename to src/tpm2/TPMCmd/tpm/include/platform_interface/prototypes/_TPM_Hash_Start_fp.h diff --git a/src/tpm2/_TPM_Init_fp.h b/src/tpm2/TPMCmd/tpm/include/platform_interface/prototypes/_TPM_Init_fp.h similarity index 100% rename from src/tpm2/_TPM_Init_fp.h rename to src/tpm2/TPMCmd/tpm/include/platform_interface/prototypes/_TPM_Init_fp.h diff --git a/src/tpm2/platform_failure_mode_fp.h b/src/tpm2/TPMCmd/tpm/include/platform_interface/prototypes/platform_failure_mode_fp.h similarity index 100% rename from src/tpm2/platform_failure_mode_fp.h rename to src/tpm2/TPMCmd/tpm/include/platform_interface/prototypes/platform_failure_mode_fp.h diff --git a/src/tpm2/platform_init_fp.h b/src/tpm2/TPMCmd/tpm/include/platform_interface/prototypes/platform_init_fp.h similarity index 100% rename from src/tpm2/platform_init_fp.h rename to src/tpm2/TPMCmd/tpm/include/platform_interface/prototypes/platform_init_fp.h diff --git a/src/tpm2/platform_pcr_fp.h b/src/tpm2/TPMCmd/tpm/include/platform_interface/prototypes/platform_pcr_fp.h similarity index 97% rename from src/tpm2/platform_pcr_fp.h rename to src/tpm2/TPMCmd/tpm/include/platform_interface/prototypes/platform_pcr_fp.h index 5d9f3924..579e5a24 100644 --- a/src/tpm2/platform_pcr_fp.h +++ b/src/tpm2/TPMCmd/tpm/include/platform_interface/prototypes/platform_pcr_fp.h @@ -64,9 +64,9 @@ #ifndef _PLATFORM_PCR_FP_H_ #define _PLATFORM_PCR_FP_H_ -#include "BaseTypes.h" -#include "TpmTypes.h" -#include "pcrstruct.h" +#include +#include +#include // return the number of PCRs the platform recognizes for GetPcrInitializationAttributes. // PCRs are numbered starting at zero. diff --git a/src/tpm2/platform_virtual_nv_fp.h b/src/tpm2/TPMCmd/tpm/include/platform_interface/prototypes/platform_virtual_nv_fp.h similarity index 95% rename from src/tpm2/platform_virtual_nv_fp.h rename to src/tpm2/TPMCmd/tpm/include/platform_interface/prototypes/platform_virtual_nv_fp.h index e16388b4..397f8cb3 100644 --- a/src/tpm2/platform_virtual_nv_fp.h +++ b/src/tpm2/TPMCmd/tpm/include/platform_interface/prototypes/platform_virtual_nv_fp.h @@ -3,8 +3,8 @@ #ifndef _PLATFORM_VIRTUAL_FP_H_ #define _PLATFORM_VIRTUAL_FP_H_ -#include "NV_Read_fp.h" -#include "NV_ReadPublic_fp.h" +#include +#include // The ECC EK Cert and EK ICA Cert NV indexes are not populated like normal. // Data is generated on the fly and returned when NV_Read or NV_ReadPublic is diff --git a/src/tpm2/tpm_to_platform_interface.h b/src/tpm2/TPMCmd/tpm/include/platform_interface/tpm_to_platform_interface.h similarity index 98% rename from src/tpm2/tpm_to_platform_interface.h rename to src/tpm2/TPMCmd/tpm/include/platform_interface/tpm_to_platform_interface.h index 7910d2f0..40bcd660 100644 --- a/src/tpm2/tpm_to_platform_interface.h +++ b/src/tpm2/TPMCmd/tpm/include/platform_interface/tpm_to_platform_interface.h @@ -7,8 +7,8 @@ #define _TPM_TO_PLATFORM_INTERFACE_H_ // need to read configuration for ACT_SUPPORT flag check below -#include "TpmBuildSwitches.h" -#include "TpmProfile.h" +#include +#include #include //** From Cancel.c @@ -442,15 +442,15 @@ LIB_EXPORT size_t _plat_debug_snprintf( #endif // ENABLE_TPM_DEBUG_PRINT // platform PCR initialization functions -#include "platform_pcr_fp.h" +#include // platform initialization functions -#include "platform_init_fp.h" +#include // platform failure mode functions -#include "platform_failure_mode_fp.h" +#include // platform virtual NV functions -#include "platform_virtual_nv_fp.h" +#include #endif // _TPM_TO_PLATFORM_INTERFACE_H_ diff --git a/src/tpm2/CommandAttributeData.h b/src/tpm2/TPMCmd/tpm/include/private/CommandAttributeData.h similarity index 99% rename from src/tpm2/CommandAttributeData.h rename to src/tpm2/TPMCmd/tpm/include/private/CommandAttributeData.h index fe147fd3..2a419a4b 100644 --- a/src/tpm2/CommandAttributeData.h +++ b/src/tpm2/TPMCmd/tpm/include/private/CommandAttributeData.h @@ -414,7 +414,7 @@ const TPMA_CC s_ccAttr [] = { #endif // Include attributes for vendor commands -#include "VendorCommands/CommandAttributeData_s_ccAttr.inl" +#include "TpmConfiguration/VendorCommands/CommandAttributeData_s_ccAttr.inl" // list terminator TPMA_ZERO_INITIALIZER() @@ -943,7 +943,7 @@ const COMMAND_ATTRIBUTES s_commandAttributes [] = { #endif // Include attributes for vendor commands -#include "VendorCommands/CommandAttributeData_s_commandAttributes.inl" +#include "TpmConfiguration/VendorCommands/CommandAttributeData_s_commandAttributes.inl" // list terminator 0 diff --git a/src/tpm2/CommandAttributes.h b/src/tpm2/TPMCmd/tpm/include/private/CommandAttributes.h similarity index 100% rename from src/tpm2/CommandAttributes.h rename to src/tpm2/TPMCmd/tpm/include/private/CommandAttributes.h diff --git a/src/tpm2/CommandDispatchData.h b/src/tpm2/TPMCmd/tpm/include/private/CommandDispatchData.h similarity index 99% rename from src/tpm2/CommandDispatchData.h rename to src/tpm2/TPMCmd/tpm/include/private/CommandDispatchData.h index b79c6e03..efc80f89 100644 --- a/src/tpm2/CommandDispatchData.h +++ b/src/tpm2/TPMCmd/tpm/include/private/CommandDispatchData.h @@ -5190,7 +5190,7 @@ ACT_SetTimeout_COMMAND_DESCRIPTOR_t _ACT_SetTimeoutData = { #define _ACT_SetTimeoutDataAddress 0 #endif // CC_ACT_SetTimeout -#include "VendorCommands/CommandDispatchData_CommandStructures.inl" +#include // Lookup table to access the per-command tables above @@ -5606,7 +5606,7 @@ COMMAND_DESCRIPTOR_t* s_CommandDataArray[] = { (COMMAND_DESCRIPTOR_t*)_PolicyTransportSPDMDataAddress, #endif // CC_PolicyTransportSPDM -#include "VendorCommands/CommandDispatchData_s_CommandDataArray.inl" +#include // list terminator 0 diff --git a/src/tpm2/crypto/CryptEcc.h b/src/tpm2/TPMCmd/tpm/include/private/CryptEcc.h similarity index 100% rename from src/tpm2/crypto/CryptEcc.h rename to src/tpm2/TPMCmd/tpm/include/private/CryptEcc.h diff --git a/src/tpm2/crypto/CryptHash.h b/src/tpm2/TPMCmd/tpm/include/private/CryptHash.h similarity index 100% rename from src/tpm2/crypto/CryptHash.h rename to src/tpm2/TPMCmd/tpm/include/private/CryptHash.h diff --git a/src/tpm2/crypto/CryptRand.h b/src/tpm2/TPMCmd/tpm/include/private/CryptRand.h similarity index 100% rename from src/tpm2/crypto/CryptRand.h rename to src/tpm2/TPMCmd/tpm/include/private/CryptRand.h diff --git a/src/tpm2/crypto/CryptRsa.h b/src/tpm2/TPMCmd/tpm/include/private/CryptRsa.h similarity index 100% rename from src/tpm2/crypto/CryptRsa.h rename to src/tpm2/TPMCmd/tpm/include/private/CryptRsa.h diff --git a/src/tpm2/crypto/CryptSym.h b/src/tpm2/TPMCmd/tpm/include/private/CryptSym.h similarity index 100% rename from src/tpm2/crypto/CryptSym.h rename to src/tpm2/TPMCmd/tpm/include/private/CryptSym.h diff --git a/src/tpm2/crypto/CryptTest.h b/src/tpm2/TPMCmd/tpm/include/private/CryptTest.h similarity index 100% rename from src/tpm2/crypto/CryptTest.h rename to src/tpm2/TPMCmd/tpm/include/private/CryptTest.h diff --git a/src/tpm2/EccTestData.h b/src/tpm2/TPMCmd/tpm/include/private/EccTestData.h similarity index 100% rename from src/tpm2/EccTestData.h rename to src/tpm2/TPMCmd/tpm/include/private/EccTestData.h diff --git a/src/tpm2/Global.h b/src/tpm2/TPMCmd/tpm/include/private/Global.h similarity index 99% rename from src/tpm2/Global.h rename to src/tpm2/TPMCmd/tpm/include/private/Global.h index 456e6a51..80d919d6 100644 --- a/src/tpm2/Global.h +++ b/src/tpm2/TPMCmd/tpm/include/private/Global.h @@ -32,9 +32,9 @@ _REDUCE_WARNING_LEVEL_(2) _NORMAL_WARNING_LEVEL_ #include "BackwardsCompatibility.h" // libtpms added -# include "GpMacros.h" -# include "Capabilities.h" -# include "TpmTypes.h" // requires GpMacros & Capabilities +# include "tpm_public/GpMacros.h" +# include "tpm_public/Capabilities.h" +# include "tpm_public/TpmTypes.h" // requires GpMacros & Capabilities # include "CommandAttributes.h" # include "CryptTest.h" @@ -50,7 +50,7 @@ _NORMAL_WARNING_LEVEL_ # include "CryptRsa.h" # include "CryptTest.h" # include "NV.h" -# include "ACT.h" +# include "tpm_public/ACT.h" # include "Utils.h" // libtpms added //** Defines and Types @@ -1429,7 +1429,7 @@ EXTERN OBJECT s_objects[MAX_LOADED_OBJECTS]; //*** From PCR.c //***************************************************************************** # if defined PCR_C || defined GLOBAL_C -# include "pcrstruct.h" +# include EXTERN PCR s_pcrs[IMPLEMENTATION_PCR]; diff --git a/src/tpm2/HashTestData.h b/src/tpm2/TPMCmd/tpm/include/private/HashTestData.h similarity index 100% rename from src/tpm2/HashTestData.h rename to src/tpm2/TPMCmd/tpm/include/private/HashTestData.h diff --git a/src/tpm2/InternalRoutines.h b/src/tpm2/TPMCmd/tpm/include/private/InternalRoutines.h similarity index 71% rename from src/tpm2/InternalRoutines.h rename to src/tpm2/TPMCmd/tpm/include/private/InternalRoutines.h index b439b78d..5256b757 100644 --- a/src/tpm2/InternalRoutines.h +++ b/src/tpm2/TPMCmd/tpm/include/private/InternalRoutines.h @@ -8,9 +8,10 @@ #endif // DRTM functions -#include "_TPM_Hash_Start_fp.h" -#include "_TPM_Hash_Data_fp.h" -#include "_TPM_Hash_End_fp.h" +// TODO_RENAME_INC_FOLDER:platform_interface refers to the TPM_CoreLib platform interface +#include +#include +#include // Internal subsystem functions #include "Object_fp.h" @@ -28,17 +29,19 @@ #if SEC_CHANNEL_SUPPORT # include "SecChannel_fp.h" #endif // SEC_CHANNEL_SUPPORT -#include "TpmFail_fp.h" +// TODO_RENAME_INC_FOLDER: public refers to the TPM_CoreLib public headers +#include #include "SessionProcess_fp.h" // Internal support functions #include "CommandCodeAttributes_fp.h" -#include "Marshal_fp.h" +#include "Marshal.h" #include "Time_fp.h" #include "Locality_fp.h" #include "PP_fp.h" #include "CommandAudit_fp.h" -#include "Manufacture_fp.h" +// TODO_RENAME_INC_FOLDER:platform_interface refers to the TPM_CoreLib platform interface +#include #include "Handle_fp.h" #include "Power_fp.h" #include "Response_fp.h" @@ -55,15 +58,18 @@ #include "IoBuffers_fp.h" #include "Memory_fp.h" #include "ResponseCodeProcessing_fp.h" -/* Internal cryptographic functions */ -#include "BnConvert_fp.h" -#include "BnMath_fp.h" -#include "BnMemory_fp.h" + +// Asymmetric Support library Interface +// TODO_RENAME_INC_FOLDER: needs a component prefix +// Math interface must be included before other Crypt headers to define types +#include + +// Internal cryptographic functions #include "Ticket_fp.h" #include "CryptUtil_fp.h" #include "CryptHash_fp.h" #include "CryptSym_fp.h" -#include "CryptDes_fp.h" +#include "CryptDes_fp.h" // libtpms added #include "CryptPrime_fp.h" #include "CryptRand_fp.h" #include "CryptSelfTest_fp.h" @@ -89,12 +95,9 @@ # include "CryptCmac_fp.h" # endif #endif -// Asymmetric Support library Interface -// TODO_RENAME_INC_FOLDER: needs a component prefix -#include "MathLibraryInterface.h" // Linkage to platform functions // TODO_RENAME_INC_FOLDER:platform_interface refers to the TPM_CoreLib platform interface -#include "tpm_to_platform_interface.h" +#include #endif diff --git a/src/tpm2/KdfTestData.h b/src/tpm2/TPMCmd/tpm/include/private/KdfTestData.h similarity index 100% rename from src/tpm2/KdfTestData.h rename to src/tpm2/TPMCmd/tpm/include/private/KdfTestData.h diff --git a/src/tpm2/crypto/openssl/LibSupport.h b/src/tpm2/TPMCmd/tpm/include/private/LibSupport.h similarity index 99% rename from src/tpm2/crypto/openssl/LibSupport.h rename to src/tpm2/TPMCmd/tpm/include/private/LibSupport.h index 88c32eac..52384968 100644 --- a/src/tpm2/crypto/openssl/LibSupport.h +++ b/src/tpm2/TPMCmd/tpm/include/private/LibSupport.h @@ -64,7 +64,7 @@ #ifndef _LIB_SUPPORT_H_ #define _LIB_SUPPORT_H_ // TODO_RENAME_INC_FOLDER: public refers to the TPM_CoreLib public headers -#include "tpm_radix.h" +#include // Include the options for hashing and symmetric. Defer the load of the math package // Until the bignum parameters are defined. diff --git a/src/tpm2/Marshal.h b/src/tpm2/TPMCmd/tpm/include/private/Marshal.h similarity index 100% rename from src/tpm2/Marshal.h rename to src/tpm2/TPMCmd/tpm/include/private/Marshal.h diff --git a/src/tpm2/NV.h b/src/tpm2/TPMCmd/tpm/include/private/NV.h similarity index 100% rename from src/tpm2/NV.h rename to src/tpm2/TPMCmd/tpm/include/private/NV.h diff --git a/src/tpm2/OIDs.h b/src/tpm2/TPMCmd/tpm/include/private/OIDs.h similarity index 100% rename from src/tpm2/OIDs.h rename to src/tpm2/TPMCmd/tpm/include/private/OIDs.h diff --git a/src/tpm2/PRNG_TestVectors.h b/src/tpm2/TPMCmd/tpm/include/private/PRNG_TestVectors.h similarity index 100% rename from src/tpm2/PRNG_TestVectors.h rename to src/tpm2/TPMCmd/tpm/include/private/PRNG_TestVectors.h diff --git a/src/tpm2/RsaTestData.h b/src/tpm2/TPMCmd/tpm/include/private/RsaTestData.h similarity index 100% rename from src/tpm2/RsaTestData.h rename to src/tpm2/TPMCmd/tpm/include/private/RsaTestData.h diff --git a/src/tpm2/SelfTest.h b/src/tpm2/TPMCmd/tpm/include/private/SelfTest.h similarity index 100% rename from src/tpm2/SelfTest.h rename to src/tpm2/TPMCmd/tpm/include/private/SelfTest.h diff --git a/src/tpm2/SymmetricTest.h b/src/tpm2/TPMCmd/tpm/include/private/SymmetricTest.h similarity index 100% rename from src/tpm2/SymmetricTest.h rename to src/tpm2/TPMCmd/tpm/include/private/SymmetricTest.h diff --git a/src/tpm2/SymmetricTestData.h b/src/tpm2/TPMCmd/tpm/include/private/SymmetricTestData.h similarity index 100% rename from src/tpm2/SymmetricTestData.h rename to src/tpm2/TPMCmd/tpm/include/private/SymmetricTestData.h diff --git a/src/tpm2/Tpm.h b/src/tpm2/TPMCmd/tpm/include/private/Tpm.h similarity index 96% rename from src/tpm2/Tpm.h rename to src/tpm2/TPMCmd/tpm/include/private/Tpm.h index 7dbe8ac7..90472a41 100644 --- a/src/tpm2/Tpm.h +++ b/src/tpm2/TPMCmd/tpm/include/private/Tpm.h @@ -63,14 +63,14 @@ #ifndef _TPM_H_ #define _TPM_H_ // TODO_RENAME_INC_FOLDER: public refers to the TPM_CoreLib public headers -#include "tpm_public.h" +#include -#include "TpmAlgorithmDefines.h" +#include "tpm_public/TpmAlgorithmDefines.h" #include "LibSupport.h" // Types from the library. These need to come before // Global.h because some of the structures in // that file depend on the structures used by the // cryptographic libraries. -#include "GpMacros.h" // Define additional macros +#include "tpm_public/GpMacros.h" // Define additional macros #include "Global.h" // Define other TPM types #include "InternalRoutines.h" // Function prototypes #include "RuntimeProfile_fp.h" // libtpms added diff --git a/src/tpm2/TpmASN1.h b/src/tpm2/TPMCmd/tpm/include/private/TpmASN1.h similarity index 100% rename from src/tpm2/TpmASN1.h rename to src/tpm2/TPMCmd/tpm/include/private/TpmASN1.h diff --git a/src/tpm2/X509.h b/src/tpm2/TPMCmd/tpm/include/private/X509.h similarity index 100% rename from src/tpm2/X509.h rename to src/tpm2/TPMCmd/tpm/include/private/X509.h diff --git a/src/tpm2/ACT_SetTimeout_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/ACT_SetTimeout_fp.h similarity index 100% rename from src/tpm2/ACT_SetTimeout_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/ACT_SetTimeout_fp.h diff --git a/src/tpm2/ACT_spt_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/ACT_spt_fp.h similarity index 100% rename from src/tpm2/ACT_spt_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/ACT_spt_fp.h diff --git a/src/tpm2/ActivateCredential_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/ActivateCredential_fp.h similarity index 100% rename from src/tpm2/ActivateCredential_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/ActivateCredential_fp.h diff --git a/src/tpm2/AlgorithmCap_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/AlgorithmCap_fp.h similarity index 100% rename from src/tpm2/AlgorithmCap_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/AlgorithmCap_fp.h diff --git a/src/tpm2/AlgorithmTests_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/AlgorithmTests_fp.h similarity index 100% rename from src/tpm2/AlgorithmTests_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/AlgorithmTests_fp.h diff --git a/src/tpm2/Attest_spt_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Attest_spt_fp.h similarity index 100% rename from src/tpm2/Attest_spt_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Attest_spt_fp.h diff --git a/src/tpm2/Bits_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Bits_fp.h similarity index 100% rename from src/tpm2/Bits_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Bits_fp.h diff --git a/src/tpm2/CertifyCreation_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/CertifyCreation_fp.h similarity index 100% rename from src/tpm2/CertifyCreation_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/CertifyCreation_fp.h diff --git a/src/tpm2/CertifyX509_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/CertifyX509_fp.h similarity index 100% rename from src/tpm2/CertifyX509_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/CertifyX509_fp.h diff --git a/src/tpm2/Certify_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Certify_fp.h similarity index 100% rename from src/tpm2/Certify_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Certify_fp.h diff --git a/src/tpm2/ChangeEPS_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/ChangeEPS_fp.h similarity index 100% rename from src/tpm2/ChangeEPS_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/ChangeEPS_fp.h diff --git a/src/tpm2/ChangePPS_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/ChangePPS_fp.h similarity index 100% rename from src/tpm2/ChangePPS_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/ChangePPS_fp.h diff --git a/src/tpm2/ClearControl_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/ClearControl_fp.h similarity index 100% rename from src/tpm2/ClearControl_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/ClearControl_fp.h diff --git a/src/tpm2/Clear_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Clear_fp.h similarity index 100% rename from src/tpm2/Clear_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Clear_fp.h diff --git a/src/tpm2/ClockRateAdjust_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/ClockRateAdjust_fp.h similarity index 100% rename from src/tpm2/ClockRateAdjust_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/ClockRateAdjust_fp.h diff --git a/src/tpm2/ClockSet_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/ClockSet_fp.h similarity index 100% rename from src/tpm2/ClockSet_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/ClockSet_fp.h diff --git a/src/tpm2/CommandAudit_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/CommandAudit_fp.h similarity index 100% rename from src/tpm2/CommandAudit_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/CommandAudit_fp.h diff --git a/src/tpm2/CommandCodeAttributes_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/CommandCodeAttributes_fp.h similarity index 100% rename from src/tpm2/CommandCodeAttributes_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/CommandCodeAttributes_fp.h diff --git a/src/tpm2/CommandDispatcher_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/CommandDispatcher_fp.h similarity index 100% rename from src/tpm2/CommandDispatcher_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/CommandDispatcher_fp.h diff --git a/src/tpm2/Commit_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Commit_fp.h similarity index 100% rename from src/tpm2/Commit_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Commit_fp.h diff --git a/src/tpm2/ContextLoad_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/ContextLoad_fp.h similarity index 100% rename from src/tpm2/ContextLoad_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/ContextLoad_fp.h diff --git a/src/tpm2/ContextSave_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/ContextSave_fp.h similarity index 100% rename from src/tpm2/ContextSave_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/ContextSave_fp.h diff --git a/src/tpm2/Context_spt_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Context_spt_fp.h similarity index 100% rename from src/tpm2/Context_spt_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Context_spt_fp.h diff --git a/src/tpm2/CreateLoaded_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/CreateLoaded_fp.h similarity index 100% rename from src/tpm2/CreateLoaded_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/CreateLoaded_fp.h diff --git a/src/tpm2/CreatePrimary_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/CreatePrimary_fp.h similarity index 100% rename from src/tpm2/CreatePrimary_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/CreatePrimary_fp.h diff --git a/src/tpm2/Create_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Create_fp.h similarity index 100% rename from src/tpm2/Create_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Create_fp.h diff --git a/src/tpm2/crypto/CryptCmac_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/CryptCmac_fp.h similarity index 100% rename from src/tpm2/crypto/CryptCmac_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/CryptCmac_fp.h diff --git a/src/tpm2/crypto/CryptEccCrypt_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/CryptEccCrypt_fp.h similarity index 100% rename from src/tpm2/crypto/CryptEccCrypt_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/CryptEccCrypt_fp.h diff --git a/src/tpm2/crypto/CryptEccKeyExchange_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/CryptEccKeyExchange_fp.h similarity index 100% rename from src/tpm2/crypto/CryptEccKeyExchange_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/CryptEccKeyExchange_fp.h diff --git a/src/tpm2/crypto/CryptEccMain_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/CryptEccMain_fp.h similarity index 99% rename from src/tpm2/crypto/CryptEccMain_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/CryptEccMain_fp.h index e24bc6b6..99e8a816 100644 --- a/src/tpm2/crypto/CryptEccMain_fp.h +++ b/src/tpm2/TPMCmd/tpm/include/private/prototypes/CryptEccMain_fp.h @@ -67,7 +67,7 @@ #define _CRYPT_ECC_MAIN_FP_H_ #if ALG_ECC -# include "CryptRand.h" +# include //** Functions # if SIMULATION diff --git a/src/tpm2/crypto/CryptEccSignature_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/CryptEccSignature_fp.h similarity index 100% rename from src/tpm2/crypto/CryptEccSignature_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/CryptEccSignature_fp.h diff --git a/src/tpm2/crypto/CryptHash_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/CryptHash_fp.h similarity index 100% rename from src/tpm2/crypto/CryptHash_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/CryptHash_fp.h diff --git a/src/tpm2/crypto/CryptPrimeSieve_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/CryptPrimeSieve_fp.h similarity index 100% rename from src/tpm2/crypto/CryptPrimeSieve_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/CryptPrimeSieve_fp.h diff --git a/src/tpm2/crypto/CryptPrime_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/CryptPrime_fp.h similarity index 100% rename from src/tpm2/crypto/CryptPrime_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/CryptPrime_fp.h diff --git a/src/tpm2/crypto/CryptRand_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/CryptRand_fp.h similarity index 100% rename from src/tpm2/crypto/CryptRand_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/CryptRand_fp.h diff --git a/src/tpm2/crypto/CryptRsa_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/CryptRsa_fp.h similarity index 100% rename from src/tpm2/crypto/CryptRsa_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/CryptRsa_fp.h diff --git a/src/tpm2/CryptSelfTest_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/CryptSelfTest_fp.h similarity index 100% rename from src/tpm2/CryptSelfTest_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/CryptSelfTest_fp.h diff --git a/src/tpm2/crypto/CryptSmac_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/CryptSmac_fp.h similarity index 100% rename from src/tpm2/crypto/CryptSmac_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/CryptSmac_fp.h diff --git a/src/tpm2/crypto/CryptSym_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/CryptSym_fp.h similarity index 100% rename from src/tpm2/crypto/CryptSym_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/CryptSym_fp.h diff --git a/src/tpm2/crypto/CryptUtil_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/CryptUtil_fp.h similarity index 100% rename from src/tpm2/crypto/CryptUtil_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/CryptUtil_fp.h diff --git a/src/tpm2/DA_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/DA_fp.h similarity index 100% rename from src/tpm2/DA_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/DA_fp.h diff --git a/src/tpm2/DictionaryAttackLockReset_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/DictionaryAttackLockReset_fp.h similarity index 100% rename from src/tpm2/DictionaryAttackLockReset_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/DictionaryAttackLockReset_fp.h diff --git a/src/tpm2/DictionaryAttackParameters_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/DictionaryAttackParameters_fp.h similarity index 100% rename from src/tpm2/DictionaryAttackParameters_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/DictionaryAttackParameters_fp.h diff --git a/src/tpm2/Duplicate_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Duplicate_fp.h similarity index 100% rename from src/tpm2/Duplicate_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Duplicate_fp.h diff --git a/src/tpm2/crypto/ECC_Decrypt_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/ECC_Decrypt_fp.h similarity index 100% rename from src/tpm2/crypto/ECC_Decrypt_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/ECC_Decrypt_fp.h diff --git a/src/tpm2/crypto/ECC_Encrypt_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/ECC_Encrypt_fp.h similarity index 100% rename from src/tpm2/crypto/ECC_Encrypt_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/ECC_Encrypt_fp.h diff --git a/src/tpm2/ECC_Parameters_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/ECC_Parameters_fp.h similarity index 100% rename from src/tpm2/ECC_Parameters_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/ECC_Parameters_fp.h diff --git a/src/tpm2/ECDH_KeyGen_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/ECDH_KeyGen_fp.h similarity index 100% rename from src/tpm2/ECDH_KeyGen_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/ECDH_KeyGen_fp.h diff --git a/src/tpm2/ECDH_ZGen_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/ECDH_ZGen_fp.h similarity index 100% rename from src/tpm2/ECDH_ZGen_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/ECDH_ZGen_fp.h diff --git a/src/tpm2/EC_Ephemeral_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/EC_Ephemeral_fp.h similarity index 100% rename from src/tpm2/EC_Ephemeral_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/EC_Ephemeral_fp.h diff --git a/src/tpm2/EncryptDecrypt2_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/EncryptDecrypt2_fp.h similarity index 100% rename from src/tpm2/EncryptDecrypt2_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/EncryptDecrypt2_fp.h diff --git a/src/tpm2/EncryptDecrypt_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/EncryptDecrypt_fp.h similarity index 100% rename from src/tpm2/EncryptDecrypt_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/EncryptDecrypt_fp.h diff --git a/src/tpm2/EncryptDecrypt_spt_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/EncryptDecrypt_spt_fp.h similarity index 100% rename from src/tpm2/EncryptDecrypt_spt_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/EncryptDecrypt_spt_fp.h diff --git a/src/tpm2/Entity_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Entity_fp.h similarity index 100% rename from src/tpm2/Entity_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Entity_fp.h diff --git a/src/tpm2/EventSequenceComplete_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/EventSequenceComplete_fp.h similarity index 100% rename from src/tpm2/EventSequenceComplete_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/EventSequenceComplete_fp.h diff --git a/src/tpm2/EvictControl_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/EvictControl_fp.h similarity index 100% rename from src/tpm2/EvictControl_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/EvictControl_fp.h diff --git a/src/tpm2/FlushContext_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/FlushContext_fp.h similarity index 100% rename from src/tpm2/FlushContext_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/FlushContext_fp.h diff --git a/src/tpm2/GetCapability_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/GetCapability_fp.h similarity index 100% rename from src/tpm2/GetCapability_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/GetCapability_fp.h diff --git a/src/tpm2/GetCommandAuditDigest_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/GetCommandAuditDigest_fp.h similarity index 100% rename from src/tpm2/GetCommandAuditDigest_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/GetCommandAuditDigest_fp.h diff --git a/src/tpm2/GetRandom_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/GetRandom_fp.h similarity index 100% rename from src/tpm2/GetRandom_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/GetRandom_fp.h diff --git a/src/tpm2/GetSessionAuditDigest_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/GetSessionAuditDigest_fp.h similarity index 100% rename from src/tpm2/GetSessionAuditDigest_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/GetSessionAuditDigest_fp.h diff --git a/src/tpm2/GetTestResult_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/GetTestResult_fp.h similarity index 100% rename from src/tpm2/GetTestResult_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/GetTestResult_fp.h diff --git a/src/tpm2/GetTime_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/GetTime_fp.h similarity index 100% rename from src/tpm2/GetTime_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/GetTime_fp.h diff --git a/src/tpm2/HMAC_Start_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/HMAC_Start_fp.h similarity index 100% rename from src/tpm2/HMAC_Start_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/HMAC_Start_fp.h diff --git a/src/tpm2/HMAC_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/HMAC_fp.h similarity index 100% rename from src/tpm2/HMAC_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/HMAC_fp.h diff --git a/src/tpm2/Handle_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Handle_fp.h similarity index 100% rename from src/tpm2/Handle_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Handle_fp.h diff --git a/src/tpm2/HashSequenceStart_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/HashSequenceStart_fp.h similarity index 100% rename from src/tpm2/HashSequenceStart_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/HashSequenceStart_fp.h diff --git a/src/tpm2/Hash_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Hash_fp.h similarity index 100% rename from src/tpm2/Hash_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Hash_fp.h diff --git a/src/tpm2/HierarchyChangeAuth_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/HierarchyChangeAuth_fp.h similarity index 100% rename from src/tpm2/HierarchyChangeAuth_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/HierarchyChangeAuth_fp.h diff --git a/src/tpm2/HierarchyControl_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/HierarchyControl_fp.h similarity index 100% rename from src/tpm2/HierarchyControl_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/HierarchyControl_fp.h diff --git a/src/tpm2/Hierarchy_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Hierarchy_fp.h similarity index 100% rename from src/tpm2/Hierarchy_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Hierarchy_fp.h diff --git a/src/tpm2/Import_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Import_fp.h similarity index 100% rename from src/tpm2/Import_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Import_fp.h diff --git a/src/tpm2/IncrementalSelfTest_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/IncrementalSelfTest_fp.h similarity index 100% rename from src/tpm2/IncrementalSelfTest_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/IncrementalSelfTest_fp.h diff --git a/src/tpm2/IoBuffers_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/IoBuffers_fp.h similarity index 100% rename from src/tpm2/IoBuffers_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/IoBuffers_fp.h diff --git a/src/tpm2/LoadExternal_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/LoadExternal_fp.h similarity index 100% rename from src/tpm2/LoadExternal_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/LoadExternal_fp.h diff --git a/src/tpm2/Load_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Load_fp.h similarity index 100% rename from src/tpm2/Load_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Load_fp.h diff --git a/src/tpm2/Locality_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Locality_fp.h similarity index 100% rename from src/tpm2/Locality_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Locality_fp.h diff --git a/src/tpm2/MAC_Start_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/MAC_Start_fp.h similarity index 100% rename from src/tpm2/MAC_Start_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/MAC_Start_fp.h diff --git a/src/tpm2/MAC_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/MAC_fp.h similarity index 100% rename from src/tpm2/MAC_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/MAC_fp.h diff --git a/src/tpm2/MakeCredential_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/MakeCredential_fp.h similarity index 100% rename from src/tpm2/MakeCredential_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/MakeCredential_fp.h diff --git a/src/tpm2/Marshal_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Marshal_fp.h similarity index 99% rename from src/tpm2/Marshal_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Marshal_fp.h index 08686ac0..31ca655a 100644 --- a/src/tpm2/Marshal_fp.h +++ b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Marshal_fp.h @@ -62,7 +62,7 @@ #define MARSHAL_FP_H #include "Tpm.h" -#include "TpmTypes.h" +#include #ifdef __cplusplus extern "C" { diff --git a/src/tpm2/MathOnByteBuffers_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/MathOnByteBuffers_fp.h similarity index 100% rename from src/tpm2/MathOnByteBuffers_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/MathOnByteBuffers_fp.h diff --git a/src/tpm2/Memory_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Memory_fp.h similarity index 100% rename from src/tpm2/Memory_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Memory_fp.h diff --git a/src/tpm2/NV_Certify_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_Certify_fp.h similarity index 100% rename from src/tpm2/NV_Certify_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_Certify_fp.h diff --git a/src/tpm2/NV_ChangeAuth_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_ChangeAuth_fp.h similarity index 100% rename from src/tpm2/NV_ChangeAuth_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_ChangeAuth_fp.h diff --git a/src/tpm2/NV_DefineSpace2_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_DefineSpace2_fp.h similarity index 100% rename from src/tpm2/NV_DefineSpace2_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_DefineSpace2_fp.h diff --git a/src/tpm2/NV_DefineSpace_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_DefineSpace_fp.h similarity index 100% rename from src/tpm2/NV_DefineSpace_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_DefineSpace_fp.h diff --git a/src/tpm2/NV_Extend_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_Extend_fp.h similarity index 100% rename from src/tpm2/NV_Extend_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_Extend_fp.h diff --git a/src/tpm2/NV_GlobalWriteLock_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_GlobalWriteLock_fp.h similarity index 100% rename from src/tpm2/NV_GlobalWriteLock_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_GlobalWriteLock_fp.h diff --git a/src/tpm2/NV_Increment_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_Increment_fp.h similarity index 100% rename from src/tpm2/NV_Increment_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_Increment_fp.h diff --git a/src/tpm2/NV_ReadLock_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_ReadLock_fp.h similarity index 100% rename from src/tpm2/NV_ReadLock_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_ReadLock_fp.h diff --git a/src/tpm2/NV_ReadPublic2_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_ReadPublic2_fp.h similarity index 100% rename from src/tpm2/NV_ReadPublic2_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_ReadPublic2_fp.h diff --git a/src/tpm2/NV_ReadPublic_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_ReadPublic_fp.h similarity index 100% rename from src/tpm2/NV_ReadPublic_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_ReadPublic_fp.h diff --git a/src/tpm2/NV_Read_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_Read_fp.h similarity index 100% rename from src/tpm2/NV_Read_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_Read_fp.h diff --git a/src/tpm2/NV_SetBits_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_SetBits_fp.h similarity index 100% rename from src/tpm2/NV_SetBits_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_SetBits_fp.h diff --git a/src/tpm2/NV_UndefineSpaceSpecial_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_UndefineSpaceSpecial_fp.h similarity index 100% rename from src/tpm2/NV_UndefineSpaceSpecial_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_UndefineSpaceSpecial_fp.h diff --git a/src/tpm2/NV_UndefineSpace_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_UndefineSpace_fp.h similarity index 100% rename from src/tpm2/NV_UndefineSpace_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_UndefineSpace_fp.h diff --git a/src/tpm2/NV_WriteLock_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_WriteLock_fp.h similarity index 100% rename from src/tpm2/NV_WriteLock_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_WriteLock_fp.h diff --git a/src/tpm2/NV_Write_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_Write_fp.h similarity index 100% rename from src/tpm2/NV_Write_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_Write_fp.h diff --git a/src/tpm2/NV_spt_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_spt_fp.h similarity index 100% rename from src/tpm2/NV_spt_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/NV_spt_fp.h diff --git a/src/tpm2/NvDynamic_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/NvDynamic_fp.h similarity index 100% rename from src/tpm2/NvDynamic_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/NvDynamic_fp.h diff --git a/src/tpm2/NvReserved_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/NvReserved_fp.h similarity index 100% rename from src/tpm2/NvReserved_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/NvReserved_fp.h diff --git a/src/tpm2/ObjectChangeAuth_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/ObjectChangeAuth_fp.h similarity index 100% rename from src/tpm2/ObjectChangeAuth_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/ObjectChangeAuth_fp.h diff --git a/src/tpm2/Object_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Object_fp.h similarity index 100% rename from src/tpm2/Object_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Object_fp.h diff --git a/src/tpm2/Object_spt_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Object_spt_fp.h similarity index 100% rename from src/tpm2/Object_spt_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Object_spt_fp.h diff --git a/src/tpm2/PCR_Allocate_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PCR_Allocate_fp.h similarity index 100% rename from src/tpm2/PCR_Allocate_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PCR_Allocate_fp.h diff --git a/src/tpm2/PCR_Event_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PCR_Event_fp.h similarity index 100% rename from src/tpm2/PCR_Event_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PCR_Event_fp.h diff --git a/src/tpm2/PCR_Extend_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PCR_Extend_fp.h similarity index 100% rename from src/tpm2/PCR_Extend_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PCR_Extend_fp.h diff --git a/src/tpm2/PCR_Read_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PCR_Read_fp.h similarity index 100% rename from src/tpm2/PCR_Read_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PCR_Read_fp.h diff --git a/src/tpm2/PCR_Reset_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PCR_Reset_fp.h similarity index 100% rename from src/tpm2/PCR_Reset_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PCR_Reset_fp.h diff --git a/src/tpm2/PCR_SetAuthPolicy_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PCR_SetAuthPolicy_fp.h similarity index 100% rename from src/tpm2/PCR_SetAuthPolicy_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PCR_SetAuthPolicy_fp.h diff --git a/src/tpm2/PCR_SetAuthValue_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PCR_SetAuthValue_fp.h similarity index 100% rename from src/tpm2/PCR_SetAuthValue_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PCR_SetAuthValue_fp.h diff --git a/src/tpm2/PCR_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PCR_fp.h similarity index 100% rename from src/tpm2/PCR_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PCR_fp.h diff --git a/src/tpm2/PP_Commands_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PP_Commands_fp.h similarity index 100% rename from src/tpm2/PP_Commands_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PP_Commands_fp.h diff --git a/src/tpm2/PP_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PP_fp.h similarity index 100% rename from src/tpm2/PP_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PP_fp.h diff --git a/src/tpm2/PolicyAuthValue_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyAuthValue_fp.h similarity index 100% rename from src/tpm2/PolicyAuthValue_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyAuthValue_fp.h diff --git a/src/tpm2/PolicyAuthorizeNV_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyAuthorizeNV_fp.h similarity index 100% rename from src/tpm2/PolicyAuthorizeNV_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyAuthorizeNV_fp.h diff --git a/src/tpm2/PolicyAuthorize_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyAuthorize_fp.h similarity index 100% rename from src/tpm2/PolicyAuthorize_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyAuthorize_fp.h diff --git a/src/tpm2/PolicyCapability_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyCapability_fp.h similarity index 100% rename from src/tpm2/PolicyCapability_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyCapability_fp.h diff --git a/src/tpm2/PolicyCommandCode_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyCommandCode_fp.h similarity index 100% rename from src/tpm2/PolicyCommandCode_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyCommandCode_fp.h diff --git a/src/tpm2/PolicyCounterTimer_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyCounterTimer_fp.h similarity index 100% rename from src/tpm2/PolicyCounterTimer_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyCounterTimer_fp.h diff --git a/src/tpm2/PolicyCpHash_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyCpHash_fp.h similarity index 100% rename from src/tpm2/PolicyCpHash_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyCpHash_fp.h diff --git a/src/tpm2/PolicyDuplicationSelect_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyDuplicationSelect_fp.h similarity index 100% rename from src/tpm2/PolicyDuplicationSelect_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyDuplicationSelect_fp.h diff --git a/src/tpm2/PolicyGetDigest_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyGetDigest_fp.h similarity index 100% rename from src/tpm2/PolicyGetDigest_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyGetDigest_fp.h diff --git a/src/tpm2/PolicyLocality_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyLocality_fp.h similarity index 100% rename from src/tpm2/PolicyLocality_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyLocality_fp.h diff --git a/src/tpm2/PolicyNV_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyNV_fp.h similarity index 100% rename from src/tpm2/PolicyNV_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyNV_fp.h diff --git a/src/tpm2/PolicyNameHash_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyNameHash_fp.h similarity index 100% rename from src/tpm2/PolicyNameHash_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyNameHash_fp.h diff --git a/src/tpm2/PolicyNvWritten_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyNvWritten_fp.h similarity index 100% rename from src/tpm2/PolicyNvWritten_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyNvWritten_fp.h diff --git a/src/tpm2/PolicyOR_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyOR_fp.h similarity index 100% rename from src/tpm2/PolicyOR_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyOR_fp.h diff --git a/src/tpm2/PolicyPCR_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyPCR_fp.h similarity index 100% rename from src/tpm2/PolicyPCR_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyPCR_fp.h diff --git a/src/tpm2/PolicyParameters_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyParameters_fp.h similarity index 100% rename from src/tpm2/PolicyParameters_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyParameters_fp.h diff --git a/src/tpm2/PolicyPassword_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyPassword_fp.h similarity index 100% rename from src/tpm2/PolicyPassword_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyPassword_fp.h diff --git a/src/tpm2/PolicyPhysicalPresence_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyPhysicalPresence_fp.h similarity index 100% rename from src/tpm2/PolicyPhysicalPresence_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyPhysicalPresence_fp.h diff --git a/src/tpm2/PolicyRestart_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyRestart_fp.h similarity index 100% rename from src/tpm2/PolicyRestart_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyRestart_fp.h diff --git a/src/tpm2/PolicySecret_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicySecret_fp.h similarity index 100% rename from src/tpm2/PolicySecret_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicySecret_fp.h diff --git a/src/tpm2/PolicySigned_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicySigned_fp.h similarity index 100% rename from src/tpm2/PolicySigned_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicySigned_fp.h diff --git a/src/tpm2/PolicyTemplate_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyTemplate_fp.h similarity index 100% rename from src/tpm2/PolicyTemplate_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyTemplate_fp.h diff --git a/src/tpm2/PolicyTicket_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyTicket_fp.h similarity index 100% rename from src/tpm2/PolicyTicket_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyTicket_fp.h diff --git a/src/tpm2/PolicyTransportSPDM_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyTransportSPDM_fp.h similarity index 100% rename from src/tpm2/PolicyTransportSPDM_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PolicyTransportSPDM_fp.h diff --git a/src/tpm2/Policy_spt_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Policy_spt_fp.h similarity index 100% rename from src/tpm2/Policy_spt_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Policy_spt_fp.h diff --git a/src/tpm2/Power_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Power_fp.h similarity index 100% rename from src/tpm2/Power_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Power_fp.h diff --git a/src/tpm2/PropertyCap_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/PropertyCap_fp.h similarity index 100% rename from src/tpm2/PropertyCap_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/PropertyCap_fp.h diff --git a/src/tpm2/Quote_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Quote_fp.h similarity index 100% rename from src/tpm2/Quote_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Quote_fp.h diff --git a/src/tpm2/RSA_Decrypt_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/RSA_Decrypt_fp.h similarity index 100% rename from src/tpm2/RSA_Decrypt_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/RSA_Decrypt_fp.h diff --git a/src/tpm2/RSA_Encrypt_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/RSA_Encrypt_fp.h similarity index 100% rename from src/tpm2/RSA_Encrypt_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/RSA_Encrypt_fp.h diff --git a/src/tpm2/ReadClock_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/ReadClock_fp.h similarity index 100% rename from src/tpm2/ReadClock_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/ReadClock_fp.h diff --git a/src/tpm2/ReadOnlyControl_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/ReadOnlyControl_fp.h similarity index 100% rename from src/tpm2/ReadOnlyControl_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/ReadOnlyControl_fp.h diff --git a/src/tpm2/ReadPublic_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/ReadPublic_fp.h similarity index 100% rename from src/tpm2/ReadPublic_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/ReadPublic_fp.h diff --git a/src/tpm2/ResponseCodeProcessing_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/ResponseCodeProcessing_fp.h similarity index 100% rename from src/tpm2/ResponseCodeProcessing_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/ResponseCodeProcessing_fp.h diff --git a/src/tpm2/Response_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Response_fp.h similarity index 100% rename from src/tpm2/Response_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Response_fp.h diff --git a/src/tpm2/Rewrap_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Rewrap_fp.h similarity index 100% rename from src/tpm2/Rewrap_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Rewrap_fp.h diff --git a/src/tpm2/SecChannel_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/SecChannel_fp.h similarity index 100% rename from src/tpm2/SecChannel_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/SecChannel_fp.h diff --git a/src/tpm2/SelfTest_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/SelfTest_fp.h similarity index 100% rename from src/tpm2/SelfTest_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/SelfTest_fp.h diff --git a/src/tpm2/SequenceComplete_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/SequenceComplete_fp.h similarity index 100% rename from src/tpm2/SequenceComplete_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/SequenceComplete_fp.h diff --git a/src/tpm2/SequenceUpdate_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/SequenceUpdate_fp.h similarity index 100% rename from src/tpm2/SequenceUpdate_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/SequenceUpdate_fp.h diff --git a/src/tpm2/SessionProcess_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/SessionProcess_fp.h similarity index 100% rename from src/tpm2/SessionProcess_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/SessionProcess_fp.h diff --git a/src/tpm2/Session_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Session_fp.h similarity index 100% rename from src/tpm2/Session_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Session_fp.h diff --git a/src/tpm2/SetAlgorithmSet_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/SetAlgorithmSet_fp.h similarity index 100% rename from src/tpm2/SetAlgorithmSet_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/SetAlgorithmSet_fp.h diff --git a/src/tpm2/SetCapability_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/SetCapability_fp.h similarity index 100% rename from src/tpm2/SetCapability_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/SetCapability_fp.h diff --git a/src/tpm2/SetCommandCodeAuditStatus_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/SetCommandCodeAuditStatus_fp.h similarity index 100% rename from src/tpm2/SetCommandCodeAuditStatus_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/SetCommandCodeAuditStatus_fp.h diff --git a/src/tpm2/SetPrimaryPolicy_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/SetPrimaryPolicy_fp.h similarity index 100% rename from src/tpm2/SetPrimaryPolicy_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/SetPrimaryPolicy_fp.h diff --git a/src/tpm2/Shutdown_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Shutdown_fp.h similarity index 100% rename from src/tpm2/Shutdown_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Shutdown_fp.h diff --git a/src/tpm2/Sign_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Sign_fp.h similarity index 100% rename from src/tpm2/Sign_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Sign_fp.h diff --git a/src/tpm2/StartAuthSession_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/StartAuthSession_fp.h similarity index 100% rename from src/tpm2/StartAuthSession_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/StartAuthSession_fp.h diff --git a/src/tpm2/Startup_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Startup_fp.h similarity index 100% rename from src/tpm2/Startup_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Startup_fp.h diff --git a/src/tpm2/StirRandom_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/StirRandom_fp.h similarity index 100% rename from src/tpm2/StirRandom_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/StirRandom_fp.h diff --git a/src/tpm2/TestParms_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/TestParms_fp.h similarity index 100% rename from src/tpm2/TestParms_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/TestParms_fp.h diff --git a/src/tpm2/Ticket_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Ticket_fp.h similarity index 100% rename from src/tpm2/Ticket_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Ticket_fp.h diff --git a/src/tpm2/Time_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Time_fp.h similarity index 100% rename from src/tpm2/Time_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Time_fp.h diff --git a/src/tpm2/TpmASN1_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/TpmASN1_fp.h similarity index 100% rename from src/tpm2/TpmASN1_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/TpmASN1_fp.h diff --git a/src/tpm2/TpmEcc_Signature_ECDAA_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/TpmEcc_Signature_ECDAA_fp.h similarity index 100% rename from src/tpm2/TpmEcc_Signature_ECDAA_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/TpmEcc_Signature_ECDAA_fp.h diff --git a/src/tpm2/TpmEcc_Signature_ECDSA_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/TpmEcc_Signature_ECDSA_fp.h similarity index 97% rename from src/tpm2/TpmEcc_Signature_ECDSA_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/TpmEcc_Signature_ECDSA_fp.h index ff1f0115..b7407a43 100644 --- a/src/tpm2/TpmEcc_Signature_ECDSA_fp.h +++ b/src/tpm2/TPMCmd/tpm/include/private/prototypes/TpmEcc_Signature_ECDSA_fp.h @@ -4,7 +4,7 @@ #define _TPMECC_SIGNATURE_ECDSA_FP_H_ #if ALG_ECC && ALG_ECDSA -# include "CryptRand.h" +# include //*** TpmEcc_SignEcdsa() // This function implements the ECDSA signing algorithm. The method is described diff --git a/src/tpm2/TpmEcc_Signature_SM2_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/TpmEcc_Signature_SM2_fp.h similarity index 100% rename from src/tpm2/TpmEcc_Signature_SM2_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/TpmEcc_Signature_SM2_fp.h diff --git a/src/tpm2/TpmEcc_Signature_Schnorr_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/TpmEcc_Signature_Schnorr_fp.h similarity index 100% rename from src/tpm2/TpmEcc_Signature_Schnorr_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/TpmEcc_Signature_Schnorr_fp.h diff --git a/src/tpm2/TpmEcc_Signature_Util_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/TpmEcc_Signature_Util_fp.h similarity index 100% rename from src/tpm2/TpmEcc_Signature_Util_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/TpmEcc_Signature_Util_fp.h diff --git a/src/tpm2/TpmEcc_Util_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/TpmEcc_Util_fp.h similarity index 100% rename from src/tpm2/TpmEcc_Util_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/TpmEcc_Util_fp.h diff --git a/src/tpm2/TpmMath_Debug_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/TpmMath_Debug_fp.h similarity index 100% rename from src/tpm2/TpmMath_Debug_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/TpmMath_Debug_fp.h diff --git a/src/tpm2/TpmMath_Util_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/TpmMath_Util_fp.h similarity index 100% rename from src/tpm2/TpmMath_Util_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/TpmMath_Util_fp.h diff --git a/src/tpm2/TpmSizeChecks_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/TpmSizeChecks_fp.h similarity index 100% rename from src/tpm2/TpmSizeChecks_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/TpmSizeChecks_fp.h diff --git a/src/tpm2/Unseal_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/Unseal_fp.h similarity index 100% rename from src/tpm2/Unseal_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/Unseal_fp.h diff --git a/src/tpm2/VerifySignature_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/VerifySignature_fp.h similarity index 100% rename from src/tpm2/VerifySignature_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/VerifySignature_fp.h diff --git a/src/tpm2/X509_ECC_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/X509_ECC_fp.h similarity index 100% rename from src/tpm2/X509_ECC_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/X509_ECC_fp.h diff --git a/src/tpm2/X509_RSA_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/X509_RSA_fp.h similarity index 100% rename from src/tpm2/X509_RSA_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/X509_RSA_fp.h diff --git a/src/tpm2/X509_spt_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/X509_spt_fp.h similarity index 100% rename from src/tpm2/X509_spt_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/X509_spt_fp.h diff --git a/src/tpm2/ZGen_2Phase_fp.h b/src/tpm2/TPMCmd/tpm/include/private/prototypes/ZGen_2Phase_fp.h similarity index 100% rename from src/tpm2/ZGen_2Phase_fp.h rename to src/tpm2/TPMCmd/tpm/include/private/prototypes/ZGen_2Phase_fp.h diff --git a/src/tpm2/ACT.h b/src/tpm2/TPMCmd/tpm/include/tpm_public/ACT.h similarity index 99% rename from src/tpm2/ACT.h rename to src/tpm2/TPMCmd/tpm/include/tpm_public/ACT.h index 2e75f28c..5523b944 100644 --- a/src/tpm2/ACT.h +++ b/src/tpm2/TPMCmd/tpm/include/tpm_public/ACT.h @@ -3,7 +3,7 @@ #ifndef _ACT_H_ #define _ACT_H_ -#include "TpmProfile.h" +#include #if 0 // libtpms added #if ACT_SUPPORT \ diff --git a/src/tpm2/BaseTypes.h b/src/tpm2/TPMCmd/tpm/include/tpm_public/BaseTypes.h similarity index 100% rename from src/tpm2/BaseTypes.h rename to src/tpm2/TPMCmd/tpm/include/tpm_public/BaseTypes.h diff --git a/src/tpm2/Capabilities.h b/src/tpm2/TPMCmd/tpm/include/tpm_public/Capabilities.h similarity index 100% rename from src/tpm2/Capabilities.h rename to src/tpm2/TPMCmd/tpm/include/tpm_public/Capabilities.h diff --git a/src/tpm2/CompilerDependencies.h b/src/tpm2/TPMCmd/tpm/include/tpm_public/CompilerDependencies.h similarity index 100% rename from src/tpm2/CompilerDependencies.h rename to src/tpm2/TPMCmd/tpm/include/tpm_public/CompilerDependencies.h diff --git a/src/tpm2/CompilerDependencies_gcc.h b/src/tpm2/TPMCmd/tpm/include/tpm_public/CompilerDependencies_gcc.h similarity index 100% rename from src/tpm2/CompilerDependencies_gcc.h rename to src/tpm2/TPMCmd/tpm/include/tpm_public/CompilerDependencies_gcc.h diff --git a/src/tpm2/CompilerDependencies_msvc.h b/src/tpm2/TPMCmd/tpm/include/tpm_public/CompilerDependencies_msvc.h similarity index 100% rename from src/tpm2/CompilerDependencies_msvc.h rename to src/tpm2/TPMCmd/tpm/include/tpm_public/CompilerDependencies_msvc.h diff --git a/src/tpm2/GpMacros.h b/src/tpm2/TPMCmd/tpm/include/tpm_public/GpMacros.h similarity index 99% rename from src/tpm2/GpMacros.h rename to src/tpm2/TPMCmd/tpm/include/tpm_public/GpMacros.h index c721fc31..38b361bd 100644 --- a/src/tpm2/GpMacros.h +++ b/src/tpm2/TPMCmd/tpm/include/tpm_public/GpMacros.h @@ -11,7 +11,8 @@ #endif #include "endian_swap.h" -#include "TpmFail_fp.h" +#include +#include //** For Self-test // These macros are used in CryptUtil to invoke the incremental self test. @@ -435,6 +436,6 @@ // and that is a UINT64. So, this is an invariant value #define CONTEXT_COUNTER UINT64 -#include "TpmCalculatedAttributes.h" +#include "tpm_public/TpmCalculatedAttributes.h" #endif // GP_MACROS_H diff --git a/src/tpm2/MinMax.h b/src/tpm2/TPMCmd/tpm/include/tpm_public/MinMax.h similarity index 100% rename from src/tpm2/MinMax.h rename to src/tpm2/TPMCmd/tpm/include/tpm_public/MinMax.h diff --git a/src/tpm2/TPMB.h b/src/tpm2/TPMCmd/tpm/include/tpm_public/TPMB.h similarity index 97% rename from src/tpm2/TPMB.h rename to src/tpm2/TPMCmd/tpm/include/tpm_public/TPMB.h index 03710885..fdc570a9 100644 --- a/src/tpm2/TPMB.h +++ b/src/tpm2/TPMCmd/tpm/include/tpm_public/TPMB.h @@ -7,7 +7,7 @@ #ifndef _TPMB_H #define _TPMB_H -#include "BaseTypes.h" +#include //*** Size Types // These types are used to differentiate the two different size values used. diff --git a/src/tpm2/TpmAlgorithmDefines.h b/src/tpm2/TPMCmd/tpm/include/tpm_public/TpmAlgorithmDefines.h similarity index 99% rename from src/tpm2/TpmAlgorithmDefines.h rename to src/tpm2/TPMCmd/tpm/include/tpm_public/TpmAlgorithmDefines.h index f1d31163..1dfab9ea 100644 --- a/src/tpm2/TpmAlgorithmDefines.h +++ b/src/tpm2/TPMCmd/tpm/include/tpm_public/TpmAlgorithmDefines.h @@ -6,9 +6,9 @@ #ifndef _TPM_INCLUDE_PRIVATE_TPMALGORITHMDEFINES_H_ #define _TPM_INCLUDE_PRIVATE_TPMALGORITHMDEFINES_H_ -#include "TpmProfile.h" -#include "MinMax.h" -#include "TPMB.h" +#include +#include "tpm_public/MinMax.h" +#include "tpm_public/TPMB.h" #if ALG_ECC // Table "Defines for NIST_P192 ECC Values" (TCG Algorithm Registry) diff --git a/src/tpm2/TpmCalculatedAttributes.h b/src/tpm2/TPMCmd/tpm/include/tpm_public/TpmCalculatedAttributes.h similarity index 99% rename from src/tpm2/TpmCalculatedAttributes.h rename to src/tpm2/TPMCmd/tpm/include/tpm_public/TpmCalculatedAttributes.h index e50336d7..e1b7eac5 100644 --- a/src/tpm2/TpmCalculatedAttributes.h +++ b/src/tpm2/TPMCmd/tpm/include/tpm_public/TpmCalculatedAttributes.h @@ -61,8 +61,8 @@ #ifndef _TPM_CALCULATED_ATTRIBUTES_H_ #define _TPM_CALCULATED_ATTRIBUTES_H_ -#include "TpmAlgorithmDefines.h" -#include "GpMacros.h" +#include "tpm_public/TpmAlgorithmDefines.h" +#include "tpm_public/GpMacros.h" #define JOIN(x, y) x##y #define JOIN3(x, y, z) x##y##z diff --git a/src/tpm2/TpmTypes.h b/src/tpm2/TPMCmd/tpm/include/tpm_public/TpmTypes.h similarity index 99% rename from src/tpm2/TpmTypes.h rename to src/tpm2/TPMCmd/tpm/include/tpm_public/TpmTypes.h index f1aceb41..c7958395 100644 --- a/src/tpm2/TpmTypes.h +++ b/src/tpm2/TPMCmd/tpm/include/tpm_public/TpmTypes.h @@ -9,10 +9,10 @@ #ifndef MAX_CAP_BUFFER # error MAX_CAP_BUFFER must be defined before this file so it can calculate maximum capability sizes #endif -#include "Capabilities.h" -#include "TpmAlgorithmDefines.h" -#include "TpmCalculatedAttributes.h" -#include "GpMacros.h" +#include "tpm_public/Capabilities.h" +#include "tpm_public/TpmAlgorithmDefines.h" +#include "tpm_public/TpmCalculatedAttributes.h" +#include "tpm_public/GpMacros.h" // Table "Definition of Types for Documentation Clarity" (Part 2: Structures) typedef UINT32 TPM_ALGORITHM_ID; diff --git a/src/tpm2/VerifyConfiguration.h b/src/tpm2/TPMCmd/tpm/include/tpm_public/VerifyConfiguration.h similarity index 100% rename from src/tpm2/VerifyConfiguration.h rename to src/tpm2/TPMCmd/tpm/include/tpm_public/VerifyConfiguration.h diff --git a/src/tpm2/endian_swap.h b/src/tpm2/TPMCmd/tpm/include/tpm_public/endian_swap.h similarity index 100% rename from src/tpm2/endian_swap.h rename to src/tpm2/TPMCmd/tpm/include/tpm_public/endian_swap.h diff --git a/src/tpm2/TpmFail_fp.h b/src/tpm2/TPMCmd/tpm/include/tpm_public/prototypes/TpmFail_fp.h similarity index 100% rename from src/tpm2/TpmFail_fp.h rename to src/tpm2/TPMCmd/tpm/include/tpm_public/prototypes/TpmFail_fp.h diff --git a/src/tpm2/tpm_debug.h b/src/tpm2/TPMCmd/tpm/include/tpm_public/tpm_debug.h similarity index 97% rename from src/tpm2/tpm_debug.h rename to src/tpm2/TPMCmd/tpm/include/tpm_public/tpm_debug.h index 0f175ff4..00946389 100644 --- a/src/tpm2/tpm_debug.h +++ b/src/tpm2/TPMCmd/tpm/include/tpm_public/tpm_debug.h @@ -3,7 +3,7 @@ #ifndef _TPM_DEBUG_H_ #define _TPM_DEBUG_H_ -#include "tpm_to_platform_interface.h" +#include // Basic Debug Printing #if ENABLE_TPM_DEBUG_PRINT diff --git a/src/tpm2/TPMCmd/tpm/include/tpm_public/tpm_public.h b/src/tpm2/TPMCmd/tpm/include/tpm_public/tpm_public.h new file mode 100644 index 00000000..27d534f5 --- /dev/null +++ b/src/tpm2/TPMCmd/tpm/include/tpm_public/tpm_public.h @@ -0,0 +1,15 @@ +// SPDX-License-Identifier: BSD-2-Clause + +#include +#include + +// public refers to the TPM_CoreLib public headers +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/src/tpm2/crypto/openssl/tpm_radix.h b/src/tpm2/TPMCmd/tpm/include/tpm_public/tpm_radix.h similarity index 100% rename from src/tpm2/crypto/openssl/tpm_radix.h rename to src/tpm2/TPMCmd/tpm/include/tpm_public/tpm_radix.h diff --git a/src/tpm2/TpmASN1.c b/src/tpm2/TPMCmd/tpm/src/X509/TpmASN1.c similarity index 100% rename from src/tpm2/TpmASN1.c rename to src/tpm2/TPMCmd/tpm/src/X509/TpmASN1.c diff --git a/src/tpm2/X509_ECC.c b/src/tpm2/TPMCmd/tpm/src/X509/X509_ECC.c similarity index 100% rename from src/tpm2/X509_ECC.c rename to src/tpm2/TPMCmd/tpm/src/X509/X509_ECC.c diff --git a/src/tpm2/X509_RSA.c b/src/tpm2/TPMCmd/tpm/src/X509/X509_RSA.c similarity index 100% rename from src/tpm2/X509_RSA.c rename to src/tpm2/TPMCmd/tpm/src/X509/X509_RSA.c diff --git a/src/tpm2/X509_spt.c b/src/tpm2/TPMCmd/tpm/src/X509/X509_spt.c similarity index 100% rename from src/tpm2/X509_spt.c rename to src/tpm2/TPMCmd/tpm/src/X509/X509_spt.c diff --git a/src/tpm2/Attest_spt.c b/src/tpm2/TPMCmd/tpm/src/command/Attestation/Attest_spt.c similarity index 100% rename from src/tpm2/Attest_spt.c rename to src/tpm2/TPMCmd/tpm/src/command/Attestation/Attest_spt.c diff --git a/src/tpm2/Quote.c b/src/tpm2/TPMCmd/tpm/src/command/Attestation/Quote.c similarity index 100% rename from src/tpm2/Quote.c rename to src/tpm2/TPMCmd/tpm/src/command/Attestation/Quote.c diff --git a/src/tpm2/ACT_spt.c b/src/tpm2/TPMCmd/tpm/src/command/ClockTimer/ACT_spt.c similarity index 99% rename from src/tpm2/ACT_spt.c rename to src/tpm2/TPMCmd/tpm/src/command/ClockTimer/ACT_spt.c index be0262b4..c3bcef07 100644 --- a/src/tpm2/ACT_spt.c +++ b/src/tpm2/TPMCmd/tpm/src/command/ClockTimer/ACT_spt.c @@ -71,7 +71,7 @@ #include "Tpm.h" #include "ACT_spt_fp.h" // TODO_RENAME_INC_FOLDER:platform_interface refers to the TPM_CoreLib platform interface -#include "tpm_to_platform_interface.h" +#include //** Functions diff --git a/src/tpm2/Context_spt.c b/src/tpm2/TPMCmd/tpm/src/command/Context/Context_spt.c similarity index 100% rename from src/tpm2/Context_spt.c rename to src/tpm2/TPMCmd/tpm/src/command/Context/Context_spt.c diff --git a/src/tpm2/Duplicate.c b/src/tpm2/TPMCmd/tpm/src/command/Duplication/Duplicate.c similarity index 100% rename from src/tpm2/Duplicate.c rename to src/tpm2/TPMCmd/tpm/src/command/Duplication/Duplicate.c diff --git a/src/tpm2/Import.c b/src/tpm2/TPMCmd/tpm/src/command/Duplication/Import.c similarity index 100% rename from src/tpm2/Import.c rename to src/tpm2/TPMCmd/tpm/src/command/Duplication/Import.c diff --git a/src/tpm2/PolicyAuthorize.c b/src/tpm2/TPMCmd/tpm/src/command/EA/PolicyAuthorize.c similarity index 100% rename from src/tpm2/PolicyAuthorize.c rename to src/tpm2/TPMCmd/tpm/src/command/EA/PolicyAuthorize.c diff --git a/src/tpm2/PolicyAuthorizeNV.c b/src/tpm2/TPMCmd/tpm/src/command/EA/PolicyAuthorizeNV.c similarity index 100% rename from src/tpm2/PolicyAuthorizeNV.c rename to src/tpm2/TPMCmd/tpm/src/command/EA/PolicyAuthorizeNV.c diff --git a/src/tpm2/PolicyPCR.c b/src/tpm2/TPMCmd/tpm/src/command/EA/PolicyPCR.c similarity index 100% rename from src/tpm2/PolicyPCR.c rename to src/tpm2/TPMCmd/tpm/src/command/EA/PolicyPCR.c diff --git a/src/tpm2/PolicySecret.c b/src/tpm2/TPMCmd/tpm/src/command/EA/PolicySecret.c similarity index 100% rename from src/tpm2/PolicySecret.c rename to src/tpm2/TPMCmd/tpm/src/command/EA/PolicySecret.c diff --git a/src/tpm2/PolicySigned.c b/src/tpm2/TPMCmd/tpm/src/command/EA/PolicySigned.c similarity index 100% rename from src/tpm2/PolicySigned.c rename to src/tpm2/TPMCmd/tpm/src/command/EA/PolicySigned.c diff --git a/src/tpm2/PolicyTicket.c b/src/tpm2/TPMCmd/tpm/src/command/EA/PolicyTicket.c similarity index 100% rename from src/tpm2/PolicyTicket.c rename to src/tpm2/TPMCmd/tpm/src/command/EA/PolicyTicket.c diff --git a/src/tpm2/PolicyTransportSPDM.c b/src/tpm2/TPMCmd/tpm/src/command/EA/PolicyTransportSPDM.c similarity index 100% rename from src/tpm2/PolicyTransportSPDM.c rename to src/tpm2/TPMCmd/tpm/src/command/EA/PolicyTransportSPDM.c diff --git a/src/tpm2/Policy_spt.c b/src/tpm2/TPMCmd/tpm/src/command/EA/Policy_spt.c similarity index 100% rename from src/tpm2/Policy_spt.c rename to src/tpm2/TPMCmd/tpm/src/command/EA/Policy_spt.c diff --git a/src/tpm2/CreatePrimary.c b/src/tpm2/TPMCmd/tpm/src/command/Hierarchy/CreatePrimary.c similarity index 100% rename from src/tpm2/CreatePrimary.c rename to src/tpm2/TPMCmd/tpm/src/command/Hierarchy/CreatePrimary.c diff --git a/src/tpm2/ReadOnlyControl.c b/src/tpm2/TPMCmd/tpm/src/command/Hierarchy/ReadOnlyControl.c similarity index 100% rename from src/tpm2/ReadOnlyControl.c rename to src/tpm2/TPMCmd/tpm/src/command/Hierarchy/ReadOnlyControl.c diff --git a/src/tpm2/NV_Read.c b/src/tpm2/TPMCmd/tpm/src/command/NVStorage/NV_Read.c similarity index 97% rename from src/tpm2/NV_Read.c rename to src/tpm2/TPMCmd/tpm/src/command/NVStorage/NV_Read.c index e72c8ea8..aad4bb9c 100644 --- a/src/tpm2/NV_Read.c +++ b/src/tpm2/TPMCmd/tpm/src/command/NVStorage/NV_Read.c @@ -2,7 +2,7 @@ #include "Tpm.h" #include "NV_Read_fp.h" -#include "platform_virtual_nv_fp.h" +#include #if CC_NV_Read // Conditional expansion of this file diff --git a/src/tpm2/NV_ReadPublic.c b/src/tpm2/TPMCmd/tpm/src/command/NVStorage/NV_ReadPublic.c similarity index 94% rename from src/tpm2/NV_ReadPublic.c rename to src/tpm2/TPMCmd/tpm/src/command/NVStorage/NV_ReadPublic.c index 48e15e9a..27fc61e0 100644 --- a/src/tpm2/NV_ReadPublic.c +++ b/src/tpm2/TPMCmd/tpm/src/command/NVStorage/NV_ReadPublic.c @@ -2,7 +2,7 @@ #include "Tpm.h" #include "NV_ReadPublic_fp.h" -#include "platform_virtual_nv_fp.h" +#include #if CC_NV_ReadPublic // Conditional expansion of this file diff --git a/src/tpm2/NV_ReadPublic2.c b/src/tpm2/TPMCmd/tpm/src/command/NVStorage/NV_ReadPublic2.c similarity index 95% rename from src/tpm2/NV_ReadPublic2.c rename to src/tpm2/TPMCmd/tpm/src/command/NVStorage/NV_ReadPublic2.c index b6de7efd..b47b2613 100644 --- a/src/tpm2/NV_ReadPublic2.c +++ b/src/tpm2/TPMCmd/tpm/src/command/NVStorage/NV_ReadPublic2.c @@ -3,7 +3,7 @@ #include "Tpm.h" #include "NV_ReadPublic2_fp.h" #include "NV_DefineSpace_fp.h" // for the RC modifiers -#include "platform_virtual_nv_fp.h" +#include #if CC_NV_ReadPublic2 // Conditional expansion of this file diff --git a/src/tpm2/NV_spt.c b/src/tpm2/TPMCmd/tpm/src/command/NVStorage/NV_spt.c similarity index 100% rename from src/tpm2/NV_spt.c rename to src/tpm2/TPMCmd/tpm/src/command/NVStorage/NV_spt.c diff --git a/src/tpm2/Create.c b/src/tpm2/TPMCmd/tpm/src/command/Object/Create.c similarity index 100% rename from src/tpm2/Create.c rename to src/tpm2/TPMCmd/tpm/src/command/Object/Create.c diff --git a/src/tpm2/CreateLoaded.c b/src/tpm2/TPMCmd/tpm/src/command/Object/CreateLoaded.c similarity index 100% rename from src/tpm2/CreateLoaded.c rename to src/tpm2/TPMCmd/tpm/src/command/Object/CreateLoaded.c diff --git a/src/tpm2/MakeCredential.c b/src/tpm2/TPMCmd/tpm/src/command/Object/MakeCredential.c similarity index 100% rename from src/tpm2/MakeCredential.c rename to src/tpm2/TPMCmd/tpm/src/command/Object/MakeCredential.c diff --git a/src/tpm2/ObjectChangeAuth.c b/src/tpm2/TPMCmd/tpm/src/command/Object/ObjectChangeAuth.c similarity index 100% rename from src/tpm2/ObjectChangeAuth.c rename to src/tpm2/TPMCmd/tpm/src/command/Object/ObjectChangeAuth.c diff --git a/src/tpm2/Object_spt.c b/src/tpm2/TPMCmd/tpm/src/command/Object/Object_spt.c similarity index 100% rename from src/tpm2/Object_spt.c rename to src/tpm2/TPMCmd/tpm/src/command/Object/Object_spt.c diff --git a/src/tpm2/PCR_Read.c b/src/tpm2/TPMCmd/tpm/src/command/PCR/PCR_Read.c similarity index 100% rename from src/tpm2/PCR_Read.c rename to src/tpm2/TPMCmd/tpm/src/command/PCR/PCR_Read.c diff --git a/src/tpm2/EncryptDecrypt_spt.c b/src/tpm2/TPMCmd/tpm/src/command/Symmetric/EncryptDecrypt_spt.c similarity index 100% rename from src/tpm2/EncryptDecrypt_spt.c rename to src/tpm2/TPMCmd/tpm/src/command/Symmetric/EncryptDecrypt_spt.c diff --git a/src/tpm2/AlgorithmTests.c b/src/tpm2/TPMCmd/tpm/src/crypt/AlgorithmTests.c similarity index 100% rename from src/tpm2/AlgorithmTests.c rename to src/tpm2/TPMCmd/tpm/src/crypt/AlgorithmTests.c diff --git a/src/tpm2/crypto/openssl/CryptCmac.c b/src/tpm2/TPMCmd/tpm/src/crypt/CryptCmac.c similarity index 100% rename from src/tpm2/crypto/openssl/CryptCmac.c rename to src/tpm2/TPMCmd/tpm/src/crypt/CryptCmac.c diff --git a/src/tpm2/crypto/openssl/CryptDes.c b/src/tpm2/TPMCmd/tpm/src/crypt/CryptDes.c similarity index 100% rename from src/tpm2/crypto/openssl/CryptDes.c rename to src/tpm2/TPMCmd/tpm/src/crypt/CryptDes.c diff --git a/src/tpm2/crypto/openssl/CryptEccCrypt.c b/src/tpm2/TPMCmd/tpm/src/crypt/CryptEccCrypt.c similarity index 100% rename from src/tpm2/crypto/openssl/CryptEccCrypt.c rename to src/tpm2/TPMCmd/tpm/src/crypt/CryptEccCrypt.c diff --git a/src/tpm2/CryptEccData.c b/src/tpm2/TPMCmd/tpm/src/crypt/CryptEccData.c similarity index 100% rename from src/tpm2/CryptEccData.c rename to src/tpm2/TPMCmd/tpm/src/crypt/CryptEccData.c diff --git a/src/tpm2/crypto/openssl/CryptEccKeyExchange.c b/src/tpm2/TPMCmd/tpm/src/crypt/CryptEccKeyExchange.c similarity index 100% rename from src/tpm2/crypto/openssl/CryptEccKeyExchange.c rename to src/tpm2/TPMCmd/tpm/src/crypt/CryptEccKeyExchange.c diff --git a/src/tpm2/crypto/openssl/CryptEccMain.c b/src/tpm2/TPMCmd/tpm/src/crypt/CryptEccMain.c similarity index 100% rename from src/tpm2/crypto/openssl/CryptEccMain.c rename to src/tpm2/TPMCmd/tpm/src/crypt/CryptEccMain.c diff --git a/src/tpm2/crypto/openssl/CryptEccSignature.c b/src/tpm2/TPMCmd/tpm/src/crypt/CryptEccSignature.c similarity index 100% rename from src/tpm2/crypto/openssl/CryptEccSignature.c rename to src/tpm2/TPMCmd/tpm/src/crypt/CryptEccSignature.c diff --git a/src/tpm2/crypto/openssl/CryptHash.c b/src/tpm2/TPMCmd/tpm/src/crypt/CryptHash.c similarity index 100% rename from src/tpm2/crypto/openssl/CryptHash.c rename to src/tpm2/TPMCmd/tpm/src/crypt/CryptHash.c diff --git a/src/tpm2/crypto/openssl/CryptPrime.c b/src/tpm2/TPMCmd/tpm/src/crypt/CryptPrime.c similarity index 100% rename from src/tpm2/crypto/openssl/CryptPrime.c rename to src/tpm2/TPMCmd/tpm/src/crypt/CryptPrime.c diff --git a/src/tpm2/crypto/openssl/CryptPrimeSieve.c b/src/tpm2/TPMCmd/tpm/src/crypt/CryptPrimeSieve.c similarity index 100% rename from src/tpm2/crypto/openssl/CryptPrimeSieve.c rename to src/tpm2/TPMCmd/tpm/src/crypt/CryptPrimeSieve.c diff --git a/src/tpm2/crypto/openssl/CryptRand.c b/src/tpm2/TPMCmd/tpm/src/crypt/CryptRand.c similarity index 100% rename from src/tpm2/crypto/openssl/CryptRand.c rename to src/tpm2/TPMCmd/tpm/src/crypt/CryptRand.c diff --git a/src/tpm2/crypto/openssl/CryptRsa.c b/src/tpm2/TPMCmd/tpm/src/crypt/CryptRsa.c similarity index 100% rename from src/tpm2/crypto/openssl/CryptRsa.c rename to src/tpm2/TPMCmd/tpm/src/crypt/CryptRsa.c diff --git a/src/tpm2/CryptSelfTest.c b/src/tpm2/TPMCmd/tpm/src/crypt/CryptSelfTest.c similarity index 100% rename from src/tpm2/CryptSelfTest.c rename to src/tpm2/TPMCmd/tpm/src/crypt/CryptSelfTest.c diff --git a/src/tpm2/crypto/openssl/CryptSmac.c b/src/tpm2/TPMCmd/tpm/src/crypt/CryptSmac.c similarity index 100% rename from src/tpm2/crypto/openssl/CryptSmac.c rename to src/tpm2/TPMCmd/tpm/src/crypt/CryptSmac.c diff --git a/src/tpm2/crypto/openssl/CryptSym.c b/src/tpm2/TPMCmd/tpm/src/crypt/CryptSym.c similarity index 99% rename from src/tpm2/crypto/openssl/CryptSym.c rename to src/tpm2/TPMCmd/tpm/src/crypt/CryptSym.c index 9564627e..1a1dbf3c 100644 --- a/src/tpm2/crypto/openssl/CryptSym.c +++ b/src/tpm2/TPMCmd/tpm/src/crypt/CryptSym.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: BSD-2-clause +// SPDX-License-Identifier: BSD-2-Clause //** Introduction // diff --git a/src/tpm2/CryptUtil.c b/src/tpm2/TPMCmd/tpm/src/crypt/CryptUtil.c similarity index 100% rename from src/tpm2/CryptUtil.c rename to src/tpm2/TPMCmd/tpm/src/crypt/CryptUtil.c diff --git a/src/tpm2/Ticket.c b/src/tpm2/TPMCmd/tpm/src/crypt/Ticket.c similarity index 100% rename from src/tpm2/Ticket.c rename to src/tpm2/TPMCmd/tpm/src/crypt/Ticket.c diff --git a/src/tpm2/TpmEcc_Signature_ECDAA.c b/src/tpm2/TPMCmd/tpm/src/crypt/ecc/TpmEcc_Signature_ECDAA.c similarity index 100% rename from src/tpm2/TpmEcc_Signature_ECDAA.c rename to src/tpm2/TPMCmd/tpm/src/crypt/ecc/TpmEcc_Signature_ECDAA.c diff --git a/src/tpm2/TpmEcc_Signature_SM2.c b/src/tpm2/TPMCmd/tpm/src/crypt/ecc/TpmEcc_Signature_SM2.c similarity index 100% rename from src/tpm2/TpmEcc_Signature_SM2.c rename to src/tpm2/TPMCmd/tpm/src/crypt/ecc/TpmEcc_Signature_SM2.c diff --git a/src/tpm2/TpmEcc_Signature_Schnorr.c b/src/tpm2/TPMCmd/tpm/src/crypt/ecc/TpmEcc_Signature_Schnorr.c similarity index 100% rename from src/tpm2/TpmEcc_Signature_Schnorr.c rename to src/tpm2/TPMCmd/tpm/src/crypt/ecc/TpmEcc_Signature_Schnorr.c diff --git a/src/tpm2/TpmEcc_Signature_Util.c b/src/tpm2/TPMCmd/tpm/src/crypt/ecc/TpmEcc_Signature_Util.c similarity index 100% rename from src/tpm2/TpmEcc_Signature_Util.c rename to src/tpm2/TPMCmd/tpm/src/crypt/ecc/TpmEcc_Signature_Util.c diff --git a/src/tpm2/TpmEcc_Util.c b/src/tpm2/TPMCmd/tpm/src/crypt/ecc/TpmEcc_Util.c similarity index 100% rename from src/tpm2/TpmEcc_Util.c rename to src/tpm2/TPMCmd/tpm/src/crypt/ecc/TpmEcc_Util.c diff --git a/src/tpm2/TpmMath_Debug.c b/src/tpm2/TPMCmd/tpm/src/crypt/math/TpmMath_Debug.c similarity index 100% rename from src/tpm2/TpmMath_Debug.c rename to src/tpm2/TPMCmd/tpm/src/crypt/math/TpmMath_Debug.c diff --git a/src/tpm2/TpmMath_Util.c b/src/tpm2/TPMCmd/tpm/src/crypt/math/TpmMath_Util.c similarity index 100% rename from src/tpm2/TpmMath_Util.c rename to src/tpm2/TPMCmd/tpm/src/crypt/math/TpmMath_Util.c diff --git a/src/tpm2/_TPM_Init.c b/src/tpm2/TPMCmd/tpm/src/events/_TPM_Init.c similarity index 94% rename from src/tpm2/_TPM_Init.c rename to src/tpm2/TPMCmd/tpm/src/events/_TPM_Init.c index 3a9ab399..4f933744 100644 --- a/src/tpm2/_TPM_Init.c +++ b/src/tpm2/TPMCmd/tpm/src/events/_TPM_Init.c @@ -1,7 +1,8 @@ // SPDX-License-Identifier: BSD-2-Clause -#include "Tpm.h" -#include "_TPM_Init_fp.h" +#include +// TODO_RENAME_INC_FOLDER:platform_interface refers to the TPM_CoreLib platform interface +#include #include "StateMarshal.h" // libtpms added // Move this to a future _plat_NvUpdateData() API and perform this in diff --git a/src/tpm2/CommandDispatcher.c b/src/tpm2/TPMCmd/tpm/src/main/CommandDispatcher.c similarity index 100% rename from src/tpm2/CommandDispatcher.c rename to src/tpm2/TPMCmd/tpm/src/main/CommandDispatcher.c diff --git a/src/tpm2/ExecCommand.c b/src/tpm2/TPMCmd/tpm/src/main/ExecCommand.c similarity index 99% rename from src/tpm2/ExecCommand.c rename to src/tpm2/TPMCmd/tpm/src/main/ExecCommand.c index 0d580296..51a43ca0 100644 --- a/src/tpm2/ExecCommand.c +++ b/src/tpm2/TPMCmd/tpm/src/main/ExecCommand.c @@ -10,7 +10,7 @@ #include "Tpm.h" #include "Marshal.h" // TODO_RENAME_INC_FOLDER:platform_interface refers to the TPM_CoreLib platform interface -#include "ExecCommand_fp.h" // libtpms changed +#include // Uncomment this next #include if doing static command/response buffer sizing // #include "CommandResponseSizes_fp.h" diff --git a/src/tpm2/SessionProcess.c b/src/tpm2/TPMCmd/tpm/src/main/SessionProcess.c similarity index 99% rename from src/tpm2/SessionProcess.c rename to src/tpm2/TPMCmd/tpm/src/main/SessionProcess.c index a90891c4..690e0cb4 100644 --- a/src/tpm2/SessionProcess.c +++ b/src/tpm2/TPMCmd/tpm/src/main/SessionProcess.c @@ -11,9 +11,9 @@ #define SESSION_PROCESS_C #include "Tpm.h" -#include "ACT.h" +#include "tpm_public/ACT.h" #include "Marshal.h" -#include "platform_virtual_nv_fp.h" +#include #if SEC_CHANNEL_SUPPORT # include "SecChannel_fp.h" #endif // SEC_CHANNEL_SUPPORT diff --git a/src/tpm2/CommandAudit.c b/src/tpm2/TPMCmd/tpm/src/subsystem/CommandAudit.c similarity index 100% rename from src/tpm2/CommandAudit.c rename to src/tpm2/TPMCmd/tpm/src/subsystem/CommandAudit.c diff --git a/src/tpm2/DA.c b/src/tpm2/TPMCmd/tpm/src/subsystem/DA.c similarity index 100% rename from src/tpm2/DA.c rename to src/tpm2/TPMCmd/tpm/src/subsystem/DA.c diff --git a/src/tpm2/Hierarchy.c b/src/tpm2/TPMCmd/tpm/src/subsystem/Hierarchy.c similarity index 100% rename from src/tpm2/Hierarchy.c rename to src/tpm2/TPMCmd/tpm/src/subsystem/Hierarchy.c diff --git a/src/tpm2/NvDynamic.c b/src/tpm2/TPMCmd/tpm/src/subsystem/NvDynamic.c similarity index 99% rename from src/tpm2/NvDynamic.c rename to src/tpm2/TPMCmd/tpm/src/subsystem/NvDynamic.c index 0b851a92..a8c28d03 100644 --- a/src/tpm2/NvDynamic.c +++ b/src/tpm2/TPMCmd/tpm/src/subsystem/NvDynamic.c @@ -41,7 +41,7 @@ #define NV_C #include "Tpm.h" #include "Marshal.h" -#include "platform_virtual_nv_fp.h" // libtpms changed +#include #include "tpm_library_intern.h" // libtpms added #include "BackwardsCompatibilityObject.h" // libtpms added diff --git a/src/tpm2/NvReserved.c b/src/tpm2/TPMCmd/tpm/src/subsystem/NvReserved.c similarity index 100% rename from src/tpm2/NvReserved.c rename to src/tpm2/TPMCmd/tpm/src/subsystem/NvReserved.c diff --git a/src/tpm2/Object.c b/src/tpm2/TPMCmd/tpm/src/subsystem/Object.c similarity index 100% rename from src/tpm2/Object.c rename to src/tpm2/TPMCmd/tpm/src/subsystem/Object.c diff --git a/src/tpm2/PCR.c b/src/tpm2/TPMCmd/tpm/src/subsystem/PCR.c similarity index 100% rename from src/tpm2/PCR.c rename to src/tpm2/TPMCmd/tpm/src/subsystem/PCR.c diff --git a/src/tpm2/PP.c b/src/tpm2/TPMCmd/tpm/src/subsystem/PP.c similarity index 100% rename from src/tpm2/PP.c rename to src/tpm2/TPMCmd/tpm/src/subsystem/PP.c diff --git a/src/tpm2/Session.c b/src/tpm2/TPMCmd/tpm/src/subsystem/Session.c similarity index 100% rename from src/tpm2/Session.c rename to src/tpm2/TPMCmd/tpm/src/subsystem/Session.c diff --git a/src/tpm2/Time.c b/src/tpm2/TPMCmd/tpm/src/subsystem/Time.c similarity index 100% rename from src/tpm2/Time.c rename to src/tpm2/TPMCmd/tpm/src/subsystem/Time.c diff --git a/src/tpm2/AlgorithmCap.c b/src/tpm2/TPMCmd/tpm/src/support/AlgorithmCap.c similarity index 100% rename from src/tpm2/AlgorithmCap.c rename to src/tpm2/TPMCmd/tpm/src/support/AlgorithmCap.c diff --git a/src/tpm2/Bits.c b/src/tpm2/TPMCmd/tpm/src/support/Bits.c similarity index 100% rename from src/tpm2/Bits.c rename to src/tpm2/TPMCmd/tpm/src/support/Bits.c diff --git a/src/tpm2/CommandCodeAttributes.c b/src/tpm2/TPMCmd/tpm/src/support/CommandCodeAttributes.c similarity index 100% rename from src/tpm2/CommandCodeAttributes.c rename to src/tpm2/TPMCmd/tpm/src/support/CommandCodeAttributes.c diff --git a/src/tpm2/Entity.c b/src/tpm2/TPMCmd/tpm/src/support/Entity.c similarity index 99% rename from src/tpm2/Entity.c rename to src/tpm2/TPMCmd/tpm/src/support/Entity.c index bdc05843..5030f3f7 100644 --- a/src/tpm2/Entity.c +++ b/src/tpm2/TPMCmd/tpm/src/support/Entity.c @@ -8,7 +8,7 @@ //** Includes #include "Tpm.h" -#include "platform_virtual_nv_fp.h" +#include //** Functions //*** EntityGetLoadStatus() diff --git a/src/tpm2/Global.c b/src/tpm2/TPMCmd/tpm/src/support/Global.c similarity index 100% rename from src/tpm2/Global.c rename to src/tpm2/TPMCmd/tpm/src/support/Global.c diff --git a/src/tpm2/Handle.c b/src/tpm2/TPMCmd/tpm/src/support/Handle.c similarity index 100% rename from src/tpm2/Handle.c rename to src/tpm2/TPMCmd/tpm/src/support/Handle.c diff --git a/src/tpm2/IoBuffers.c b/src/tpm2/TPMCmd/tpm/src/support/IoBuffers.c similarity index 100% rename from src/tpm2/IoBuffers.c rename to src/tpm2/TPMCmd/tpm/src/support/IoBuffers.c diff --git a/src/tpm2/Locality.c b/src/tpm2/TPMCmd/tpm/src/support/Locality.c similarity index 100% rename from src/tpm2/Locality.c rename to src/tpm2/TPMCmd/tpm/src/support/Locality.c diff --git a/src/tpm2/Manufacture.c b/src/tpm2/TPMCmd/tpm/src/support/Manufacture.c similarity index 100% rename from src/tpm2/Manufacture.c rename to src/tpm2/TPMCmd/tpm/src/support/Manufacture.c diff --git a/src/tpm2/Marshal.c b/src/tpm2/TPMCmd/tpm/src/support/Marshal.c similarity index 100% rename from src/tpm2/Marshal.c rename to src/tpm2/TPMCmd/tpm/src/support/Marshal.c diff --git a/src/tpm2/MathOnByteBuffers.c b/src/tpm2/TPMCmd/tpm/src/support/MathOnByteBuffers.c similarity index 100% rename from src/tpm2/MathOnByteBuffers.c rename to src/tpm2/TPMCmd/tpm/src/support/MathOnByteBuffers.c diff --git a/src/tpm2/Memory.c b/src/tpm2/TPMCmd/tpm/src/support/Memory.c similarity index 100% rename from src/tpm2/Memory.c rename to src/tpm2/TPMCmd/tpm/src/support/Memory.c diff --git a/src/tpm2/Power.c b/src/tpm2/TPMCmd/tpm/src/support/Power.c similarity index 100% rename from src/tpm2/Power.c rename to src/tpm2/TPMCmd/tpm/src/support/Power.c diff --git a/src/tpm2/PropertyCap.c b/src/tpm2/TPMCmd/tpm/src/support/PropertyCap.c similarity index 100% rename from src/tpm2/PropertyCap.c rename to src/tpm2/TPMCmd/tpm/src/support/PropertyCap.c diff --git a/src/tpm2/Response.c b/src/tpm2/TPMCmd/tpm/src/support/Response.c similarity index 100% rename from src/tpm2/Response.c rename to src/tpm2/TPMCmd/tpm/src/support/Response.c diff --git a/src/tpm2/ResponseCodeProcessing.c b/src/tpm2/TPMCmd/tpm/src/support/ResponseCodeProcessing.c similarity index 100% rename from src/tpm2/ResponseCodeProcessing.c rename to src/tpm2/TPMCmd/tpm/src/support/ResponseCodeProcessing.c diff --git a/src/tpm2/SecChannel.c b/src/tpm2/TPMCmd/tpm/src/support/SecChannel.c similarity index 100% rename from src/tpm2/SecChannel.c rename to src/tpm2/TPMCmd/tpm/src/support/SecChannel.c diff --git a/src/tpm2/TpmFail.c b/src/tpm2/TPMCmd/tpm/src/support/TpmFail.c similarity index 99% rename from src/tpm2/TpmFail.c rename to src/tpm2/TPMCmd/tpm/src/support/TpmFail.c index 89a5a813..271227de 100644 --- a/src/tpm2/TpmFail.c +++ b/src/tpm2/TPMCmd/tpm/src/support/TpmFail.c @@ -10,7 +10,7 @@ // structures is not important as this function does not use any of the structures // in TpmTypes.h and only include it for the #defines of the capabilities, // properties, and command code values. -#include "TpmTypes.h" +#include "tpm_public/TpmTypes.h" #define TPM_HAVE_TPM2_DECLARATIONS #include "tpm_library_intern.h" // libtpms added diff --git a/src/tpm2/TpmSizeChecks.c b/src/tpm2/TPMCmd/tpm/src/support/TpmSizeChecks.c similarity index 100% rename from src/tpm2/TpmSizeChecks.c rename to src/tpm2/TPMCmd/tpm/src/support/TpmSizeChecks.c diff --git a/src/tpm2/Unmarshal_fp.h b/src/tpm2/Unmarshal_fp.h index 4f48a3ad..27643c65 100644 --- a/src/tpm2/Unmarshal_fp.h +++ b/src/tpm2/Unmarshal_fp.h @@ -64,7 +64,7 @@ #define UNMARSHAL_FP_H #include "Tpm.h" -#include "TpmTypes.h" +#include #ifdef __cplusplus extern "C" { diff --git a/src/tpm2/Utils.h b/src/tpm2/Utils.h index b9becef2..a8d4749f 100644 --- a/src/tpm2/Utils.h +++ b/src/tpm2/Utils.h @@ -39,7 +39,7 @@ #ifndef UTILS_H #define UTILS_H -#include "Memory_fp.h" +#include "prototypes/Memory_fp.h" #define TPM2_ROUNDUP(VAL, SIZE) \ ( ( (VAL) + (SIZE) - 1) / (SIZE) ) * (SIZE) diff --git a/src/tpm2/Volatile.h b/src/tpm2/Volatile.h index 9913e8d9..512a46f4 100644 --- a/src/tpm2/Volatile.h +++ b/src/tpm2/Volatile.h @@ -39,7 +39,7 @@ #ifndef VOLATILE_H #define VOLATILE_H -#include "BaseTypes.h" +#include TPM_RC VolatileState_Load(BYTE **buffer, INT32 *size); UINT16 VolatileState_Save(BYTE **buffer, INT32 *size); diff --git a/src/tpm2/crypto/CryptSelfTest_fp.h b/src/tpm2/crypto/CryptSelfTest_fp.h deleted file mode 100644 index e91df04b..00000000 --- a/src/tpm2/crypto/CryptSelfTest_fp.h +++ /dev/null @@ -1,127 +0,0 @@ -/********************************************************************************/ -/* */ -/* */ -/* Written by Ken Goldman */ -/* IBM Thomas J. Watson Research Center */ -/* $Id: CryptSelfTest_fp.h 1490 2019-07-26 21:13:22Z 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 */ -/* */ -/********************************************************************************/ - -/*(Auto-generated) - * Created by TpmPrototypes; Version 3.0 July 18, 2017 - * Date: Mar 4, 2020 Time: 02:36:44PM - */ - -#ifndef _CRYPT_SELF_TEST_FP_H_ -#define _CRYPT_SELF_TEST_FP_H_ - -//*** CryptSelfTest() -// This function is called to start/complete a full self-test. -// If 'fullTest' is NO, then only the untested algorithms will be run. If -// 'fullTest' is YES, then 'g_untestedDecryptionAlgorithms' is reinitialized and then -// all tests are run. -// This implementation of the reference design does not support processing outside -// the framework of a TPM command. As a consequence, this command does not -// complete until all tests are done. Since this can take a long time, the TPM -// will check after each test to see if the command is canceled. If so, then the -// TPM will returned TPM_RC_CANCELLED. To continue with the self-tests, call -// TPM2_SelfTest(fullTest == No) and the TPM will complete the testing. -// Return Type: TPM_RC -// TPM_RC_CANCELED if the command is canceled -LIB_EXPORT -TPM_RC -CryptSelfTest(TPMI_YES_NO fullTest // IN: if full test is required -); - -//*** CryptIncrementalSelfTest() -// This function is used to perform an incremental self-test. This implementation -// will perform the toTest values before returning. That is, it assumes that the -// TPM cannot perform background tasks between commands. -// -// This command may be canceled. If it is, then there is no return result. -// However, this command can be run again and the incremental progress will not -// be lost. -// Return Type: TPM_RC -// TPM_RC_CANCELED processing of this command was canceled -// TPM_RC_TESTING if toTest list is not empty -// TPM_RC_VALUE an algorithm in the toTest list is not implemented -TPM_RC -CryptIncrementalSelfTest(TPML_ALG* toTest, // IN: list of algorithms to be tested - TPML_ALG* toDoList // OUT: list of algorithms needing test -); - -//*** CryptInitializeToTest() -// This function will initialize the data structures for testing all the -// algorithms. This should not be called unless CryptAlgsSetImplemented() has -// been called -void CryptInitializeToTest(void); - -//*** CryptTestAlgorithm() -// Only point of contact with the actual self tests. If a self-test fails, there -// is no return and the TPM goes into failure mode. -// The call to TestAlgorithm uses an algorithm selector and a bit vector. When the -// test is run, the corresponding bit in 'toTest' and in 'g_toTest' is CLEAR. If -// 'toTest' is NULL, then only the bit in 'g_toTest' is CLEAR. -// There is a special case for the call to TestAlgorithm(). When 'alg' is -// ALG_ERROR, TestAlgorithm() will CLEAR any bit in 'toTest' for which it has -// no test. This allows the knowledge about which algorithms have test to be -// accessed through the interface that provides the test. -// Return Type: TPM_RC -// TPM_RC_CANCELED test was canceled -LIB_EXPORT -TPM_RC -CryptTestAlgorithm(TPM_ALG_ID alg, ALGORITHM_VECTOR* toTest); - -#endif // _CRYPT_SELF_TEST_FP_H_ diff --git a/src/tpm2/crypto/openssl/ConsttimeUtils.h b/src/tpm2/crypto/openssl/ConsttimeUtils.h deleted file mode 100644 index 22d8a05f..00000000 --- a/src/tpm2/crypto/openssl/ConsttimeUtils.h +++ /dev/null @@ -1,100 +0,0 @@ -/********************************************************************************/ -/* */ -/* Constant time debugging helper functions */ -/* Written by Stefan Berger */ -/* IBM Thomas J. Watson Research Center */ -/* */ -/* Licenses and Notices */ -/* */ -/* 1. Copyright Licenses: */ -/* */ -/* (c) Copyright IBM Corporation, 2020-2025 */ -/* */ -/* All rights reserved. */ -/* */ -/* Redistribution and use in source and binary forms, with or without */ -/* modification, are permitted provided that the following conditions are */ -/* met: */ -/* */ -/* Redistributions of source code must retain the above copyright notice, */ -/* this list of conditions and the following disclaimer. */ -/* */ -/* Redistributions in binary form must reproduce the above copyright */ -/* notice, this list of conditions and the following disclaimer in the */ -/* documentation and/or other materials provided with the distribution. */ -/* */ -/* Neither the names of the IBM Corporation nor the names of its */ -/* contributors may be used to endorse or promote products derived from */ -/* this software without specific prior written permission. */ -/* */ -/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */ -/* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT */ -/* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR */ -/* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT */ -/* HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, */ -/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT */ -/* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, */ -/* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY */ -/* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT */ -/* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE */ -/* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* */ -/********************************************************************************/ - -#ifndef CONSTTIME_UTILS_H -#define CONSTTIME_UTILS_H - -#include -#include - -#include "BnValues.h" - -#include - -static __inline__ unsigned long long rdtsc() { - unsigned long h, l; - - __asm__ __volatile__ ("rdtsc" : "=a"(l), "=d"(h)); - - return (unsigned long long)l | - ((unsigned long long)h << 32 ); -} - -// Make sure that the given BIGNUM has the given number of expected bytes. -// Skip over any leading zeros the BIGNUM may have. -static inline void assert_ossl_num_bytes(const BIGNUM *a, - unsigned int num_bytes, - int verbose, - const char *caller) { - unsigned char buffer[LARGEST_NUMBER] = { 0, }; - int len, i; - - len = BN_bn2bin(a, buffer); - for (i = 0; i < len; i++) { - if (buffer[i]) - break; - } - len -= i; - if (num_bytes != (unsigned int)len) { - printf("%s: Expected %u bytes but found %d (caller: %s)\n", __func__, num_bytes, len, caller); - } else { - if (verbose) - printf("%s: check passed; num_bytes = %d (caller: %s)\n",__func__, num_bytes, caller); - } - assert(num_bytes == (unsigned int)len); -} - -// Make sure that the bigNum has the expected number of bytes after it was -// converted to an OpenSSL BIGNUM. -static inline void assert_bn_ossl_num_bytes(bigNum tpmb, - unsigned int num_bytes, - int verbose, - const char *caller) { - BIG_INITIALIZED(osslb, tpmb); - - assert_ossl_num_bytes(osslb, num_bytes, verbose, caller); - - BN_free(osslb); -} - -#endif /* CONSTTIME_UTILS_H */ diff --git a/src/tpm2/crypto/openssl/consttime.txt b/src/tpm2/crypto/openssl/consttime.txt deleted file mode 100644 index 6dd8328f..00000000 --- a/src/tpm2/crypto/openssl/consttime.txt +++ /dev/null @@ -1,76 +0,0 @@ -The following (top level) OpenSSL public BIGNUM functions check for -the BN_FLG_CONSTTIME: - -bn_blind.c: - BN_BLINDING_new() - -bn_exp.c: - BN_exp : must not be set for input bignums -! BN_mod_exp : SHOULD be set for any one of input bignums (only) if m is odd - BN_mod_exp_recp: must NOT be set for input bignums - BN_mod_exp_mont: SHOULD be set for any one of input bignums - BN_mod_exp_mont_word: must NOT be set for input bignums - BN_mod_exp_simple: must NOT bet set for input bignums - -bn_gcd.c: -! BN_mod_inverse: SHOULD be set for any one of input bignums - -bn_lib: - BN_num_bits -! BN_copy - -bn_mont.c: - BN_MONT_CTX_set - -bn.h: -! BN_num_bytes: Calls BN_num_bits - - -Relevant files and functions in the files: -Helpers.c - ComputePrivateExponentD: - - BN_dup: -> BN_copy: YES, BN_FLG_CONSTTIME set by caller on P and Q - - BN_sub: no - - BN_add_word: no - - BN_mod_inverse: YES, DONE - InitOpenSSLRSAPublicKey: - - BN_set_word: no - - BN_bin2bn: no - InitOpenSSLRSAPrivateKey: - - BN_bin2bn: no - - BN_div: -> BN_copy: YES, DONE - - BN_is_zero: no - -TpmToOsslMath: - OsslToTpmBn: - - BN_num_bytes: need not - - BN_bn2bin: -> BN_num_bytes: need not - BigInitialized: - - BN_bin2bn: no - - BN_copy: YES, DONE - BnModMult: - - BN_mul: no - - BN_div: -> BN_copy: ? - BnMult: - - BN_mul: no - BnDiv: - - BN_div: -> BN_copy: ? - BnGcd: /* FUNCTION IS NOT USED */ - - BN_gcd: -> BN_copy, BN_num_bits: YES, DONE - BnModExp: - - BN_mod_exp: YES, DONE - BnModInverse: - - BN_mod_inverse: YES, DONE - - -Elliptic curve signing : - -CryptEccMain.c: - BnEccGenerateKeyPair: - - BnEccModMult: YES, DONE (we have control over random number bnD) - called by BnSignEcSchnorr - called by BnSignEcdsa (if OpenSSL function not used) - -CryptEccSignature.c: - BnEccSignSM2: - - BnEccModMult: YES, DONE (we have control over random number bnK) diff --git a/src/tpm2/crypto/openssl/consttime.txt' b/src/tpm2/crypto/openssl/consttime.txt' deleted file mode 100644 index b6670861..00000000 --- a/src/tpm2/crypto/openssl/consttime.txt' +++ /dev/null @@ -1,58 +0,0 @@ -The following OpenSSL public BIGNUM functions check for the BN_FLG_CONSTTIME: - -bn_blind.c: - BN_BLINDING_new() - -bn_exp.c: - BN_exp : must not be set for input bignums -! BN_mod_exp : SHOULD be set for any one of input bignums (only) if m is odd - BN_mod_exp_recp: must NOT be set for input bignums - BN_mod_exp_mont: SHOULD be set for any one of input bignums - BN_mod_exp_mont_word: must NOT be set for input bignums - BN_mod_exp_simple: must NOT bet set for input bignums - -bn_gcd.c: -! BN_mod_inverse: SHOULD be set for any one of input bignums - -bn_lib: - BN_num_bits -! BN_copy - -bn_mont.c: - BN_MONT_CTX_set - -bn.h: -! BN_num_bytes: Calls BN_num_bits - - -Relevant files and functions in the files: -Helpers.c - - BN_dup: - - BN_sub: - - BN_add_word: - - BN_mod_inverse: yes - - BN_set_word: - - BN_bin2bn: - - BN_div: - - BN_is_zero: - -TpmToOsslMath: - OsslToTpmBn: - - BN_num_bytes: - - BN_bn2bin: - BigInitialized: - - BN_bin2bn: - - BN_copy: - BnModMult: - - BN_mul: - - BN_div: - BnMult: - - BN_mul: - BnDiv: - - BN_div: - BnGcd: - - BN_gcd: - BnModExp: - - BN_mod_exp: YES - BnModInverse: - - BN_mod_inverse: YES diff --git a/src/tpm2/platform_to_tpm_interface.h b/src/tpm2/platform_to_tpm_interface.h deleted file mode 100644 index 71024c99..00000000 --- a/src/tpm2/platform_to_tpm_interface.h +++ /dev/null @@ -1,72 +0,0 @@ -/********************************************************************************/ -/* */ -/* */ -/* Written by Ken Goldman */ -/* IBM Thomas J. Watson Research Center */ -/* */ -/* 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, 2023 */ -/* */ -/********************************************************************************/ - -#ifndef _PLATFORM_TO_TPM_INTERFACE_H_ -#define _PLATFORM_TO_TPM_INTERFACE_H_ - -#include "_TPM_Hash_Data_fp.h" -#include "_TPM_Hash_End_fp.h" -#include "_TPM_Hash_Start_fp.h" -#include "_TPM_Init_fp.h" -#include "ExecCommand_fp.h" -#include "Manufacture_fp.h" -// TODO_RENAME_INC_FOLDER: public refers to the TPM_CoreLib public headers -#include "TpmFail_fp.h" -#endif diff --git a/src/tpm2/tpm_public.h b/src/tpm2/tpm_public.h deleted file mode 100644 index 589552f2..00000000 --- a/src/tpm2/tpm_public.h +++ /dev/null @@ -1,12 +0,0 @@ -// SPDX-License-Identifier: BSD-2-Clause - -#include "TpmBuildSwitches.h" -#include "TpmProfile.h" - -#include "VerifyConfiguration.h" -#include "BaseTypes.h" -#include "TPMB.h" -#include "MinMax.h" -#include "tpm_radix.h" -#include "TpmTypes.h" -#include "tpm_debug.h" diff --git a/src/tpm_tpm2_interface.c b/src/tpm_tpm2_interface.c index 89c18115..508a0338 100644 --- a/src/tpm_tpm2_interface.c +++ b/src/tpm_tpm2_interface.c @@ -44,21 +44,15 @@ #ifndef LIB_EXPORT #define LIB_EXPORT #endif -#include "tpm2/Tpm.h" -#include "tpm2/Manufacture_fp.h" -#include "tpm2/Platform_fp.h" -#include "tpm2/ExecCommand_fp.h" -#include "tpm2/TpmTcpProtocol.h" -#include "tpm2/Simulator_fp.h" -#include "tpm2/_TPM_Hash_Data_fp.h" -#include "tpm2/_TPM_Init_fp.h" -#include "tpm2/StateMarshal.h" -#include "tpm2/PlatformACT.h" -#include "tpm2/PlatformData.h" -#include "tpm2/PlatformInternal.h" -#include "tpm2/Volatile.h" -#include "tpm2/crypto/openssl/ExpDCache_fp.h" -#include "tpm2/platform_failure_mode_fp.h" + +#include "Tpm.h" +#include +#include +#include "PlatformData.h" +#include "PlatformInternal.h" +#include "StateMarshal.h" +#include "Volatile.h" +#include "ExpDCache_fp.h" #define TPM_HAVE_TPM2_DECLARATIONS #include "tpm_nvfile.h" // TPM_NVRAM_Loaddata() diff --git a/src/tpm_tpm2_tis.c b/src/tpm_tpm2_tis.c index 08623eb1..b8bda48e 100644 --- a/src/tpm_tpm2_tis.c +++ b/src/tpm_tpm2_tis.c @@ -40,15 +40,10 @@ #include -#include "tpm2/Tpm.h" -#include "tpm2/TpmTypes.h" -#include "tpm2/TpmBuildSwitches.h" -#include "tpm2/_TPM_Hash_Start_fp.h" -#include "tpm2/_TPM_Hash_Data_fp.h" -#include "tpm2/_TPM_Hash_End_fp.h" -#include "tpm2/TpmTcpProtocol.h" -#include "tpm2/Platform_fp.h" -#include "tpm2/Simulator_fp.h" +#include "Tpm.h" +#include "TpmTcpProtocol.h" +#include "Platform_fp.h" +#include "Simulator_fp.h" #define TPM_HAVE_TPM2_DECLARATIONS #include "tpm_library_intern.h" diff --git a/tests/Makefile.am b/tests/Makefile.am index 059aab55..3317f2cb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -13,6 +13,26 @@ AM_CFLAGS = -I$(top_srcdir)/include $(SANITIZERS) AM_LDFLAGS = -no-undefined $(SANITIZERS) LDADD = $(top_builddir)/src/libtpms.la +HEADER_CFLAGS = \ + -I$(top_srcdir)/include/libtpms \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/tpm2 \ + -I$(top_srcdir)/src/tpm2/crypto/openssl \ + -I$(top_srcdir)/src/tpm2/TPMCmd/Platform/include/ \ + -I$(top_srcdir)/src/tpm2/TPMCmd/Simulator/include/ \ + -I$(top_srcdir)/src/tpm2/TPMCmd/Simulator/include/prototypes \ + -I$(top_srcdir)/src/tpm2/TPMCmd/TpmConfiguration \ + -I$(top_srcdir)/src/tpm2/TPMCmd/tpm/include/ \ + -I$(top_srcdir)/src/tpm2/TPMCmd/tpm/include/private \ + -I$(top_srcdir)/src/tpm2/TPMCmd/tpm/include/private/prototypes/ \ + -I$(top_srcdir)/src/tpm2/TPMCmd/tpm/cryptolibs/common/include/ \ + -I$(top_srcdir)/src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/ \ + -I$(top_srcdir)/src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/TpmBigNum/ \ + -I$(top_srcdir)/src/tpm2/TPMCmd/tpm/cryptolibs/ \ + -I$(top_srcdir)/src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/ \ + -I$(top_srcdir)/src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/include \ + -I$(top_srcdir)/src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl + check_PROGRAMS = \ base64decode @@ -42,11 +62,7 @@ endif nvram_offsets_SOURCES = nvram_offsets.c nvram_offsets_CFLAGS = $(AM_CFLAGS) \ - -I$(top_srcdir)/include/libtpms \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/tpm2 \ - -I$(top_srcdir)/src/tpm2/crypto \ - -I$(top_srcdir)/src/tpm2/crypto/openssl \ + $(HEADER_CFLAGS) \ -DTPM_POSIX nvram_offsets_LDFLAGS = $(AM_LDFLAGS) @@ -62,12 +78,8 @@ TESTS += \ object_size_SOURCES = object_size.c object_size_CFLAGS = $(AM_CFLAGS) \ + $(HEADER_CFLAGS) \ -static \ - -I$(top_srcdir)/include/libtpms \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/tpm2 \ - -I$(top_srcdir)/src/tpm2/crypto \ - -I$(top_srcdir)/src/tpm2/crypto/openssl \ -DTPM_POSIX object_size_LDFLAGS = $(AM_LDFLAGS) endif # ENABLE_STATIC_TESTS