[PATCH 0/5] MdePkg, SecurityPkg, OvmfPkg: revert unreviewed SM3 patches

[PATCH 0/5] MdePkg, SecurityPkg, OvmfPkg: revert unreviewed SM3 patches

[Laszlo Ersek]

Repo:   https://github.com/lersek/edk2.git
Branch: revert_unreviewed_bz1781

The MdePkg patch and the OvmfPkg patch committed for
<https://bugzilla.tianocore.org/show_bug.cgi?id=1781> had not been
reviewed appropriately, so they must be reverted. Due to the MdePkg
patch being the basis of the entire series, the SecurityPkg patches in
the middle have to be reverted as well. (Leif pointed out that at least
some of the SecurityPkg patches were not reviewed *on the list* either,
so there's that too.)

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Chao Zhang <chao.b.zhang@intel.com>
Cc: Imran Desai <imran.desai@intel.com>
Cc: Jian Wang <jian.j.wang@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Stefan Berger <stefanb@linux.ibm.com>

Thanks
Laszlo

Laszlo Ersek (5):
  Revert "OvmfPkg: link SM3 support into Tcg2Pei and Tcg2Dxe"
  Revert "SecurityPkg: set SM3 bit in TPM 2.0 hash mask by default"
  Revert "SecurityPkg/HashLibBaseCryptoRouter: recognize the SM3 digest
    algorithm"
  Revert "SecurityPkg: introduce the SM3 digest algorithm"
  Revert "MdePkg/Protocol/Hash: introduce GUID for SM3"

 MdePkg/Include/Protocol/Hash.h                                              |   5 -
 OvmfPkg/OvmfPkgIa32.dsc                                                     |   2 -
 OvmfPkg/OvmfPkgIa32X64.dsc                                                  |   2 -
 OvmfPkg/OvmfPkgX64.dsc                                                      |   2 -
 SecurityPkg/Include/Library/HashLib.h                                       |   1 -
 SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.c                 | 150 --------------------
 SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf               |  41 ------
 SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.uni               |  15 --
 SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterCommon.c |   1 -
 SecurityPkg/SecurityPkg.dec                                                 |   5 +-
 SecurityPkg/SecurityPkg.dsc                                                 |   3 -
 11 files changed, 2 insertions(+), 225 deletions(-)
 delete mode 100644 SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.c
 delete mode 100644 SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
 delete mode 100644 SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.uni

-- 
2.19.1.3.g30247aa5d201

[PATCH 1/5] Revert "OvmfPkg: link SM3 support into Tcg2Pei and Tcg2Dxe"

[Laszlo Ersek]

This reverts commit a7c7d21ffa9ad14b418e728a882df0a9b8815bf6.

The reason is that said commit had not been reviewed by OvmfPkg
maintainers/reviewers, before it was pushed.

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Imran Desai <imran.desai@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Cc: Stefan Berger <stefanb@linux.ibm.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1781
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 OvmfPkg/OvmfPkgIa32.dsc    | 2 --
 OvmfPkg/OvmfPkgIa32X64.dsc | 2 --
 OvmfPkg/OvmfPkgX64.dsc     | 2 --
 3 files changed, 6 deletions(-)

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index d60bcd5e5407..87716123997a 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -625,7 +625,6 @@ [Components]
       NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
-      NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
   }
 !if $(TPM2_CONFIG_ENABLE) == TRUE
   SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
@@ -907,6 +906,5 @@ [Components]
       NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
-      NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
   }
 !endif
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index ded3e8a46478..ad20531ceb8b 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -637,7 +637,6 @@ [Components.IA32]
       NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
-      NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
   }
 !if $(TPM2_CONFIG_ENABLE) == TRUE
   SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
@@ -921,6 +920,5 @@ [Components.X64]
       NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
-      NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
   }
 !endif
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 131f2b0b47da..0542ac2235b4 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -636,7 +636,6 @@ [Components]
       NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
-      NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
   }
 !if $(TPM2_CONFIG_ENABLE) == TRUE
   SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
@@ -919,6 +918,5 @@ [Components]
       NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
-      NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
   }
 !endif
-- 
2.19.1.3.g30247aa5d201

[PATCH 2/5] Revert "SecurityPkg: set SM3 bit in TPM 2.0 hash mask by default"

[Laszlo Ersek]

