From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: imran.desai@intel.com) Received: from mga03.intel.com (mga03.intel.com []) by groups.io with SMTP; Fri, 12 Jul 2019 17:47:05 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Jul 2019 17:47:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,484,1557212400"; d="scan'208";a="160544051" Received: from mariengu-mobl.amr.corp.intel.com ([10.252.129.197]) by orsmga008.jf.intel.com with ESMTP; 12 Jul 2019 17:47:04 -0700 From: "Imran Desai" To: devel@edk2.groups.io Cc: Chao Zhang , Jiewen Yao , Jian Wang Subject: [PATCH v6 4/5] SecurityPkg: set SM3 bit in TPM 2.0 hash mask by default Date: Fri, 12 Jul 2019 17:47:00 -0700 Message-Id: <20190713004701.78253-5-imran.desai@intel.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20190713004701.78253-1-imran.desai@intel.com> References: <20190713004701.78253-1-imran.desai@intel.com> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1781 GITHUB: https://github.com/idesai/edk2/tree/enable_sm3_measured_boot_v6 EDK2 Support for SM3 digest algorithm is needed to enable TPM with SM3 PCR banks. This digest algorithm is part of the China Crypto algorithm suite. This integration has dependency on the openssl_1_1_1b integration into edk2. This patch sets SM3 bit in TPM2.0 hash mask by default. Cc: Chao Zhang Cc: Jiewen Yao Cc: Jian Wang Signed-off-by: Imran Desai Reviewed-by: Jian J Wang --- SecurityPkg/SecurityPkg.dec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/SecurityPkg/SecurityPkg.dec b/SecurityPkg/SecurityPkg.dec index b9c04a3d13d1..d2f6a6fd1293 100644 --- a/SecurityPkg/SecurityPkg.dec +++ b/SecurityPkg/SecurityPkg.dec @@ -453,9 +453,10 @@ [PcdsDynamic, PcdsDynamicEx] # BIT1 - SHA256.
# BIT2 - SHA384.
# BIT3 - SHA512.
+ # BIT4 - SM3_256.
# @Prompt Hash mask for TPM 2.0 - # @ValidRange 0x80000001 | 0x00000000 - 0x0000000F - gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask|0x0000000F|UINT32|0x00010010 + # @ValidRange 0x80000001 | 0x00000000 - 0x0000001F + gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask|0x0000001F|UINT32|0x00010010 ## This PCD indicated final BIOS supported Hash mask. # Bios may choose to register a subset of PcdTpm2HashMask. -- 2.17.0