From nobody Fri Apr 19 17:03:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+105296+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+105296+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1684992203; cv=none; d=zohomail.com; s=zohoarc; b=mMLFXi62pj4iW7NjIEpI9FJP6t0myNaIzMPP7lpQltV4EM84kfnnwsl6XS4YDK3SILBZg/O4M6WloRdXYvTa9dlX7irgpVAmAifOjCPuHisCWnBD4mJlh22mtalV85ZGy0VVVmbie99y7YnjmO81kKf/QjcRroUOaW57Gjr32Qk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684992203; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=/Jz8Hf9HZAoXfZPyKJ9A2j7zLKJvLCQmrLAqJ5P8ELw=; b=cM80zXGHAPwDlOQ8z0YBRzCW7EGc9HbDl/2ZztOZC+CWQd/J+c9G4sLhGpQv1sd0ly1p+XOG3C6F2BCOZV/syvQ+6G07wG6yO5tU3tyRQojaCyFE3nBmdHrd454rDZ7nSx3HuPJyQohk5eo0bZZo8UeoVzyddR7nA62o2Vizc7I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+105296+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1684992203325350.5506416878203; Wed, 24 May 2023 22:23:23 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id Za0eYY1788612xOATqE3Sbib; Wed, 24 May 2023 22:23:22 -0700 X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web11.5226.1684992201628739504 for ; Wed, 24 May 2023 22:23:22 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10720"; a="338361396" X-IronPort-AV: E=Sophos;i="6.00,190,1681196400"; d="scan'208";a="338361396" X-Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 May 2023 22:23:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10720"; a="737574163" X-IronPort-AV: E=Sophos;i="6.00,190,1681196400"; d="scan'208";a="737574163" X-Received: from shwdesssddpdwei.ccr.corp.intel.com ([10.239.157.28]) by orsmga001.jf.intel.com with ESMTP; 24 May 2023 22:23:18 -0700 From: "Sheng Wei" To: devel@edk2.groups.io Cc: Jiewen Yao , Jian J Wang , Min Xu , Zeyi Chen , Fiona Wang Subject: [edk2-devel] [PATCH] SecurityPkg/SecureBoot: Support RSA 512 and RSA 384 Date: Thu, 25 May 2023 13:23:16 +0800 Message-Id: <20230525052316.512-1-w.sheng@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,w.sheng@intel.com X-Gm-Message-State: Wn40DOmTs9D3FNWU8v9tTwFSx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1684992202; bh=EihYJ6bu1lyUEi2qHfVVCWT+7AvQBc3PVSMhfRPGhvg=; h=Cc:Date:From:Reply-To:Subject:To; b=q5TiFqjwOXiw6CUnU/mwQ7SZ1boU3nk5P9KHu2yzotQCYvuS1owAiLLwuT9fGz6Ik3m eqafwA4EgpyOBVPJzn7lhE2giLy6PwxwMHGmjbYg2ennzWQBhy6+shomg8rAVWuTD4PPV VXYaDGL7noamt6Se4OVsp4yMOgqjnw3YAnU= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1684992204919100003 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3413 Cc: Jiewen Yao Cc: Jian J Wang Cc: Min Xu Cc: Zeyi Chen Cc: Fiona Wang Signed-off-by: Sheng Wei --- CryptoPkg/Library/BaseCryptLib/Pk/CryptTs.c | 3 +- MdePkg/Include/Guid/ImageAuthentication.h | 26 ++ MdePkg/MdePkg.dec | 2 + .../Library/AuthVariableLib/AuthService.c | 272 ++++++++++++++++-- .../Library/AuthVariableLib/AuthVariableLib.c | 4 +- .../DxeImageVerificationLib.c | 35 ++- .../DxeImageVerificationLib.inf | 1 + SecurityPkg/SecurityPkg.dec | 7 + .../SecureBootConfigDxe.inf | 19 ++ .../SecureBootConfigImpl.c | 122 +++++++- .../SecureBootConfigImpl.h | 2 + .../SecureBootConfigStrings.uni | 6 + 12 files changed, 463 insertions(+), 36 deletions(-) diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptTs.c b/CryptoPkg/Librar= y/BaseCryptLib/Pk/CryptTs.c index 027dbb6842..944bcf8d38 100644 --- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptTs.c +++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptTs.c @@ -591,7 +591,8 @@ ImageTimestampVerify ( // Register & Initialize necessary digest algorithms for PKCS#7 Handling. // if ((EVP_add_digest (EVP_md5 ()) =3D=3D 0) || (EVP_add_digest (EVP_sha1 = ()) =3D=3D 0) || - (EVP_add_digest (EVP_sha256 ()) =3D=3D 0) || ((EVP_add_digest_alias = (SN_sha1WithRSAEncryption, SN_sha1WithRSA)) =3D=3D 0)) + (EVP_add_digest (EVP_sha256 ()) =3D=3D 0) || (EVP_add_digest (EVP_sh= a384 ()) =3D=3D 0) || + (EVP_add_digest (EVP_sha512 ()) =3D=3D 0) || ((EVP_add_digest_alias = (SN_sha1WithRSAEncryption, SN_sha1WithRSA)) =3D=3D 0)) { return FALSE; } diff --git a/MdePkg/Include/Guid/ImageAuthentication.h b/MdePkg/Include/Gui= d/ImageAuthentication.h index fe83596571..c8ea2c14fb 100644 --- a/MdePkg/Include/Guid/ImageAuthentication.h +++ b/MdePkg/Include/Guid/ImageAuthentication.h @@ -144,6 +144,30 @@ typedef struct { 0x3c5766e8, 0x269c, 0x4e34, {0xaa, 0x14, 0xed, 0x77, 0x6e, 0x85, 0xb3,= 0xb6} \ } =20 +/// +/// This identifies a signature containing an RSA-3072 key. The key (only = the modulus +/// since the public key exponent is known to be 0x10001) shall be stored = in big-endian +/// order. +/// The SignatureHeader size shall always be 0. The SignatureSize shall al= ways be 16 (size +/// of SignatureOwner component) + 384 bytes. +/// +#define EFI_CERT_RSA3072_GUID \ + { \ + 0xedd320c2, 0xb057, 0x4b8e, {0xad, 0x46, 0x2c, 0x9b, 0x85, 0x89, 0xee,= 0x92 } \ + } + +/// +/// This identifies a signature containing an RSA-4096 key. The key (only = the modulus +/// since the public key exponent is known to be 0x10001) shall be stored = in big-endian +/// order. +/// The SignatureHeader size shall always be 0. The SignatureSize shall al= ways be 16 (size +/// of SignatureOwner component) + 512 bytes. +/// +#define EFI_CERT_RSA4096_GUID \ + { \ + 0xb23e89a6, 0x8c8b, 0x4412, {0x85, 0x73, 0x15, 0x4e, 0x8d, 0x00, 0x98,= 0x2c } \ + } + /// /// This identifies a signature containing a RSA-2048 signature of a SHA-2= 56 hash. The /// SignatureHeader size shall always be 0. The SignatureSize shall always= be 16 (size of @@ -330,6 +354,8 @@ typedef struct { extern EFI_GUID gEfiImageSecurityDatabaseGuid; extern EFI_GUID gEfiCertSha256Guid; extern EFI_GUID gEfiCertRsa2048Guid; +extern EFI_GUID gEfiCertRsa3072Guid; +extern EFI_GUID gEfiCertRsa4096Guid; extern EFI_GUID gEfiCertRsa2048Sha256Guid; extern EFI_GUID gEfiCertSha1Guid; extern EFI_GUID gEfiCertRsa2048Sha1Guid; diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec index 80b6559053..782f6d184d 100644 --- a/MdePkg/MdePkg.dec +++ b/MdePkg/MdePkg.dec @@ -562,6 +562,8 @@ gEfiImageSecurityDatabaseGuid =3D { 0xd719b2cb, 0x3d3a, 0x4596, {0xa3, = 0xbc, 0xda, 0xd0, 0xe, 0x67, 0x65, 0x6f }} gEfiCertSha256Guid =3D { 0xc1c41626, 0x504c, 0x4092, {0xac, = 0xa9, 0x41, 0xf9, 0x36, 0x93, 0x43, 0x28 }} gEfiCertRsa2048Guid =3D { 0x3c5766e8, 0x269c, 0x4e34, {0xaa, = 0x14, 0xed, 0x77, 0x6e, 0x85, 0xb3, 0xb6 }} + gEfiCertRsa3072Guid =3D { 0xedd320c2, 0xb057, 0x4b8e, {0xad, = 0x46, 0x2c, 0x9b, 0x85, 0x89, 0xee, 0x92 }} + gEfiCertRsa4096Guid =3D { 0xb23e89a6, 0x8c8b, 0x4412, {0x85, = 0x73, 0x15, 0x4e, 0x8d, 0x00, 0x98, 0x2c }} gEfiCertRsa2048Sha256Guid =3D { 0xe2b36190, 0x879b, 0x4a3d, {0xad, = 0x8d, 0xf2, 0xe7, 0xbb, 0xa3, 0x27, 0x84 }} gEfiCertSha1Guid =3D { 0x826ca512, 0xcf10, 0x4ac9, {0xb1, = 0x87, 0xbe, 0x1, 0x49, 0x66, 0x31, 0xbd }} gEfiCertRsa2048Sha1Guid =3D { 0x67f8444f, 0x8743, 0x48f1, {0xa3, = 0x28, 0x1e, 0xaa, 0xb8, 0x73, 0x60, 0x80 }} diff --git a/SecurityPkg/Library/AuthVariableLib/AuthService.c b/SecurityPk= g/Library/AuthVariableLib/AuthService.c index 452ed491ea..288e44a359 100644 --- a/SecurityPkg/Library/AuthVariableLib/AuthService.c +++ b/SecurityPkg/Library/AuthVariableLib/AuthService.c @@ -29,12 +29,16 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include #include =20 +#define SHA_DIGEST_SIZE_MAX SHA512_DIGEST_SIZE + // // Public Exponent of RSA Key. // CONST UINT8 mRsaE[] =3D { 0x01, 0x00, 0x01 }; =20 CONST UINT8 mSha256OidValue[] =3D { 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0= x04, 0x02, 0x01 }; +CONST UINT8 mSha384OidValue[] =3D { 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0= x04, 0x02, 0x02 }; +CONST UINT8 mSha512OidValue[] =3D { 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0= x04, 0x02, 0x03 }; =20 // // Requirement for different signature type which have been defined in UEF= I spec. @@ -44,6 +48,8 @@ EFI_SIGNATURE_ITEM mSupportSigItem[] =3D { // {SigType, SigHeaderSize, SigDataSize } { EFI_CERT_SHA256_GUID, 0, 32 }, { EFI_CERT_RSA2048_GUID, 0, 256 }, + { EFI_CERT_RSA3072_GUID, 0, 384 }, + { EFI_CERT_RSA4096_GUID, 0, 512 }, { EFI_CERT_RSA2048_SHA256_GUID, 0, 256 }, { EFI_CERT_SHA1_GUID, 0, 20 }, { EFI_CERT_RSA2048_SHA1_GUID, 0, 256 }, @@ -1172,6 +1178,172 @@ CalculatePrivAuthVarSignChainSHA256Digest ( return EFI_SUCCESS; } =20 +/** + Calculate SHA38 digest of SignerCert CommonName + ToplevelCert tbsCertif= icate + SignerCert and ToplevelCert are inside the signer certificate chain. + + @param[in] SignerCert A pointer to SignerCert data. + @param[in] SignerCertSize Length of SignerCert data. + @param[in] TopLevelCert A pointer to TopLevelCert data. + @param[in] TopLevelCertSize Length of TopLevelCert data. + @param[out] Sha384Digest Sha384 digest calculated. + + @return EFI_ABORTED Digest process failed. + @return EFI_SUCCESS SHA384 Digest is successfully calculated. + +**/ +EFI_STATUS +CalculatePrivAuthVarSignChainSHA384Digest ( + IN UINT8 *SignerCert, + IN UINTN SignerCertSize, + IN UINT8 *TopLevelCert, + IN UINTN TopLevelCertSize, + OUT UINT8 *Sha384Digest + ) +{ + UINT8 *TbsCert; + UINTN TbsCertSize; + CHAR8 CertCommonName[128]; + UINTN CertCommonNameSize; + BOOLEAN CryptoStatus; + EFI_STATUS Status; + + CertCommonNameSize =3D sizeof (CertCommonName); + + // + // Get SignerCert CommonName + // + Status =3D X509GetCommonName (SignerCert, SignerCertSize, CertCommonName= , &CertCommonNameSize); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_INFO, "%a Get SignerCert CommonName failed with status %= x\n", __FUNCTION__, Status)); + return EFI_ABORTED; + } + + // + // Get TopLevelCert tbsCertificate + // + if (!X509GetTBSCert (TopLevelCert, TopLevelCertSize, &TbsCert, &TbsCertS= ize)) { + DEBUG ((DEBUG_INFO, "%a Get Top-level Cert tbsCertificate failed!\n", = __FUNCTION__)); + return EFI_ABORTED; + } + + // + // Digest SignerCert CN + TopLevelCert tbsCertificate + // + ZeroMem (Sha384Digest, SHA384_DIGEST_SIZE); + CryptoStatus =3D Sha384Init (mHashCtx); + if (!CryptoStatus) { + return EFI_ABORTED; + } + + // + // '\0' is forced in CertCommonName. No overflow issue + // + CryptoStatus =3D Sha384Update ( + mHashCtx, + CertCommonName, + AsciiStrLen (CertCommonName) + ); + if (!CryptoStatus) { + return EFI_ABORTED; + } + + CryptoStatus =3D Sha384Update (mHashCtx, TbsCert, TbsCertSize); + if (!CryptoStatus) { + return EFI_ABORTED; + } + + CryptoStatus =3D Sha384Final (mHashCtx, Sha384Digest); + if (!CryptoStatus) { + return EFI_ABORTED; + } + + return EFI_SUCCESS; +} + +/** + Calculate SHA512 digest of SignerCert CommonName + ToplevelCert tbsCerti= ficate + SignerCert and ToplevelCert are inside the signer certificate chain. + + @param[in] SignerCert A pointer to SignerCert data. + @param[in] SignerCertSize Length of SignerCert data. + @param[in] TopLevelCert A pointer to TopLevelCert data. + @param[in] TopLevelCertSize Length of TopLevelCert data. + @param[out] Sha512Digest Sha512 digest calculated. + + @return EFI_ABORTED Digest process failed. + @return EFI_SUCCESS SHA512 Digest is successfully calculated. + +**/ +EFI_STATUS +CalculatePrivAuthVarSignChainSHA512Digest ( + IN UINT8 *SignerCert, + IN UINTN SignerCertSize, + IN UINT8 *TopLevelCert, + IN UINTN TopLevelCertSize, + OUT UINT8 *Sha512Digest + ) +{ + UINT8 *TbsCert; + UINTN TbsCertSize; + CHAR8 CertCommonName[128]; + UINTN CertCommonNameSize; + BOOLEAN CryptoStatus; + EFI_STATUS Status; + + CertCommonNameSize =3D sizeof (CertCommonName); + + // + // Get SignerCert CommonName + // + Status =3D X509GetCommonName (SignerCert, SignerCertSize, CertCommonName= , &CertCommonNameSize); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_INFO, "%a Get SignerCert CommonName failed with status %= x\n", __FUNCTION__, Status)); + return EFI_ABORTED; + } + + // + // Get TopLevelCert tbsCertificate + // + if (!X509GetTBSCert (TopLevelCert, TopLevelCertSize, &TbsCert, &TbsCertS= ize)) { + DEBUG ((DEBUG_INFO, "%a Get Top-level Cert tbsCertificate failed!\n", = __FUNCTION__)); + return EFI_ABORTED; + } + + // + // Digest SignerCert CN + TopLevelCert tbsCertificate + // + ZeroMem (Sha512Digest, SHA512_DIGEST_SIZE); + CryptoStatus =3D Sha512Init (mHashCtx); + if (!CryptoStatus) { + return EFI_ABORTED; + } + + // + // '\0' is forced in CertCommonName. No overflow issue + // + CryptoStatus =3D Sha512Update ( + mHashCtx, + CertCommonName, + AsciiStrLen (CertCommonName) + ); + if (!CryptoStatus) { + return EFI_ABORTED; + } + + CryptoStatus =3D Sha512Update (mHashCtx, TbsCert, TbsCertSize); + if (!CryptoStatus) { + return EFI_ABORTED; + } + + CryptoStatus =3D Sha512Final (mHashCtx, Sha512Digest); + if (!CryptoStatus) { + return EFI_ABORTED; + } + + return EFI_SUCCESS; +} + /** Find matching signer's certificates for common authenticated variable by corresponding VariableName and VendorGuid from "certdb" or "certdbv". @@ -1526,6 +1698,7 @@ DeleteCertsFromDb ( @param[in] SignerCertSize Length of signer certificate. @param[in] TopLevelCert Top-level certificate data. @param[in] TopLevelCertSize Length of top-level certificate. + @param[in] DigestSize Digest Size. =20 @retval EFI_INVALID_PARAMETER Any input parameter is invalid. @retval EFI_ACCESS_DENIED An AUTH_CERT_DB_DATA entry with same Vari= ableName @@ -1542,7 +1715,8 @@ InsertCertsToDb ( IN UINT8 *SignerCert, IN UINTN SignerCertSize, IN UINT8 *TopLevelCert, - IN UINTN TopLevelCertSize + IN UINTN TopLevelCertSize, + IN UINT32 DigestSize ) { EFI_STATUS Status; @@ -1556,7 +1730,7 @@ InsertCertsToDb ( UINT32 CertDataSize; AUTH_CERT_DB_DATA *Ptr; CHAR16 *DbName; - UINT8 Sha256Digest[SHA256_DIGEST_SIZE]; + UINT8 ShaDigest[SHA_DIGEST_SIZE_MAX]; =20 if ((VariableName =3D=3D NULL) || (VendorGuid =3D=3D NULL) || (SignerCer= t =3D=3D NULL) || (TopLevelCert =3D=3D NULL)) { return EFI_INVALID_PARAMETER; @@ -1618,20 +1792,41 @@ InsertCertsToDb ( // Construct new data content of variable "certdb" or "certdbv". // NameSize =3D (UINT32)StrLen (VariableName); - CertDataSize =3D sizeof (Sha256Digest); + CertDataSize =3D DigestSize; CertNodeSize =3D sizeof (AUTH_CERT_DB_DATA) + (UINT32)CertDataSize + Na= meSize * sizeof (CHAR16); NewCertDbSize =3D (UINT32)DataSize + CertNodeSize; if (NewCertDbSize > mMaxCertDbSize) { return EFI_OUT_OF_RESOURCES; } =20 - Status =3D CalculatePrivAuthVarSignChainSHA256Digest ( - SignerCert, - SignerCertSize, - TopLevelCert, - TopLevelCertSize, - Sha256Digest - ); + if (DigestSize =3D=3D SHA256_DIGEST_SIZE) { + Status =3D CalculatePrivAuthVarSignChainSHA256Digest ( + SignerCert, + SignerCertSize, + TopLevelCert, + TopLevelCertSize, + ShaDigest + ); + } else if (DigestSize =3D=3D SHA384_DIGEST_SIZE) { + Status =3D CalculatePrivAuthVarSignChainSHA384Digest ( + SignerCert, + SignerCertSize, + TopLevelCert, + TopLevelCertSize, + ShaDigest + ); + } else if (DigestSize =3D=3D SHA512_DIGEST_SIZE) { + Status =3D CalculatePrivAuthVarSignChainSHA512Digest ( + SignerCert, + SignerCertSize, + TopLevelCert, + TopLevelCertSize, + ShaDigest + ); + } else { + return EFI_UNSUPPORTED; + } + if (EFI_ERROR (Status)) { return Status; } @@ -1663,7 +1858,7 @@ InsertCertsToDb ( =20 CopyMem ( (UINT8 *)Ptr + sizeof (AUTH_CERT_DB_DATA) + NameSize * sizeof (CHAR16= ), - Sha256Digest, + ShaDigest, CertDataSize ); =20 @@ -1857,7 +2052,7 @@ VerifyTimeBasedPayload ( UINTN CertStackSize; UINT8 *CertsInCertDb; UINT32 CertsSizeinDb; - UINT8 Sha256Digest[SHA256_DIGEST_SIZE]; + UINT8 ShaDigest[SHA_DIGEST_SIZE_MAX]; EFI_CERT_DATA *CertDataPtr; =20 // @@ -1928,7 +2123,7 @@ VerifyTimeBasedPayload ( =20 // // SignedData.digestAlgorithms shall contain the digest algorithm used w= hen preparing the - // signature. Only a digest algorithm of SHA-256 is accepted. + // signature. Only a digest algorithm of SHA-256, SHA-384 or SHA-512 is = accepted. // // According to PKCS#7 Definition (https://www.rfc-editor.org/rfc/rfc= 2315): // SignedData ::=3D SEQUENCE { @@ -1978,7 +2173,19 @@ VerifyTimeBasedPayload ( || (CompareMem (SigData + 13, &mSha256OidValue, sizeof (mSha2= 56OidValue)) !=3D 0))) && ( (SigDataSize >=3D (32 + sizeof (mSha256OidValue))) && ( ((*(SigData + 20) & TWO_BYTE_ENCODE) !=3D TWO_BYTE_ENCODE) - || (CompareMem (SigData + 32, &mSha256OidValue, sizeof (mSha2= 56OidValue)) !=3D 0)))) + || (CompareMem (SigData + 32, &mSha256OidValue, sizeof (mSha2= 56OidValue)) !=3D 0))) + && ( (SigDataSize >=3D (13 + sizeof (mSha384OidValue))) + && ( ((*(SigData + 1) & TWO_BYTE_ENCODE) !=3D TWO_BYTE_ENCODE) + || (CompareMem (SigData + 13, &mSha384OidValue, sizeof (mSha3= 84OidValue)) !=3D 0))) + && ( (SigDataSize >=3D (32 + sizeof (mSha384OidValue))) + && ( ((*(SigData + 20) & TWO_BYTE_ENCODE) !=3D TWO_BYTE_ENCODE) + || (CompareMem (SigData + 32, &mSha384OidValue, sizeof (mSha3= 84OidValue)) !=3D 0))) + && ( (SigDataSize >=3D (13 + sizeof (mSha512OidValue))) + && ( ((*(SigData + 1) & TWO_BYTE_ENCODE) !=3D TWO_BYTE_ENCODE) + || (CompareMem (SigData + 13, &mSha512OidValue, sizeof (mSha5= 12OidValue)) !=3D 0))) + && ( (SigDataSize >=3D (32 + sizeof (mSha512OidValue))) + && ( ((*(SigData + 20) & TWO_BYTE_ENCODE) !=3D TWO_BYTE_ENCODE) + || (CompareMem (SigData + 32, &mSha512OidValue, sizeof (mSha5= 12OidValue)) !=3D 0)))) { return EFI_SECURITY_VIOLATION; } @@ -2180,9 +2387,39 @@ VerifyTimeBasedPayload ( ReadUnaligned32 ((UINT32 *)&(CertDataPtr->CertData= Length)), TopLevelCert, TopLevelCertSize, - Sha256Digest + ShaDigest + ); + if (EFI_ERROR (Status) || (CompareMem (ShaDigest, CertsInCertDb, C= ertsSizeinDb) !=3D 0)) { + goto Exit; + } + } else if (CertsSizeinDb =3D=3D SHA384_DIGEST_SIZE) { + // + // Check hash of signer cert CommonName + Top-level issuer tbsCert= ificate against data in CertDb + // + CertDataPtr =3D (EFI_CERT_DATA *)(SignerCerts + 1); + Status =3D CalculatePrivAuthVarSignChainSHA384Digest ( + CertDataPtr->CertDataBuffer, + ReadUnaligned32 ((UINT32 *)&(CertDataPtr->CertData= Length)), + TopLevelCert, + TopLevelCertSize, + ShaDigest + ); + if (EFI_ERROR (Status) || (CompareMem (ShaDigest, CertsInCertDb, C= ertsSizeinDb) !=3D 0)) { + goto Exit; + } + } else if (CertsSizeinDb =3D=3D SHA512_DIGEST_SIZE) { + // + // Check hash of signer cert CommonName + Top-level issuer tbsCert= ificate against data in CertDb + // + CertDataPtr =3D (EFI_CERT_DATA *)(SignerCerts + 1); + Status =3D CalculatePrivAuthVarSignChainSHA512Digest ( + CertDataPtr->CertDataBuffer, + ReadUnaligned32 ((UINT32 *)&(CertDataPtr->CertData= Length)), + TopLevelCert, + TopLevelCertSize, + ShaDigest ); - if (EFI_ERROR (Status) || (CompareMem (Sha256Digest, CertsInCertDb= , CertsSizeinDb) !=3D 0)) { + if (EFI_ERROR (Status) || (CompareMem (ShaDigest, CertsInCertDb, C= ertsSizeinDb) !=3D 0)) { goto Exit; } } else { @@ -2221,7 +2458,8 @@ VerifyTimeBasedPayload ( CertDataPtr->CertDataBuffer, ReadUnaligned32 ((UINT32 *)&(CertDataPtr->CertDataLe= ngth)), TopLevelCert, - TopLevelCertSize + TopLevelCertSize, + CertsSizeinDb ); if (EFI_ERROR (Status)) { VerifyStatus =3D FALSE; diff --git a/SecurityPkg/Library/AuthVariableLib/AuthVariableLib.c b/Securi= tyPkg/Library/AuthVariableLib/AuthVariableLib.c index dc61ae840c..552c0e99be 100644 --- a/SecurityPkg/Library/AuthVariableLib/AuthVariableLib.c +++ b/SecurityPkg/Library/AuthVariableLib/AuthVariableLib.c @@ -26,7 +26,7 @@ UINT32 mMaxCertDbSize; UINT32 mPlatformMode; UINT8 mVendorKeyState; =20 -EFI_GUID mSignatureSupport[] =3D { EFI_CERT_SHA1_GUID, EFI_CERT_SHA256_GU= ID, EFI_CERT_RSA2048_GUID, EFI_CERT_X509_GUID }; +EFI_GUID mSignatureSupport[] =3D { EFI_CERT_SHA1_GUID, EFI_CERT_SHA256_GU= ID, EFI_CERT_SHA384_GUID, EFI_CERT_SHA512_GUID, EFI_CERT_RSA2048_GUID, EFI_= CERT_RSA3072_GUID, EFI_CERT_RSA4096_GUID, EFI_CERT_X509_GUID }; =20 // // Hash context pointer @@ -135,7 +135,7 @@ AuthVariableLibInitialize ( // // Initialize hash context. // - CtxSize =3D Sha256GetContextSize (); + CtxSize =3D Sha512GetContextSize (); mHashCtx =3D AllocateRuntimePool (CtxSize); if (mHashCtx =3D=3D NULL) { return EFI_OUT_OF_RESOURCES; diff --git a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificati= onLib.c b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationL= ib.c index 66e2f5eaa3..f642aad64d 100644 --- a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c +++ b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c @@ -1606,6 +1606,35 @@ Done: return VerifyStatus; } =20 +/** + Get Hash Alg by PcdSecureBootDefaultHashAlg + + @retval UINT32 Hash Alg + **/ +UINT32 +GetDefaultHashAlg ( + VOID + ) +{ + UINT32 HashAlg; + + switch (PcdGet8 (PcdSecureBootDefaultHashAlg)) { + case 1: + DEBUG ((DEBUG_INFO, "%a use SHA384", __func__)); + HashAlg =3D HASHALG_SHA384; + break; + case 2: + DEBUG ((DEBUG_INFO, "%a use SHA512", __func__)); + HashAlg =3D HASHALG_SHA512; + break; + default: + DEBUG ((DEBUG_INFO, "%a use SHA256", __func__)); + HashAlg =3D HASHALG_SHA256; + break; + } + return HashAlg; +} + /** Provide verification service for signed images, which include both signa= ture validation and platform policy control. For signature types, both UEFI WIN_CERTIFIC= ATE_UEFI_GUID and @@ -1620,7 +1649,7 @@ Done: in the security database "db", and no valid signature nor any hash v= alue of the image may be reflected in the security database "dbx". Otherwise, the image is not signed, - The SHA256 hash value of the image must match a record in the securi= ty database "db", and + The hash value of the image must match a record in the security data= base "db", and not be reflected in the security data base "dbx". =20 Caution: This function may receive untrusted input. @@ -1832,10 +1861,10 @@ DxeImageVerificationHandler ( // if ((SecDataDir =3D=3D NULL) || (SecDataDir->Size =3D=3D 0)) { // - // This image is not signed. The SHA256 hash value of the image must m= atch a record in the security database "db", + // This image is not signed. The hash value of the image must match a = record in the security database "db", // and not be reflected in the security data base "dbx". // - if (!HashPeImage (HASHALG_SHA256)) { + if (!HashPeImage (GetDefaultHashAlg ())) { DEBUG ((DEBUG_INFO, "DxeImageVerificationLib: Failed to hash this im= age using %s.\n", mHashTypeStr)); goto Failed; } diff --git a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificati= onLib.inf b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificatio= nLib.inf index 1e1a639857..f1ef9236c2 100644 --- a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.i= nf +++ b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.i= nf @@ -93,3 +93,4 @@ gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy = ## SOMETIMES_CONSUMES gEfiSecurityPkgTokenSpaceGuid.PcdRemovableMediaImageVerificationPolicy = ## SOMETIMES_CONSUMES gEfiSecurityPkgTokenSpaceGuid.PcdFixedMediaImageVerificationPolicy = ## SOMETIMES_CONSUMES + gEfiSecurityPkgTokenSpaceGuid.PcdSecureBootDefaultHashAlg = ## CONSUMES diff --git a/SecurityPkg/SecurityPkg.dec b/SecurityPkg/SecurityPkg.dec index 0382090f4e..4adc2a72ab 100644 --- a/SecurityPkg/SecurityPkg.dec +++ b/SecurityPkg/SecurityPkg.dec @@ -521,6 +521,13 @@ # @Prompt Skip Hdd Password prompt. gEfiSecurityPkgTokenSpaceGuid.PcdSkipHddPasswordPrompt|FALSE|BOOLEAN|0x0= 0010021 =20 + ## Indicates default hash algorithm in Secure Boot + # 0 - Use SHA256 + # 1 - Use SHA384 + # 2 - Use SHA512 + # @Prompt Secure Boot default hash algorithm + gEfiSecurityPkgTokenSpaceGuid.PcdSecureBootDefaultHashAlg|0|UINT8|0x0001= 0040 + [PcdsDynamic, PcdsDynamicEx] =20 ## This PCD indicates Hash mask for TPM 2.0. Bit definition strictly fol= lows TCG Algorithm Registry.

diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBo= otConfigDxe.inf b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/Sec= ureBootConfigDxe.inf index 1671d5be7c..4b0012d033 100644 --- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfi= gDxe.inf +++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfi= gDxe.inf @@ -70,6 +70,14 @@ ## SOMETIMES_PRODUCES ## GUID # Unique ID for the type o= f the signature. gEfiCertRsa2048Guid =20 + ## SOMETIMES_CONSUMES ## GUID # Unique ID for the type o= f the signature. + ## SOMETIMES_PRODUCES ## GUID # Unique ID for the type o= f the signature. + gEfiCertRsa3072Guid + + ## SOMETIMES_CONSUMES ## GUID # Unique ID for the type o= f the signature. + ## SOMETIMES_PRODUCES ## GUID # Unique ID for the type o= f the signature. + gEfiCertRsa4096Guid + ## SOMETIMES_CONSUMES ## GUID # Unique ID for the type o= f the signature. ## SOMETIMES_PRODUCES ## GUID # Unique ID for the type o= f the signature. gEfiCertX509Guid @@ -82,6 +90,14 @@ ## SOMETIMES_PRODUCES ## GUID # Unique ID for the type o= f the signature. gEfiCertSha256Guid =20 + ## SOMETIMES_CONSUMES ## GUID # Unique ID for the type o= f the signature. + ## SOMETIMES_PRODUCES ## GUID # Unique ID for the type o= f the signature. + gEfiCertSha384Guid + + ## SOMETIMES_CONSUMES ## GUID # Unique ID for the type o= f the signature. + ## SOMETIMES_PRODUCES ## GUID # Unique ID for the type o= f the signature. + gEfiCertSha512Guid + ## SOMETIMES_CONSUMES ## Variable:L"db" ## SOMETIMES_PRODUCES ## Variable:L"db" ## SOMETIMES_CONSUMES ## Variable:L"dbx" @@ -107,6 +123,9 @@ gEfiCertX509Sha384Guid ## SOMETIMES_PRODUCES ## = GUID # Unique ID for the type of the certificate. gEfiCertX509Sha512Guid ## SOMETIMES_PRODUCES ## = GUID # Unique ID for the type of the certificate. =20 +[Pcd] + gEfiSecurityPkgTokenSpaceGuid.PcdSecureBootDefaultHashAlg = ## CONSUMES + [Protocols] gEfiHiiConfigAccessProtocolGuid ## PRODUCES gEfiDevicePathProtocolGuid ## PRODUCES diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBo= otConfigImpl.c b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/Secu= reBootConfigImpl.c index 4299a6b5e5..0ba029a394 100644 --- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfi= gImpl.c +++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfi= gImpl.c @@ -560,7 +560,7 @@ ON_EXIT: =20 **/ EFI_STATUS -EnrollRsa2048ToKek ( +EnrollRsaToKek ( IN SECUREBOOT_CONFIG_PRIVATE_DATA *Private ) { @@ -603,8 +603,13 @@ EnrollRsa2048ToKek ( =20 ASSERT (KeyBlob !=3D NULL); KeyInfo =3D (CPL_KEY_INFO *)KeyBlob; - if (KeyInfo->KeyLengthInBits / 8 !=3D WIN_CERT_UEFI_RSA2048_SIZE) { - DEBUG ((DEBUG_ERROR, "Unsupported key length, Only RSA2048 is supporte= d.\n")); + switch (KeyInfo->KeyLengthInBits / 8) { + case WIN_CERT_UEFI_RSA2048_SIZE: + case WIN_CERT_UEFI_RSA3072_SIZE: + case WIN_CERT_UEFI_RSA4096_SIZE: + break; + default : + DEBUG ((DEBUG_ERROR, "Unsupported key length, Only RSA2048, RSA3072 an= d RSA4096 are supported.\n")); Status =3D EFI_UNSUPPORTED; goto ON_EXIT; } @@ -632,7 +637,7 @@ EnrollRsa2048ToKek ( // KekSigListSize =3D sizeof (EFI_SIGNATURE_LIST) + sizeof (EFI_SIGNATURE_DATA) - 1 - + WIN_CERT_UEFI_RSA2048_SIZE; + + KeyLenInBytes; =20 KekSigList =3D (EFI_SIGNATURE_LIST *)AllocateZeroPool (KekSigListSize); if (KekSigList =3D=3D NULL) { @@ -642,17 +647,32 @@ EnrollRsa2048ToKek ( =20 KekSigList->SignatureListSize =3D sizeof (EFI_SIGNATURE_LIST) + sizeof (EFI_SIGNATURE_DATA) - 1 - + WIN_CERT_UEFI_RSA2048_SIZE; + + (UINT32) KeyLenInBytes; KekSigList->SignatureHeaderSize =3D 0; - KekSigList->SignatureSize =3D sizeof (EFI_SIGNATURE_DATA) - 1 + WI= N_CERT_UEFI_RSA2048_SIZE; - CopyGuid (&KekSigList->SignatureType, &gEfiCertRsa2048Guid); + KekSigList->SignatureSize =3D sizeof (EFI_SIGNATURE_DATA) - 1 + (U= INT32) KeyLenInBytes; + switch (KeyLenInBytes) { + case WIN_CERT_UEFI_RSA2048_SIZE: + CopyGuid (&KekSigList->SignatureType, &gEfiCertRsa2048Guid); + break; + case WIN_CERT_UEFI_RSA3072_SIZE: + CopyGuid (&KekSigList->SignatureType, &gEfiCertRsa3072Guid); + break; + case WIN_CERT_UEFI_RSA4096_SIZE: + CopyGuid (&KekSigList->SignatureType, &gEfiCertRsa4096Guid); + break; + break; + default : + DEBUG ((DEBUG_ERROR, "Unsupported key length.\n")); + Status =3D EFI_UNSUPPORTED; + goto ON_EXIT; + } =20 KEKSigData =3D (EFI_SIGNATURE_DATA *)((UINT8 *)KekSigList + sizeof (EFI_= SIGNATURE_LIST)); CopyGuid (&KEKSigData->SignatureOwner, Private->SignatureGUID); CopyMem ( KEKSigData->SignatureData, KeyBlob + sizeof (CPL_KEY_INFO), - WIN_CERT_UEFI_RSA2048_SIZE + KeyLenInBytes ); =20 // @@ -890,7 +910,7 @@ EnrollKeyExchangeKey ( if (IsDerEncodeCertificate (FilePostFix)) { return EnrollX509ToKek (Private); } else if (CompareMem (FilePostFix, L".pbk", 4) =3D=3D 0) { - return EnrollRsa2048ToKek (Private); + return EnrollRsaToKek (Private); } else { // // File type is wrong, simply close it @@ -1847,7 +1867,7 @@ HashPeImage ( SectionHeader =3D NULL; Status =3D FALSE; =20 - if (HashAlg !=3D HASHALG_SHA256) { + if ((HashAlg >=3D HASHALG_MAX)) { return FALSE; } =20 @@ -1856,8 +1876,25 @@ HashPeImage ( // ZeroMem (mImageDigest, MAX_DIGEST_SIZE); =20 - mImageDigestSize =3D SHA256_DIGEST_SIZE; - mCertType =3D gEfiCertSha256Guid; + switch (HashAlg) { + case HASHALG_SHA256: + mImageDigestSize =3D SHA256_DIGEST_SIZE; + mCertType =3D gEfiCertSha256Guid; + break; + + case HASHALG_SHA384: + mImageDigestSize =3D SHA384_DIGEST_SIZE; + mCertType =3D gEfiCertSha384Guid; + break; + + case HASHALG_SHA512: + mImageDigestSize =3D SHA512_DIGEST_SIZE; + mCertType =3D gEfiCertSha512Guid; + break; + + default: + return FALSE; + } =20 CtxSize =3D mHash[HashAlg].GetContextSize (); =20 @@ -2222,6 +2259,35 @@ ON_EXIT: return Status; } =20 +/** + Get Hash Alg by PcdSecureBootDefaultHashAlg + + @retval UINT32 Hash Alg + **/ +UINT32 +GetDefaultHashAlg ( + VOID + ) +{ + UINT32 HashAlg; + + switch (PcdGet8 (PcdSecureBootDefaultHashAlg)) { + case 1: + DEBUG ((DEBUG_INFO, "%a use SHA384", __func__)); + HashAlg =3D HASHALG_SHA384; + break; + case 2: + DEBUG ((DEBUG_INFO, "%a use SHA512", __func__)); + HashAlg =3D HASHALG_SHA512; + break; + default: + DEBUG ((DEBUG_INFO, "%a use SHA256", __func__)); + HashAlg =3D HASHALG_SHA256; + break; + } + return HashAlg; +} + /** Enroll a new signature of executable into Signature Database. =20 @@ -2289,7 +2355,7 @@ EnrollImageSignatureToSigDB ( } =20 if (mSecDataDir->SizeOfCert =3D=3D 0) { - if (!HashPeImage (HASHALG_SHA256)) { + if (!HashPeImage (GetDefaultHashAlg ())) { Status =3D EFI_SECURITY_VIOLATION; goto ON_EXIT; } @@ -2589,6 +2655,10 @@ UpdateDeletePage ( while ((ItemDataSize > 0) && (ItemDataSize >=3D CertList->SignatureListS= ize)) { if (CompareGuid (&CertList->SignatureType, &gEfiCertRsa2048Guid)) { Help =3D STRING_TOKEN (STR_CERT_TYPE_RSA2048_SHA256_GUID); + } else if (CompareGuid (&CertList->SignatureType, &gEfiCertRsa3072Guid= )) { + Help =3D STRING_TOKEN (STR_CERT_TYPE_RSA3072_SHA384_GUID); + } else if (CompareGuid (&CertList->SignatureType, &gEfiCertRsa4096Guid= )) { + Help =3D STRING_TOKEN (STR_CERT_TYPE_RSA4096_SHA512_GUID); } else if (CompareGuid (&CertList->SignatureType, &gEfiCertX509Guid)) { Help =3D STRING_TOKEN (STR_CERT_TYPE_PCKS7_GUID); } else if (CompareGuid (&CertList->SignatureType, &gEfiCertSha1Guid)) { @@ -2750,6 +2820,8 @@ DeleteKeyExchangeKey ( GuidIndex =3D 0; while ((KekDataSize > 0) && (KekDataSize >=3D CertList->SignatureListSiz= e)) { if (CompareGuid (&CertList->SignatureType, &gEfiCertRsa2048Guid) || + CompareGuid (&CertList->SignatureType, &gEfiCertRsa3072Guid) || + CompareGuid (&CertList->SignatureType, &gEfiCertRsa4096Guid) || CompareGuid (&CertList->SignatureType, &gEfiCertX509Guid)) { CopyMem (Data + Offset, CertList, (sizeof (EFI_SIGNATURE_LIST) + Cer= tList->SignatureHeaderSize)); @@ -2952,6 +3024,8 @@ DeleteSignature ( GuidIndex =3D 0; while ((ItemDataSize > 0) && (ItemDataSize >=3D CertList->SignatureListS= ize)) { if (CompareGuid (&CertList->SignatureType, &gEfiCertRsa2048Guid) || + CompareGuid (&CertList->SignatureType, &gEfiCertRsa3072Guid) || + CompareGuid (&CertList->SignatureType, &gEfiCertRsa4096Guid) || CompareGuid (&CertList->SignatureType, &gEfiCertX509Guid) || CompareGuid (&CertList->SignatureType, &gEfiCertSha1Guid) || CompareGuid (&CertList->SignatureType, &gEfiCertSha256Guid) || @@ -3758,12 +3832,20 @@ LoadSignatureList ( while ((RemainingSize > 0) && (RemainingSize >=3D ListWalker->SignatureL= istSize)) { if (CompareGuid (&ListWalker->SignatureType, &gEfiCertRsa2048Guid)) { ListType =3D STRING_TOKEN (STR_LIST_TYPE_RSA2048_SHA256); + } else if (CompareGuid (&ListWalker->SignatureType, &gEfiCertRsa3072Gu= id)) { + ListType =3D STRING_TOKEN (STR_LIST_TYPE_RSA3072_SHA384); + } else if (CompareGuid (&ListWalker->SignatureType, &gEfiCertRsa4096Gu= id)) { + ListType =3D STRING_TOKEN (STR_LIST_TYPE_RSA4096_SHA512); } else if (CompareGuid (&ListWalker->SignatureType, &gEfiCertX509Guid)= ) { ListType =3D STRING_TOKEN (STR_LIST_TYPE_X509); } else if (CompareGuid (&ListWalker->SignatureType, &gEfiCertSha1Guid)= ) { ListType =3D STRING_TOKEN (STR_LIST_TYPE_SHA1); } else if (CompareGuid (&ListWalker->SignatureType, &gEfiCertSha256Gui= d)) { ListType =3D STRING_TOKEN (STR_LIST_TYPE_SHA256); + } else if (CompareGuid (&ListWalker->SignatureType, &gEfiCertSha384Gui= d)) { + ListType =3D STRING_TOKEN (STR_LIST_TYPE_SHA384); + } else if (CompareGuid (&ListWalker->SignatureType, &gEfiCertSha512Gui= d)) { + ListType =3D STRING_TOKEN (STR_LIST_TYPE_SHA512); } else if (CompareGuid (&ListWalker->SignatureType, &gEfiCertX509Sha25= 6Guid)) { ListType =3D STRING_TOKEN (STR_LIST_TYPE_X509_SHA256); } else if (CompareGuid (&ListWalker->SignatureType, &gEfiCertX509Sha38= 4Guid)) { @@ -4001,6 +4083,14 @@ FormatHelpInfo ( ListTypeId =3D STRING_TOKEN (STR_LIST_TYPE_RSA2048_SHA256); DataSize =3D ListEntry->SignatureSize - sizeof (EFI_GUID); IsCert =3D TRUE; + } else if (CompareGuid (&ListEntry->SignatureType, &gEfiCertRsa3072Guid)= ) { + ListTypeId =3D STRING_TOKEN (STR_LIST_TYPE_RSA3072_SHA384); + DataSize =3D ListEntry->SignatureSize - sizeof (EFI_GUID); + IsCert =3D TRUE; + } else if (CompareGuid (&ListEntry->SignatureType, &gEfiCertRsa4096Guid)= ) { + ListTypeId =3D STRING_TOKEN (STR_LIST_TYPE_RSA4096_SHA512); + DataSize =3D ListEntry->SignatureSize - sizeof (EFI_GUID); + IsCert =3D TRUE; } else if (CompareGuid (&ListEntry->SignatureType, &gEfiCertX509Guid)) { ListTypeId =3D STRING_TOKEN (STR_LIST_TYPE_X509); DataSize =3D ListEntry->SignatureSize - sizeof (EFI_GUID); @@ -4011,6 +4101,12 @@ FormatHelpInfo ( } else if (CompareGuid (&ListEntry->SignatureType, &gEfiCertSha256Guid))= { ListTypeId =3D STRING_TOKEN (STR_LIST_TYPE_SHA256); DataSize =3D 32; + } else if (CompareGuid (&ListEntry->SignatureType, &gEfiCertSha384Guid))= { + ListTypeId =3D STRING_TOKEN (STR_LIST_TYPE_SHA384); + DataSize =3D 48; + } else if (CompareGuid (&ListEntry->SignatureType, &gEfiCertSha512Guid))= { + ListTypeId =3D STRING_TOKEN (STR_LIST_TYPE_SHA512); + DataSize =3D 64; } else if (CompareGuid (&ListEntry->SignatureType, &gEfiCertX509Sha256Gu= id)) { ListTypeId =3D STRING_TOKEN (STR_LIST_TYPE_X509_SHA256); DataSize =3D 32; diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBo= otConfigImpl.h b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/Secu= reBootConfigImpl.h index 37c66f1b95..ae50d929a7 100644 --- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfi= gImpl.h +++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfi= gImpl.h @@ -82,6 +82,8 @@ extern EFI_IFR_GUID_LABEL *mEndLabel; #define MAX_DIGEST_SIZE SHA512_DIGEST_SIZE =20 #define WIN_CERT_UEFI_RSA2048_SIZE 256 +#define WIN_CERT_UEFI_RSA3072_SIZE 384 +#define WIN_CERT_UEFI_RSA4096_SIZE 512 =20 // // Support hash types diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBo= otConfigStrings.uni b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe= /SecureBootConfigStrings.uni index 0d01701de7..1b48acc800 100644 --- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfi= gStrings.uni +++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfi= gStrings.uni @@ -113,6 +113,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #string STR_FORM_ENROLL_KEK_FROM_FILE_TITLE_HELP #language en-US "Read = the public key of KEK from file" #string STR_FILE_EXPLORER_TITLE #language en-US "File Ex= plorer" #string STR_CERT_TYPE_RSA2048_SHA256_GUID #language en-US "RSA2048= _SHA256_GUID" +#string STR_CERT_TYPE_RSA3072_SHA384_GUID #language en-US "RSA3072= _SHA384_GUID" +#string STR_CERT_TYPE_RSA4096_SHA512_GUID #language en-US "RSA4096= _SHA512_GUID" #string STR_CERT_TYPE_PCKS7_GUID #language en-US "PKCS7_G= UID" #string STR_CERT_TYPE_SHA1_GUID #language en-US "SHA1_GU= ID" #string STR_CERT_TYPE_SHA256_GUID #language en-US "SHA256_= GUID" @@ -121,9 +123,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #string STR_CERT_TYPE_X509_SHA512_GUID #language en-US "X509_SH= A512_GUID" =20 #string STR_LIST_TYPE_RSA2048_SHA256 #language en-US "RSA2048= _SHA256" +#string STR_LIST_TYPE_RSA3072_SHA384 #language en-US "RSA3072= _SHA384" +#string STR_LIST_TYPE_RSA4096_SHA512 #language en-US "RSA4096= _SHA512" #string STR_LIST_TYPE_X509 #language en-US "X509" #string STR_LIST_TYPE_SHA1 #language en-US "SHA1" #string STR_LIST_TYPE_SHA256 #language en-US "SHA256" +#string STR_LIST_TYPE_SHA384 #language en-US "SHA384" +#string STR_LIST_TYPE_SHA512 #language en-US "SHA512" #string STR_LIST_TYPE_X509_SHA256 #language en-US "X509_SH= A256" #string STR_LIST_TYPE_X509_SHA384 #language en-US "X509_SH= A384" #string STR_LIST_TYPE_X509_SHA512 #language en-US "X509_SH= A512" --=20 2.26.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#105296): https://edk2.groups.io/g/devel/message/105296 Mute This Topic: https://groups.io/mt/99124387/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-