From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: imran.desai@intel.com) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by groups.io with SMTP; Tue, 28 May 2019 13:40:47 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 May 2019 13:40:46 -0700 X-ExtLoop1: 1 Received: from idesai-mac01.ch.intel.com ([10.78.25.143]) by fmsmga001.fm.intel.com with ESMTP; 28 May 2019 13:40:46 -0700 From: Imran Desai To: devel@edk2.groups.io Subject: [PATCH v2 4/5] SecurityPkg: set SM3 bit in TPM 2.0 hash mask by default Date: Tue, 28 May 2019 13:40:48 -0700 Message-Id: <20190528204049.86463-5-imran.desai@intel.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20190528204049.86463-1-imran.desai@intel.com> References: <20190528204049.86463-1-imran.desai@intel.com> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1781 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. Signed-off-by: Imran Desai Cc: Chao Zhang Cc: Jiewen Yao Cc: Jian Wang --- SecurityPkg/SecurityPkg.dec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/SecurityPkg/SecurityPkg.dec b/SecurityPkg/SecurityPkg.dec index 3314f1854be4..fa3a4fcf5869 100644 --- a/SecurityPkg/SecurityPkg.dec +++ b/SecurityPkg/SecurityPkg.dec @@ -438,9 +438,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