]> git.proxmox.com Git - mirror_edk2.git/commitdiff
SecurityPkg/DxeImageVerificationLib: Disable SHA1 base on MACRO
authorZhichao Gao <zhichao.gao@intel.com>
Thu, 27 Aug 2020 07:48:59 +0000 (15:48 +0800)
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Mon, 7 Sep 2020 02:38:42 +0000 (02:38 +0000)
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2943

Disable SHA1 base on the MACRO DISABLE_SHA1_DEPRECATED_INTERFACES.
SHA1 is deprecated function and the MACRO is used to remove the whole
implementation of the SHA1. For the platforms that do not need SHA1
for security, the MACRO should works for DxeImageVerificationLib as
well.

Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Min Xu <min.m.xu@intel.com>
Cc: Qi Zhang <qi1.zhang@intel.com>
Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>
SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c

index 11154b6cc58aee2184bf979454fa0ed7ebde9d87..c48861cd64961c31e6c824b799876cb9af89b51c 100644 (file)
@@ -59,7 +59,11 @@ UINT8 mHashOidValue[] = {
   };\r
 \r
 HASH_TABLE mHash[] = {\r
+#ifndef DISABLE_SHA1_DEPRECATED_INTERFACES\r
   { L"SHA1",   20, &mHashOidValue[0],  5, Sha1GetContextSize,   Sha1Init,   Sha1Update,   Sha1Final  },\r
+#else\r
+  { L"SHA1",   20, &mHashOidValue[0],  5, NULL,                 NULL,       NULL,         NULL       },\r
+#endif\r
   { L"SHA224", 28, &mHashOidValue[5],  9, NULL,                 NULL,       NULL,         NULL       },\r
   { L"SHA256", 32, &mHashOidValue[14], 9, Sha256GetContextSize, Sha256Init, Sha256Update, Sha256Final},\r
   { L"SHA384", 48, &mHashOidValue[23], 9, Sha384GetContextSize, Sha384Init, Sha384Update, Sha384Final},\r
@@ -315,10 +319,12 @@ HashPeImage (
   ZeroMem (mImageDigest, MAX_DIGEST_SIZE);\r
 \r
   switch (HashAlg) {\r
+#ifndef DISABLE_SHA1_DEPRECATED_INTERFACES\r
   case HASHALG_SHA1:\r
     mImageDigestSize = SHA1_DIGEST_SIZE;\r
     mCertType        = gEfiCertSha1Guid;\r
     break;\r
+#endif\r
 \r
   case HASHALG_SHA256:\r
     mImageDigestSize = SHA256_DIGEST_SIZE;\r