This reverts commit d5af8fc5a975feb6c745587d0d834733ad2048fd.

The reason is that said commit indirectly depends on commit 49c1e683c452
("MdePkg/Protocol/Hash: introduce GUID for SM3", 2019-07-03), and the
latter commit is going to be reverted, due to its review process not
having followed established edk2 norms.

Cc: Chao Zhang <chao.b.zhang@intel.com>
Cc: Imran Desai <imran.desai@intel.com>
Cc: Jian Wang <jian.j.wang@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1781
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 SecurityPkg/SecurityPkg.dec | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/SecurityPkg/SecurityPkg.dec b/SecurityPkg/SecurityPkg.dec
index d2f6a6fd1293..b9c04a3d13d1 100644
--- a/SecurityPkg/SecurityPkg.dec
+++ b/SecurityPkg/SecurityPkg.dec
@@ -453,10 +453,9 @@ [PcdsDynamic, PcdsDynamicEx]
   #    BIT1  -  SHA256.<BR>
   #    BIT2  -  SHA384.<BR>
   #    BIT3  -  SHA512.<BR>
-  #    BIT4  -  SM3_256.<BR>
   # @Prompt Hash mask for TPM 2.0
-  # @ValidRange 0x80000001 | 0x00000000 - 0x0000001F
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask|0x0000001F|UINT32|0x00010010
+  # @ValidRange 0x80000001 | 0x00000000 - 0x0000000F
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask|0x0000000F|UINT32|0x00010010
 
   ## This PCD indicated final BIOS supported Hash mask.
   #    Bios may choose to register a subset of PcdTpm2HashMask.
-- 
2.19.1.3.g30247aa5d201

[PATCH 3/5] Revert "SecurityPkg/HashLibBaseCryptoRouter: recognize the SM3 digest algorithm"

[Laszlo Ersek]

This reverts commit 542d04e2a4fec0df0340d2ad7b59f011f20d03cc.

The reason is that said commit indirectly depends on commit 49c1e683c452
("MdePkg/Protocol/Hash: introduce GUID for SM3", 2019-07-03), and the
latter commit is going to be reverted, due to its review process not
having followed established edk2 norms.

Cc: Chao Zhang <chao.b.zhang@intel.com>
Cc: Imran Desai <imran.desai@intel.com>
Cc: Jian Wang <jian.j.wang@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1781
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterCommon.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterCommon.c b/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterCommon.c
index aec874a9e072..7f3bdab53066 100644
--- a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterCommon.c
+++ b/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterCommon.c
@@ -25,7 +25,6 @@ TPM2_HASH_MASK mTpm2HashMask[] = {
   {HASH_ALGORITHM_SHA256_GUID,       HASH_ALG_SHA256},
   {HASH_ALGORITHM_SHA384_GUID,       HASH_ALG_SHA384},
   {HASH_ALGORITHM_SHA512_GUID,       HASH_ALG_SHA512},
-  {HASH_ALGORITHM_SM3_256_GUID,      HASH_ALG_SM3_256},
 };
 
 /**
-- 
2.19.1.3.g30247aa5d201

[PATCH 4/5] Revert "SecurityPkg: introduce the SM3 digest algorithm"

[Laszlo Ersek]

This reverts commit 06dd5863b66edd9908834371e07fb4e11383c172.

The reason is that said commit directly depends on commit 49c1e683c452
("MdePkg/Protocol/Hash: introduce GUID for SM3", 2019-07-03), and the
latter commit is going to be reverted, due to its review process not
having followed established edk2 norms.

Cc: Chao Zhang <chao.b.zhang@intel.com>
Cc: Imran Desai <imran.desai@intel.com>
Cc: Jian Wang <jian.j.wang@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1781
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.uni |  15 --
 SecurityPkg/SecurityPkg.dsc                                   |   3 -
 SecurityPkg/Include/Library/HashLib.h                         |   1 -
 SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf |  41 ------
 SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.c   | 150 --------------------
 5 files changed, 210 deletions(-)

diff --git a/SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.uni b/SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.uni
deleted file mode 100644
index 07a5c53d9915..000000000000
--- a/SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.uni
+++ /dev/null
@@ -1,15 +0,0 @@
-// /** @file
-// Provides BaseCrypto SM3 hash service
-//
-// This library can be registered to BaseCrypto router, to serve as hash engine.
-//
-// Copyright (c) 2013 - 2019, Intel Corporation. All rights reserved.<BR>
-// SPDX-License-Identifier: BSD-2-Clause-Patent
-//
-// **/
-
-
-#string STR_MODULE_ABSTRACT             #language en-US "Provides BaseCrypto SM3 hash service"
-
-#string STR_MODULE_DESCRIPTION          #language en-US "This library can be registered to BaseCrypto router, to serve as hash engine."
-
diff --git a/SecurityPkg/SecurityPkg.dsc b/SecurityPkg/SecurityPkg.dsc
index aef2ac3a208d..60f3b0110eb7 100644
--- a/SecurityPkg/SecurityPkg.dsc
+++ b/SecurityPkg/SecurityPkg.dsc
@@ -226,7 +226,6 @@ [Components.IA32, Components.X64]
   SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
   SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
   SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
