Failed in applying to current master (
apply log)
SecurityPkg/FvReportPei/FvReportPei.c | 4 +-
SecurityPkg/Hash2DxeCrypto/Driver.c | 8 +-
SecurityPkg/Hash2DxeCrypto/Driver.h | 4 +-
SecurityPkg/HddPassword/HddPasswordDxe.c | 10 +-
SecurityPkg/HddPassword/HddPasswordDxe.h | 2 +-
.../HddPassword/HddPasswordStrings.uni | 2 +-
.../Guid/AuthenticatedVariableFormat.h | 2 +-
.../Include/Library/Tcg2PhysicalPresenceLib.h | 4 +-
.../Include/Library/TcgStorageCoreLib.h | 12 +-
SecurityPkg/Include/Library/Tpm2CommandLib.h | 2 +-
SecurityPkg/Include/Library/TpmCommLib.h | 2 +-
.../Ppi/FirmwareVolumeInfoPrehashedFV.h | 4 +-
.../Library/AuthVariableLib/AuthService.c | 6 +-
.../AuthVariableLib/AuthServiceInternal.h | 2 +-
.../Library/AuthVariableLib/AuthVariableLib.c | 20 +-
.../DxeImageAuthenticationStatusLib.c | 2 +-
.../DxeImageVerificationLib.c | 12 +-
.../DxeImageVerificationLib/Measurement.c | 8 +-
.../DxeRsa2048Sha256GuidedSectionExtractLib.c | 4 +-
...xeRsa2048Sha256GuidedSectionExtractLib.inf | 2 +-
...xeRsa2048Sha256GuidedSectionExtractLib.uni | 2 +-
.../DxeTcg2PhysicalPresenceLib.c | 36 ++--
.../DxeTcgPhysicalPresenceLib.c | 12 +-
.../DxeTpm2MeasureBootLib.c | 18 +-
.../DxeTpmMeasureBootLib.c | 8 +-
.../DxeTpmMeasurementLib.c | 2 +-
.../HashInstanceLibSha1/HashInstanceLibSha1.c | 2 +-
.../HashInstanceLibSha256.c | 2 +-
.../HashInstanceLibSha384.c | 2 +-
.../HashInstanceLibSha512.c | 2 +-
SecurityPkg/Library/HashLibTpm2/HashLibTpm2.c | 14 +-
.../PeiRsa2048Sha256GuidedSectionExtractLib.c | 4 +-
...eiRsa2048Sha256GuidedSectionExtractLib.inf | 2 +-
...eiRsa2048Sha256GuidedSectionExtractLib.uni | 2 +-
.../SmmTcg2PhysicalPresenceLib.c | 18 +-
.../TcgStorageCoreLib/TcgStorageCore.c | 10 +-
.../TcgStorageCoreLib/TcgStorageUtil.c | 2 +-
.../TcgStorageOpalLib/TcgStorageOpalUtil.c | 6 +-
.../Library/Tpm12CommandLib/Tpm12NvStorage.c | 2 +-
.../Library/Tpm12CommandLib/Tpm12Pcr.c | 2 +-
.../Tpm12CommandLib/Tpm12PhysicalPresence.c | 2 +-
.../Library/Tpm12DeviceLibDTpm/Tpm12Tis.c | 26 +--
.../Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.c | 4 +-
.../Library/Tpm2CommandLib/Tpm2Capability.c | 34 +--
.../Library/Tpm2CommandLib/Tpm2Context.c | 4 +-
.../Tpm2CommandLib/Tpm2DictionaryAttack.c | 8 +-
.../Tpm2EnhancedAuthorization.c | 16 +-
SecurityPkg/Library/Tpm2CommandLib/Tpm2Help.c | 2 +-
.../Library/Tpm2CommandLib/Tpm2Hierarchy.c | 42 ++--
.../Library/Tpm2CommandLib/Tpm2Integrity.c | 42 ++--
.../Tpm2CommandLib/Tpm2Miscellaneous.c | 4 +-
.../Library/Tpm2CommandLib/Tpm2NVStorage.c | 36 ++--
.../Library/Tpm2CommandLib/Tpm2Sequences.c | 26 +--
.../Library/Tpm2CommandLib/Tpm2Session.c | 6 +-
.../Library/Tpm2CommandLib/Tpm2Startup.c | 4 +-
.../Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.c | 2 +-
.../Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.c | 2 +-
.../Library/Tpm2DeviceLibDTpm/Tpm2Ptp.c | 54 ++---
.../Library/Tpm2DeviceLibDTpm/Tpm2Tis.c | 28 +--
.../Tpm2DeviceLibRouterPei.c | 2 +-
.../Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.c | 4 +-
SecurityPkg/Library/TpmCommLib/CommonHeader.h | 2 +-
SecurityPkg/Library/TpmCommLib/TisPc.c | 2 +-
.../Pkcs7VerifyDxe/Pkcs7VerifyDxe.c | 18 +-
.../RandomNumberGenerator/RngDxe/RdRand.c | 2 +-
SecurityPkg/SecurityPkg.dec | 18 +-
SecurityPkg/SecurityPkg.dsc | 2 +-
SecurityPkg/SecurityPkg.uni | 12 +-
.../Tcg/MemoryOverwriteControl/TcgMor.c | 26 +--
.../Tcg/MemoryOverwriteControl/TcgMor.inf | 2 +-
.../Tcg/MemoryOverwriteControl/TcgMor.uni | 2 +-
.../TcgMorLock.c | 4 +-
.../TcgMorLock.h | 2 +-
.../TcgMorLock.uni | 4 +-
.../TcgMorLockSmm.c | 2 +-
.../TcgMorLockSmm.inf | 2 +-
.../Tcg/Opal/OpalPassword/OpalDriver.c | 6 +-
.../Tcg/Opal/OpalPassword/OpalDriver.h | 6 +-
SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c | 10 +-
SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h | 8 +-
.../PhysicalPresencePei/PhysicalPresencePei.c | 2 +-
SecurityPkg/Tcg/Tcg2Config/Tcg2Config.vfr | 6 +-
SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDriver.c | 6 +-
SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c | 2 +-
SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c | 10 +-
SecurityPkg/Tcg/Tcg2Config/TpmDetection.c | 6 +-
SecurityPkg/Tcg/Tcg2Dxe/MeasureBootPeCoff.c | 2 +-
SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c | 198 +++++++++---------
SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c | 38 ++--
SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c | 46 ++--
SecurityPkg/Tcg/Tcg2Smm/Tpm.asl | 6 +-
.../Tcg/TcgConfigDxe/TcgConfigDriver.c | 6 +-
SecurityPkg/Tcg/TcgDxe/TcgDxe.c | 34 +--
SecurityPkg/Tcg/TcgPei/TcgPei.c | 26 +--
SecurityPkg/Tcg/TcgSmm/TcgSmm.c | 18 +-
SecurityPkg/Tcg/TcgSmm/Tpm.asl | 6 +-
.../SecureBootConfigDriver.c | 2 +-
.../SecureBootConfigDxe.inf | 2 +-
.../SecureBootConfigDxe.uni | 2 +-
.../SecureBootConfigImpl.c | 48 ++---
.../SecureBootConfigImpl.h | 10 +-
.../SecureBootConfigMisc.c | 8 +-
.../SecureBootConfigNvData.h | 4 +-
.../SecureBootConfigStrings.uni | 4 +-
104 files changed, 615 insertions(+), 615 deletions(-)