-  SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
 
   SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf {
     <LibraryClasses>
@@ -241,7 +240,6 @@ [Components.IA32, Components.X64]
       NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
-      NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
   }
 
   SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf {
@@ -252,7 +250,6 @@ [Components.IA32, Components.X64]
       NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
-      NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
       PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
   }
   SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf {
diff --git a/SecurityPkg/Include/Library/HashLib.h b/SecurityPkg/Include/Library/HashLib.h
index a5b433d824a4..63f08398788b 100644
--- a/SecurityPkg/Include/Library/HashLib.h
+++ b/SecurityPkg/Include/Library/HashLib.h
@@ -137,7 +137,6 @@ EFI_STATUS
 #define HASH_ALGORITHM_SHA256_GUID  EFI_HASH_ALGORITHM_SHA256_GUID
 #define HASH_ALGORITHM_SHA384_GUID  EFI_HASH_ALGORITHM_SHA384_GUID
 #define HASH_ALGORITHM_SHA512_GUID  EFI_HASH_ALGORITHM_SHA512_GUID
-#define HASH_ALGORITHM_SM3_256_GUID EFI_HASH_ALGORITHM_SM3_256_GUID
 
 typedef struct {
   EFI_GUID                           HashGuid;
diff --git a/SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf b/SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
deleted file mode 100644
index 781164d74ea0..000000000000
--- a/SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
+++ /dev/null
@@ -1,41 +0,0 @@
-## @file
-#  Provides BaseCrypto SM3 hash service
-#
-#  This library can be registered to BaseCrypto router, to serve as hash engine.
-#
-#  Copyright (c) 2013 - 2019, Intel Corporation. All rights reserved.<BR>
-#  SPDX-License-Identifier: BSD-2-Clause-Patent
-#
-##
-
-[Defines]
-  INF_VERSION                    = 0x00010005
-  BASE_NAME                      = HashInstanceLibSm3
-  MODULE_UNI_FILE                = HashInstanceLibSm3.uni
-  FILE_GUID                      = C5865D5D-9ACE-39FB-DC7C-0511891D40F9
-  MODULE_TYPE                    = BASE
-  VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = NULL
-  CONSTRUCTOR                    = HashInstanceLibSm3Constructor
-
-#
-# The following information is for reference only and not required by the build tools.
-#
-#  VALID_ARCHITECTURES           = IA32 X64
-#
-
-[Sources]
-  HashInstanceLibSm3.c
-
-[Packages]
-  MdePkg/MdePkg.dec
-  SecurityPkg/SecurityPkg.dec
-  CryptoPkg/CryptoPkg.dec
-
-[LibraryClasses]
-  BaseLib
-  BaseMemoryLib
-  DebugLib
-  Tpm2CommandLib
-  MemoryAllocationLib
-  BaseCryptLib
diff --git a/SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.c b/SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.c
deleted file mode 100644
index 8fd95162118a..000000000000
--- a/SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/** @file
-  BaseCrypto SM3 hash instance library.
-  It can be registered to BaseCrypto router, to serve as hash engine.
-
-  Copyright (c) 2013 - 2019, Intel Corporation. All rights reserved.<BR>
-  SPDX-License-Identifier: BSD-2-Clause-Patent
-**/
-
-#include <PiPei.h>
-#include <Library/BaseLib.h>
-#include <Library/BaseMemoryLib.h>
-#include <Library/Tpm2CommandLib.h>
-#include <Library/DebugLib.h>
-#include <Library/BaseCryptLib.h>
-#include <Library/MemoryAllocationLib.h>
-#include <Library/HashLib.h>
-
-/**
-  The function set SM3 to digest list.
-
-  @param DigestList   digest list
-  @param Sm3Digest    SM3 digest
-**/
-VOID
-Tpm2SetSm3ToDigestList (
-  IN TPML_DIGEST_VALUES *DigestList,
-  IN UINT8              *Sm3Digest
-  )
-{
-  DigestList->count = 1;
-  DigestList->digests[0].hashAlg = TPM_ALG_SM3_256;
-  CopyMem (
-    DigestList->digests[0].digest.sm3_256,
-    Sm3Digest,
-    SM3_256_DIGEST_SIZE
-    );
-}
-
-/**
-  Start hash sequence.
-
-  @param HashHandle Hash handle.
-
-  @retval EFI_SUCCESS          Hash sequence start and HandleHandle returned.
-  @retval EFI_OUT_OF_RESOURCES No enough resource to start hash.
-**/
-EFI_STATUS
-EFIAPI
-Sm3HashInit (
-  OUT HASH_HANDLE    *HashHandle
-  )
-{
-  VOID     *Sm3Ctx;
-  UINTN    CtxSize;
-
-  CtxSize = Sm3GetContextSize ();
-  Sm3Ctx = AllocatePool (CtxSize);
-  if (Sm3Ctx == NULL) {
-    return EFI_OUT_OF_RESOURCES;
-  }
-
-  Sm3Init (Sm3Ctx);
-
-  *HashHandle = (HASH_HANDLE)Sm3Ctx;
-
-  return EFI_SUCCESS;
-}
-
-/**
-  Update hash sequence data.
-
-  @param HashHandle    Hash handle.
-  @param DataToHash    Data to be hashed.
-  @param DataToHashLen Data size.
-
-  @retval EFI_SUCCESS     Hash sequence updated.
-**/
-EFI_STATUS
-EFIAPI
-Sm3HashUpdate (
-  IN HASH_HANDLE    HashHandle,
-  IN VOID           *DataToHash,
-  IN UINTN          DataToHashLen
-  )
-{
-  VOID     *Sm3Ctx;
-
-  Sm3Ctx = (VOID *)HashHandle;
-  Sm3Update (Sm3Ctx, DataToHash, DataToHashLen);
-
-  return EFI_SUCCESS;
-}
-
-/**
-  Complete hash sequence complete.
-
-  @param HashHandle    Hash handle.
-  @param DigestList    Digest list.
-
-  @retval EFI_SUCCESS     Hash sequence complete and DigestList is returned.
-**/
-EFI_STATUS
-EFIAPI
-Sm3HashFinal (
-  IN HASH_HANDLE         HashHandle,
-  OUT TPML_DIGEST_VALUES *DigestList
-  )
-{
-  UINT8         Digest[SM3_256_DIGEST_SIZE];
-  VOID          *Sm3Ctx;
-
-  Sm3Ctx = (VOID *)HashHandle;
-  Sm3Final (Sm3Ctx, Digest);
-
-  FreePool (Sm3Ctx);
-
-  Tpm2SetSm3ToDigestList (DigestList, Digest);
-
-  return EFI_SUCCESS;
-}
-
-HASH_INTERFACE  mSm3InternalHashInstance = {
-  HASH_ALGORITHM_SM3_256_GUID,
-  Sm3HashInit,
-  Sm3HashUpdate,
-  Sm3HashFinal,
-};
-
-/**
-  The function register SM3 instance.
-
-  @retval EFI_SUCCESS   SM3 instance is registered, or system dose not support register SM3 instance
-**/
-EFI_STATUS
-EFIAPI
-HashInstanceLibSm3Constructor (
-  VOID
-  )
-{
-  EFI_STATUS  Status;
-
-  Status = RegisterHashInterfaceLib (&mSm3InternalHashInstance);
-  if ((Status == EFI_SUCCESS) || (Status == EFI_UNSUPPORTED)) {
-    //
-    // Unsupported means platform policy does not need this instance enabled.
-    //
-    return EFI_SUCCESS;
-  }
-  return Status;
-}
-- 
2.19.1.3.g30247aa5d201

[PATCH 5/5] Revert "MdePkg/Protocol/Hash: introduce GUID for SM3"

[Laszlo Ersek]

This reverts commit 49c1e683c452f68c7315454280d81449f7d94d2b.

The reason is that said commit had not been reviewed by MdePkg
maintainers, before it was pushed.

Cc: Imran Desai <imran.desai@intel.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1781
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 MdePkg/Include/Protocol/Hash.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/MdePkg/Include/Protocol/Hash.h b/MdePkg/Include/Protocol/Hash.h
index 8abf1a4fa305..931d7916ef1e 100644
--- a/MdePkg/Include/Protocol/Hash.h
+++ b/MdePkg/Include/Protocol/Hash.h
@@ -48,11 +48,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
     0xcaa4381e, 0x750c, 0x4770, {0xb8, 0x70, 0x7a, 0x23, 0xb4, 0xe4, 0x21, 0x30 } \
   }
 
-#define EFI_HASH_ALGORITHM_SM3_256_GUID \
-  { \
-    0x251C7818, 0x0DBF, 0xE619, { 0x7F, 0xC2, 0xD6, 0xAC, 0x43, 0x42, 0x7D, 0xA3 } \
-  }
-
 #define EFI_HASH_ALGORTIHM_MD5_GUID \
   { \
     0xaf7c79c, 0x65b5, 0x4319, {0xb0, 0xae, 0x44, 0xec, 0x48, 0x4e, 0x4a, 0xd7 } \
-- 
2.19.1.3.g30247aa5d201

Re: [edk2-devel] [PATCH 0/5] MdePkg, SecurityPkg, OvmfPkg: revert unreviewed SM3 patches

[Leif Lindholm]

On Thu, Jul 04, 2019 at 11:46:19AM +0200, Laszlo Ersek wrote:
> Repo:   https://github.com/lersek/edk2.git
> Branch: revert_unreviewed_bz1781
> 
> The MdePkg patch and the OvmfPkg patch committed for
> <https://bugzilla.tianocore.org/show_bug.cgi?id=1781> had not been
> reviewed appropriately, so they must be reverted. Due to the MdePkg
> patch being the basis of the entire series, the SecurityPkg patches in
> the middle have to be reverted as well. (Leif pointed out that at least
> some of the SecurityPkg patches were not reviewed *on the list* either,
> so there's that too.)
> 
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Chao Zhang <chao.b.zhang@intel.com>
> Cc: Imran Desai <imran.desai@intel.com>
> Cc: Jian Wang <jian.j.wang@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Stefan Berger <stefanb@linux.ibm.com>
> 
> Thanks
> Laszlo
> 
> Laszlo Ersek (5):
>   Revert "OvmfPkg: link SM3 support into Tcg2Pei and Tcg2Dxe"
>   Revert "SecurityPkg: set SM3 bit in TPM 2.0 hash mask by default"
>   Revert "SecurityPkg/HashLibBaseCryptoRouter: recognize the SM3 digest
>     algorithm"
>   Revert "SecurityPkg: introduce the SM3 digest algorithm"
>   Revert "MdePkg/Protocol/Hash: introduce GUID for SM3"

For the series:
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

>  MdePkg/Include/Protocol/Hash.h                                              |   5 -
>  OvmfPkg/OvmfPkgIa32.dsc                                                     |   2 -
>  OvmfPkg/OvmfPkgIa32X64.dsc                                                  |   2 -
>  OvmfPkg/OvmfPkgX64.dsc                                                      |   2 -
>  SecurityPkg/Include/Library/HashLib.h                                       |   1 -
>  SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.c                 | 150 --------------------
>  SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf               |  41 ------
>  SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.uni               |  15 --
>  SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterCommon.c |   1 -
>  SecurityPkg/SecurityPkg.dec                                                 |   5 +-
>  SecurityPkg/SecurityPkg.dsc                                                 |   3 -
>  11 files changed, 2 insertions(+), 225 deletions(-)
>  delete mode 100644 SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.c
>  delete mode 100644 SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
>  delete mode 100644 SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.uni
> 
> -- 
> 2.19.1.3.g30247aa5d201
> 
> 
> 
> 

Re: [edk2-devel] [PATCH 0/5] MdePkg, SecurityPkg, OvmfPkg: revert unreviewed SM3 patches

[Philippe Mathieu-Daudé]

On 7/4/19 11:46 AM, Laszlo Ersek wrote:
> Repo:   https://github.com/lersek/edk2.git
> Branch: revert_unreviewed_bz1781
> 
> The MdePkg patch and the OvmfPkg patch committed for
> <https://bugzilla.tianocore.org/show_bug.cgi?id=1781> had not been
> reviewed appropriately, so they must be reverted. Due to the MdePkg
> patch being the basis of the entire series, the SecurityPkg patches in
> the middle have to be reverted as well. (Leif pointed out that at least
> some of the SecurityPkg patches were not reviewed *on the list* either,
> so there's that too.)
> 
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Chao Zhang <chao.b.zhang@intel.com>
> Cc: Imran Desai <imran.desai@intel.com>
> Cc: Jian Wang <jian.j.wang@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Stefan Berger <stefanb@linux.ibm.com>
> 
> Thanks
> Laszlo
> 
> Laszlo Ersek (5):
>   Revert "OvmfPkg: link SM3 support into Tcg2Pei and Tcg2Dxe"
>   Revert "SecurityPkg: set SM3 bit in TPM 2.0 hash mask by default"
>   Revert "SecurityPkg/HashLibBaseCryptoRouter: recognize the SM3 digest
>     algorithm"
>   Revert "SecurityPkg: introduce the SM3 digest algorithm"
>   Revert "MdePkg/Protocol/Hash: introduce GUID for SM3"

Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>

Re: [edk2-devel] [PATCH 0/5] MdePkg, SecurityPkg, OvmfPkg: revert unreviewed SM3 patches

[Laszlo Ersek]

On 07/04/19 11:46, Laszlo Ersek wrote:
> Repo:   https://github.com/lersek/edk2.git
> Branch: revert_unreviewed_bz1781
> 
> The MdePkg patch and the OvmfPkg patch committed for
> <https://bugzilla.tianocore.org/show_bug.cgi?id=1781> had not been
> reviewed appropriately, so they must be reverted. Due to the MdePkg
> patch being the basis of the entire series, the SecurityPkg patches in
> the middle have to be reverted as well. (Leif pointed out that at least
> some of the SecurityPkg patches were not reviewed *on the list* either,
> so there's that too.)

I've now pushed this series (commit range 1ec05b81e59f..6a34c1ce7054),
with Leif's (as a steward's) R-b, and Phil's R-b.

If these patches had been normal patches, obviously I would have waited
for package maintainer review. However, these are *not* normal patches;
they are reverts which return the tree to an earlier state -- to a state
where unreviewed patches had not gone in yet. There's an argument to be
made that Jian should have reverted the original patches without me
having to post a revert series to the list at all -- either way, this
has been urgent because the delta with the unreviewed patches "in"
should be as minimal as possible. (Which is why I took it upon me to
send the set.) For example, a bisection should preferably not hit the
unreviewed range (good point from Leif). Furthermore, if we diverge too
much meanwhile, then the reverts themselves could become messy.

Imran: please resubmit your patches now. Please pay attention to shallow
threading, and to actually working CC's. Regarding the SecurityPkg
patches, if you are going to post them unchanged, please preserve the
Reviewed-by tags from the SecurityPkg maintainers, but *ONLY IF* those
Reviewed-by tags had been given publicly, on the list. (In other words,
if they can be found in the mailing list archive.)

Thanks
Laszlo

Re: [edk2-devel] [PATCH 0/5] MdePkg, SecurityPkg, OvmfPkg: revert unreviewed SM3 patches

[Philippe Mathieu-Daudé]

On 7/4/19 6:05 PM, Laszlo Ersek wrote:
> On 07/04/19 11:46, Laszlo Ersek wrote:
>> Repo:   https://github.com/lersek/edk2.git
>> Branch: revert_unreviewed_bz1781
>>
>> The MdePkg patch and the OvmfPkg patch committed for
>> <https://bugzilla.tianocore.org/show_bug.cgi?id=1781> had not been
>> reviewed appropriately, so they must be reverted. Due to the MdePkg
>> patch being the basis of the entire series, the SecurityPkg patches in
>> the middle have to be reverted as well. (Leif pointed out that at least
>> some of the SecurityPkg patches were not reviewed *on the list* either,
>> so there's that too.)
> 
> I've now pushed this series (commit range 1ec05b81e59f..6a34c1ce7054),
> with Leif's (as a steward's) R-b, and Phil's R-b.
> 
> If these patches had been normal patches, obviously I would have waited
> for package maintainer review. However, these are *not* normal patches;
> they are reverts which return the tree to an earlier state -- to a state
> where unreviewed patches had not gone in yet. There's an argument to be
> made that Jian should have reverted the original patches without me
> having to post a revert series to the list at all -- either way, this
> has been urgent because the delta with the unreviewed patches "in"
> should be as minimal as possible. (Which is why I took it upon me to
> send the set.) For example, a bisection should preferably not hit the
> unreviewed range (good point from Leif). Furthermore, if we diverge too
> much meanwhile, then the reverts themselves could become messy.

Agreed, this is why I wanted this merged quickly, thanks.

> Imran: please resubmit your patches now. Please pay attention to shallow
> threading, and to actually working CC's. Regarding the SecurityPkg
> patches, if you are going to post them unchanged, please preserve the
> Reviewed-by tags from the SecurityPkg maintainers, but *ONLY IF* those
> Reviewed-by tags had been given publicly, on the list. (In other words,
> if they can be found in the mailing list archive.)
> 
> Thanks
> Laszlo

Re: [edk2-devel] [PATCH 0/5] MdePkg, SecurityPkg, OvmfPkg: revert unreviewed SM3 patches

[Wang, Jian J]

Hi Laszlo,

> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Laszlo Ersek
> Sent: Friday, July 05, 2019 12:05 AM
> To: edk2-devel-groups-io <devel@edk2.groups.io>; Desai, Imran
> <imran.desai@intel.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>; Zhang, Chao B
> <chao.b.zhang@intel.com>; Wang, Jian J <jian.j.wang@intel.com>; Yao,
> Jiewen <jiewen.yao@intel.com>; Justen, Jordan L
> <jordan.l.justen@intel.com>; Leif Lindholm <leif.lindholm@linaro.org>; Gao,
> Liming <liming.gao@intel.com>; Marc-André Lureau
> <marcandre.lureau@redhat.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>; Stefan Berger <stefanb@linux.ibm.com>
> Subject: Re: [edk2-devel] [PATCH 0/5] MdePkg, SecurityPkg, OvmfPkg:
> revert unreviewed SM3 patches
> 
> On 07/04/19 11:46, Laszlo Ersek wrote:
> > Repo:   https://github.com/lersek/edk2.git
> > Branch: revert_unreviewed_bz1781
> >
> > The MdePkg patch and the OvmfPkg patch committed for
> > <https://bugzilla.tianocore.org/show_bug.cgi?id=1781> had not been
> > reviewed appropriately, so they must be reverted. Due to the MdePkg
> > patch being the basis of the entire series, the SecurityPkg patches in
> > the middle have to be reverted as well. (Leif pointed out that at least
> > some of the SecurityPkg patches were not reviewed *on the list* either,
> > so there's that too.)
> 
> I've now pushed this series (commit range 1ec05b81e59f..6a34c1ce7054),
> with Leif's (as a steward's) R-b, and Phil's R-b.
> 
> If these patches had been normal patches, obviously I would have waited
> for package maintainer review. However, these are *not* normal patches;
> they are reverts which return the tree to an earlier state -- to a state
> where unreviewed patches had not gone in yet. There's an argument to be
> made that Jian should have reverted the original patches without me
> having to post a revert series to the list at all -- either way, this
> has been urgent because the delta with the unreviewed patches "in"
> should be as minimal as possible. (Which is why I took it upon me to
> send the set.) For example, a bisection should preferably not hit the
> unreviewed range (good point from Leif). Furthermore, if we diverge too
> much meanwhile, then the reverts themselves could become messy.
> 

Understood. Thanks for doing this for me.

Regards,
Jian

> Imran: please resubmit your patches now. Please pay attention to shallow
> threading, and to actually working CC's. Regarding the SecurityPkg
> patches, if you are going to post them unchanged, please preserve the
> Reviewed-by tags from the SecurityPkg maintainers, but *ONLY IF* those
> Reviewed-by tags had been given publicly, on the list. (In other words,
> if they can be found in the mailing list archive.)
> 
> Thanks
> Laszlo
> 
>