From nobody Sun May 19 15:20:01 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+99584+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+99584+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675430894; cv=none; d=zohomail.com; s=zohoarc; b=fIorFru8giH1Gquw+Zw/jp3fwjxN4psFzk9roXwxp7VSjgx1ZD7RXQ6oct5vlQQqzQQPfnRKpLZBlZf9Fv311hV8cORIbzVZvphyU+4DLj+sdCVF00o+qB5OifhvsXwCfL4WYf7BylkApRaHIn4SkRsyv3h8xD1UJBksGz/+cqU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675430894; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=iMFPKormxJe2rQqg4ZV32/VqiZk67qndE8iBfoUZyR0=; b=UAoaqSN9ZsvikIIsG8Hb4eG2s7BXBkE8N64HWjSf+tgccWvmwg+diQO1S0hpx4Wp4u6mhie6sgDpe5WR0wb7Gkhd25Rav+QIABLNEo8uoyajAc5KesLmKomE6g6DyjRiLiKCPQu9aiqvs9R0vaeJdlDtNoWiG0soYBgZPQpMVr0= 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+99584+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 167543089422693.14614194703961; Fri, 3 Feb 2023 05:28:14 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id gjaqYY1788612xquYVSmZaMa; Fri, 03 Feb 2023 05:28:13 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.10301.1675430892822262314 for ; Fri, 03 Feb 2023 05:28:13 -0800 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-308--bPTQ6nePRyHa5Q88QGFog-1; Fri, 03 Feb 2023 08:28:09 -0500 X-MC-Unique: -bPTQ6nePRyHa5Q88QGFog-1 X-Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 49F74811E9C; Fri, 3 Feb 2023 13:28:08 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.85]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 66441140EBF4; Fri, 3 Feb 2023 13:28:07 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 0B2DA1800624; Fri, 3 Feb 2023 14:28:06 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Min Xu , Ard Biesheuvel , Gerd Hoffmann , Michael Roth , Jiewen Yao , Jian J Wang , Jordan Justen , Pawel Polawski , Oliver Steffen , Tom Lendacky , Xiaoyu Lu , Erdem Aktas , Guomin Jiang , James Bottomley Subject: [edk2-devel] [PATCH 01/11] CryptoPkg: move Driver PCD configs to include files Date: Fri, 3 Feb 2023 14:27:56 +0100 Message-Id: <20230203132806.2275708-2-kraxel@redhat.com> In-Reply-To: <20230203132806.2275708-1-kraxel@redhat.com> References: <20230203132806.2275708-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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,kraxel@redhat.com X-Gm-Message-State: jcCubqXsyEH2aFF3jBJglPbTx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1675430893; bh=HcBqL5WMmTEIdQU0YQV4YebDiJ0mgWusm1vax1ZzzuQ=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=feT6K4Yw6p9sap0V8SduPnTGdGugJnjtfFn9Gamd/sU8Kmw77tTEfFfPOdHAd9UI8/v k1FjrHmjwJBPuywPOLkri5G5yGe0tzwCk+eTt0WFh/TEtlQfpKf5JWzivckFJhC71GCN9 mwwT8M8K1lSs5gsdHysoBYmeoU7VLWLWMbI= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1675430894703100002 Content-Type: text/plain; charset="utf-8"; x-default="true" Makes it easier to reuse the predefined config sets in other places. Signed-off-by: Gerd Hoffmann --- .../Include/Dsc/CryptoServicePcd.all.dsc.inc | 29 +++++++ .../Dsc/CryptoServicePcd.min_dxe_smm.dsc.inc | 35 +++++++++ .../Dsc/CryptoServicePcd.min_pei.dsc.inc | 20 +++++ CryptoPkg/CryptoPkg.dsc | 78 +------------------ 4 files changed, 87 insertions(+), 75 deletions(-) create mode 100644 CryptoPkg/Include/Dsc/CryptoServicePcd.all.dsc.inc create mode 100644 CryptoPkg/Include/Dsc/CryptoServicePcd.min_dxe_smm.dsc.= inc create mode 100644 CryptoPkg/Include/Dsc/CryptoServicePcd.min_pei.dsc.inc diff --git a/CryptoPkg/Include/Dsc/CryptoServicePcd.all.dsc.inc b/CryptoPkg= /Include/Dsc/CryptoServicePcd.all.dsc.inc new file mode 100644 index 000000000000..1c3ffa461ca5 --- /dev/null +++ b/CryptoPkg/Include/Dsc/CryptoServicePcd.all.dsc.inc @@ -0,0 +1,29 @@ +## +# SPDX-License-Identifier: BSD-2-Clause-Patent +## + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.HmacSha256.Fami= ly | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.HmacSha384.Fami= ly | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Pkcs.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Dh.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Random.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Rsa.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha1.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha256.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha384.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha512.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.X509.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.Ge= tContextSize | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.In= it | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.Cb= cEncrypt | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.Cb= cDecrypt | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Arc4.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sm3.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Hkdf.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Tls.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.TlsSet.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.TlsGet.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.RsaPss.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.ParallelHash.Fa= mily | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.AeadAesGcm.Fami= ly | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Bn.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Ec.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY diff --git a/CryptoPkg/Include/Dsc/CryptoServicePcd.min_dxe_smm.dsc.inc b/C= ryptoPkg/Include/Dsc/CryptoServicePcd.min_dxe_smm.dsc.inc new file mode 100644 index 000000000000..aaf35e4c6061 --- /dev/null +++ b/CryptoPkg/Include/Dsc/CryptoServicePcd.min_dxe_smm.dsc.inc @@ -0,0 +1,35 @@ +## +# SPDX-License-Identifier: BSD-2-Clause-Patent +## + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.HmacSha256.Fami= ly | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.HmacSha384.Fami= ly | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Pkcs.Services.P= kcs1v2Encrypt | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Pkcs.Services.P= kcs5HashPassword | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Pkcs.Services.P= kcs7Verify | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Pkcs.Services.V= erifyEKUsInPkcs7Signature | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Pkcs.Services.P= kcs7GetSigners | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Pkcs.Services.P= kcs7FreeSigners | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Pkcs.Services.A= uthenticodeVerify | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Random.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Rsa.Services.Pk= cs1Verify | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Rsa.Services.Ne= w | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Rsa.Services.Fr= ee | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Rsa.Services.Se= tKey | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Rsa.Services.Ge= tPublicKeyFromX509 | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha1.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha256.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha256.Services= .HashAll | FALSE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.X509.Services.G= etSubjectName | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.X509.Services.G= etCommonName | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.X509.Services.G= etOrganizationName | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.X509.Services.G= etTBSCert | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Tls.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.TlsSet.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.TlsGet.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.Ge= tContextSize | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.In= it | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.Cb= cEncrypt | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.Cb= cDecrypt | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.AeadAesGcm.Serv= ices.Encrypt | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.AeadAesGcm.Serv= ices.Decrypt | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Hkdf.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY diff --git a/CryptoPkg/Include/Dsc/CryptoServicePcd.min_pei.dsc.inc b/Crypt= oPkg/Include/Dsc/CryptoServicePcd.min_pei.dsc.inc new file mode 100644 index 000000000000..023c6f1d1d04 --- /dev/null +++ b/CryptoPkg/Include/Dsc/CryptoServicePcd.min_pei.dsc.inc @@ -0,0 +1,20 @@ +## +# SPDX-License-Identifier: BSD-2-Clause-Patent +## + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.HmacSha256.Fami= ly | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.HmacSha384.Fami= ly | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha1.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha256.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha384.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha512.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sm3.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Rsa.Services.Pk= cs1Verify | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Rsa.Services.Ne= w | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Rsa.Services.Fr= ee | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Rsa.Services.Se= tKey | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Pkcs.Services.P= kcs5HashPassword | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.Ge= tContextSize | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.In= it | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.Cb= cEncrypt | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.Cb= cDecrypt | TRUE + gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Hkdf.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY diff --git a/CryptoPkg/CryptoPkg.dsc b/CryptoPkg/CryptoPkg.dsc index 4676193e8953..6a5fbd807a17 100644 --- a/CryptoPkg/CryptoPkg.dsc +++ b/CryptoPkg/CryptoPkg.dsc @@ -193,32 +193,7 @@ [PcdsFixedAtBuild] # !if $(CRYPTO_SERVICES) IN "ALL TARGET_UINT_TESTS" [PcdsFixedAtBuild] - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.HmacSha256.Fami= ly | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.HmacSha384.Fami= ly | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Pkcs.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Dh.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Random.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Rsa.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha1.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha256.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha384.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha512.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.X509.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.Ge= tContextSize | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.In= it | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.Cb= cEncrypt | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.Cb= cDecrypt | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Arc4.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sm3.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Hkdf.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Tls.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.TlsSet.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.TlsGet.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.RsaPss.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.ParallelHash.Fa= mily | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.AeadAesGcm.Fami= ly | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Bn.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Ec.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY +!include CryptoPkg/Include/Dsc/CryptoServicePcd.all.dsc.inc !endif =20 # @@ -227,23 +202,7 @@ [PcdsFixedAtBuild] # !if $(CRYPTO_SERVICES) =3D=3D MIN_PEI [PcdsFixedAtBuild] - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.HmacSha256.Fami= ly | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.HmacSha384.Fami= ly | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha1.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha256.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha384.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha512.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sm3.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Rsa.Services.Pk= cs1Verify | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Rsa.Services.Ne= w | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Rsa.Services.Fr= ee | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Rsa.Services.Se= tKey | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Pkcs.Services.P= kcs5HashPassword | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.Ge= tContextSize | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.In= it | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.Cb= cEncrypt | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.Cb= cDecrypt | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Hkdf.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY +!include CryptoPkg/Include/Dsc/CryptoServicePcd.min_pei.dsc.inc !endif =20 # @@ -252,38 +211,7 @@ [PcdsFixedAtBuild] # !if $(CRYPTO_SERVICES) =3D=3D MIN_DXE_MIN_SMM [PcdsFixedAtBuild] - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.HmacSha256.Fami= ly | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.HmacSha384.Fami= ly | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Pkcs.Services.P= kcs1v2Encrypt | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Pkcs.Services.P= kcs5HashPassword | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Pkcs.Services.P= kcs7Verify | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Pkcs.Services.V= erifyEKUsInPkcs7Signature | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Pkcs.Services.P= kcs7GetSigners | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Pkcs.Services.P= kcs7FreeSigners | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Pkcs.Services.A= uthenticodeVerify | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Random.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Rsa.Services.Pk= cs1Verify | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Rsa.Services.Ne= w | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Rsa.Services.Fr= ee | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Rsa.Services.Se= tKey | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Rsa.Services.Ge= tPublicKeyFromX509 | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha1.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha256.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha256.Services= .HashAll | FALSE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.X509.Services.G= etSubjectName | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.X509.Services.G= etCommonName | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.X509.Services.G= etOrganizationName | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.X509.Services.G= etTBSCert | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Tls.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.TlsSet.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.TlsGet.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.Ge= tContextSize | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.In= it | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.Cb= cEncrypt | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.Cb= cDecrypt | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.AeadAesGcm.Serv= ices.Encrypt | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.AeadAesGcm.Serv= ices.Decrypt | TRUE - gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Hkdf.Family = | PCD_CRYPTO_SERVICE_ENABLE_FAMILY +!include CryptoPkg/Include/Dsc/CryptoServicePcd.min_dxe_smm.dsc.inc !endif =20 ##########################################################################= ######################### --=20 2.39.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 (#99584): https://edk2.groups.io/g/devel/message/99584 Mute This Topic: https://groups.io/mt/96722232/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- From nobody Sun May 19 15:20:01 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+99586+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+99586+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675430897; cv=none; d=zohomail.com; s=zohoarc; b=DihL8bdofkHG+9AnpO59kMowRQLx7q5JAah/5P2z7XdiJD1dpIKF3p6eaeHe12AHvS2yrIuE2fL4xOL4Cmy3Fy67WA9Mlw3VRge3phUGQBErXy7gEzDYPTDtQi44yuuMxSX6whmNg/Lm7gd0y+4cmQCL+OAdyZ/7Mb+GBjG5wb8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675430897; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=vq8YSnLfrkRSt2bAaMjq2oY8TAkO9slW7PrGb3j6AHQ=; b=eqEw9bzZ1Ar0FEL4JfowybkXPdaq2Yxdh3x2Vpd1QxANXx3AQwj5JNoqXfeuTNJwyXBfdnNmkeypK32dIZcBQNBvLzGu3kT22SGBUiRvrTD0RSGquOviP3alsyGNbc4zNk3/UyxjkuyzpVoylr8CUjF50wy1ad6v7SLwCIVFJnM= 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+99586+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 1675430897104332.4433245670883; Fri, 3 Feb 2023 05:28:17 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id wAUzYY1788612xsS5B5QY28H; Fri, 03 Feb 2023 05:28:16 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web10.10087.1675430896187701433 for ; Fri, 03 Feb 2023 05:28:16 -0800 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-378-WxQqDN4cNzCdQk_PWudk4A-1; Fri, 03 Feb 2023 08:28:10 -0500 X-MC-Unique: WxQqDN4cNzCdQk_PWudk4A-1 X-Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A633B101A521; Fri, 3 Feb 2023 13:28:09 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.85]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6F140140EBF4; Fri, 3 Feb 2023 13:28:09 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 10DDB1800920; Fri, 3 Feb 2023 14:28:06 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Min Xu , Ard Biesheuvel , Gerd Hoffmann , Michael Roth , Jiewen Yao , Jian J Wang , Jordan Justen , Pawel Polawski , Oliver Steffen , Tom Lendacky , Xiaoyu Lu , Erdem Aktas , Guomin Jiang , James Bottomley Subject: [edk2-devel] [PATCH 02/11] OvmfPkg: add OvmfCryptoLibs.dsc.inc Date: Fri, 3 Feb 2023 14:27:57 +0100 Message-Id: <20230203132806.2275708-3-kraxel@redhat.com> In-Reply-To: <20230203132806.2275708-1-kraxel@redhat.com> References: <20230203132806.2275708-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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,kraxel@redhat.com X-Gm-Message-State: ha2j908rUsBw8kCQh33T4qHtx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1675430896; bh=Ght+ohEnvJrLesDzLY4J0TDN3XWF0sn+hvI/076mxko=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=OdEwMMM9jHQJ+4hNFDQOPIHQEN6vrI30ZexV66Hf+22V/0+5ioHnwYE/BC1g/ebtRgf vWJH9LtSh+OZKu/U/4I9I8NzqIFPzjU2czfGqE6Fzx9li16wAHC+XJb9ZLBAML2bi+aBk ybxlXuIYGjLPo/TdvHiquK0xRl3QN+w5iIg= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1675430898621100012 Content-Type: text/plain; charset="utf-8"; x-default="true" Create OvmfCryptoLibs.dsc.inc include file with LibraryClasses configuration for crypto support. This include file is supposed to be usable for all OVMF variants and should reduce the duplication we have. The configuration follows mostly the recommendations given in CryptoPkg/Readme.md, with some minor exceptions like only compiling TLS support in case NETWORK_TLS_ENABLE is TRUE. Signed-off-by: Gerd Hoffmann --- OvmfPkg/Include/Dsc/OvmfCryptoLibs.dsc.inc | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 OvmfPkg/Include/Dsc/OvmfCryptoLibs.dsc.inc diff --git a/OvmfPkg/Include/Dsc/OvmfCryptoLibs.dsc.inc b/OvmfPkg/Include/D= sc/OvmfCryptoLibs.dsc.inc new file mode 100644 index 000000000000..a9028352a45e --- /dev/null +++ b/OvmfPkg/Include/Dsc/OvmfCryptoLibs.dsc.inc @@ -0,0 +1,39 @@ +## +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +# mostly following CryptoPkg/Readme.md recommendations +## + +[LibraryClasses] + HashApiLib|CryptoPkg/Library/BaseHashApiLib/BaseHashApiLib.inf + IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + +[LibraryClasses.common.SEC] + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf + TlsLib|CryptoPkg/Library/TlsLibNull/TlsLibNull.inf + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf + +[LibraryClasses.common] + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf +!if $(NETWORK_TLS_ENABLE) =3D=3D TRUE + TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf +!else + TlsLib|CryptoPkg/Library/TlsLibNull/TlsLibNull.inf + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf +!endif + +[LibraryClasses.common.PEIM] + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf + TlsLib|CryptoPkg/Library/TlsLibNull/TlsLibNull.inf + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf + +[LibraryClasses.common.DXE_SMM_DRIVER] + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf + TlsLib|CryptoPkg/Library/TlsLibNull/TlsLibNull.inf + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf + +[LibraryClasses.common.DXE_RUNTIME_DRIVER] + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf + TlsLib|CryptoPkg/Library/TlsLibNull/TlsLibNull.inf + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf --=20 2.39.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 (#99586): https://edk2.groups.io/g/devel/message/99586 Mute This Topic: https://groups.io/mt/96722234/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- From nobody Sun May 19 15:20:01 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+99588+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+99588+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675430898; cv=none; d=zohomail.com; s=zohoarc; b=C7WhFqMFIIAJaoVh+L2+yd43ftbCXiZOz62IDwZDzok4deVcSDWFWytAcx49APMK7Mx+GKcWQfsZBhGY+k1EBMoSSC53A1H0TpuFjL4+S7r8drTFQiDMbFQV+4j+QglPzXp6Itto4w2UOvbK0W5fM1rSog1ZYZDEfF4yOZyOPQw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675430898; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=TNGPyszmRJTr5uivzWtR8R/+yO2czN/GqpkuZXzj6as=; b=d0zeRn+kTZbzB3VgsSOXhxma0B2W6O1FIqBJEakHuleFoSbk8CQuJdF3uWlSqluvr/Q2B/SYHsXaEhOaNXlDJyKDjWNbd0TQbJVbYffnVvLv5V+KdJLtsCN35EMmZRls0hJtg8Xh6SQNISPb0eycjgVU5dO/KpQcvwaZ+C/fldg= 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+99588+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 1675430898011589.3621729559266; Fri, 3 Feb 2023 05:28:18 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id q549YY1788612xjYcCpxL6KX; Fri, 03 Feb 2023 05:28:17 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web11.10304.1675430896650120756 for ; Fri, 03 Feb 2023 05:28:16 -0800 X-Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-155-xypfjb4PMQ6igT44SYfNCw-1; Fri, 03 Feb 2023 08:28:10 -0500 X-MC-Unique: xypfjb4PMQ6igT44SYfNCw-1 X-Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EDBC92A5956F; Fri, 3 Feb 2023 13:28:09 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.85]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B818D140EBF4; Fri, 3 Feb 2023 13:28:09 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 151721800935; Fri, 3 Feb 2023 14:28:06 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Min Xu , Ard Biesheuvel , Gerd Hoffmann , Michael Roth , Jiewen Yao , Jian J Wang , Jordan Justen , Pawel Polawski , Oliver Steffen , Tom Lendacky , Xiaoyu Lu , Erdem Aktas , Guomin Jiang , James Bottomley Subject: [edk2-devel] [PATCH 03/11] OvmfPkg: OvmfPkgX64: use Crypto Libs include Date: Fri, 3 Feb 2023 14:27:58 +0100 Message-Id: <20230203132806.2275708-4-kraxel@redhat.com> In-Reply-To: <20230203132806.2275708-1-kraxel@redhat.com> References: <20230203132806.2275708-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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,kraxel@redhat.com X-Gm-Message-State: yCCbMbFWsSYwjcAgB0BEkql8x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1675430897; bh=J7UynbjYCzSSLkOW2DaWcKwxLT0jcwl3oi4KoO16k6w=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=itswR7BbMG/CBIJCBsJjsuhX6B+JvoDOuG3Fgd0yLCv7/zPeifPct2VY1sADzpX6Ytx udw6iRAS6EInFbDd2BDEHPEzCby9MnziLLV62mrtl3CCigmeQFHe/60vjI3ZNCg2n9gDP g7XyVxb/xoZWTYerP2DpusRj8yZkCuwk+Wo= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1675430898625100013 Content-Type: text/plain; charset="utf-8"; x-default="true" Remove all crypto library references from OvmfPkgX64.dsc, use the new include file instead. Signed-off-by: Gerd Hoffmann --- OvmfPkg/OvmfPkgX64.dsc | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 3f970a79a08a..be46e7e3746f 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -231,12 +231,6 @@ [LibraryClasses] LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseD= ebugPrintErrorLevelLib.inf =20 - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf -!if $(NETWORK_TLS_ENABLE) =3D=3D TRUE - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf -!else - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf -!endif RngLib|MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf =20 !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE @@ -259,10 +253,6 @@ [LibraryClasses] # !include NetworkPkg/NetworkLibs.dsc.inc =20 -!if $(NETWORK_TLS_ENABLE) =3D=3D TRUE - TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf -!endif - !if $(BUILD_SHELL) =3D=3D TRUE ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf !endif @@ -273,9 +263,9 @@ [LibraryClasses] OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib= /BaseOrderedCollectionRedBlackTreeLib.inf =20 !include OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfCryptoLibs.dsc.inc =20 [LibraryClasses.common] - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf CcExitLib|OvmfPkg/Library/CcExitLib/CcExitLib.inf TdxLib|MdePkg/Library/TdxLib/TdxLib.inf TdxMailboxLib|OvmfPkg/Library/TdxMailboxLib/TdxMailboxLib.inf @@ -384,7 +374,6 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER] DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.i= nf !endif UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyL= ibRuntimeDxe.inf @@ -472,7 +461,6 @@ [LibraryClasses.common.DXE_SMM_DRIVER] !if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.inf !endif - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf SmmCpuRendezvousLib|UefiCpuPkg/Library/SmmCpuRendezvousLib/SmmCpuRendezv= ousLib.inf =20 --=20 2.39.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 (#99588): https://edk2.groups.io/g/devel/message/99588 Mute This Topic: https://groups.io/mt/96722236/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- From nobody Sun May 19 15:20:01 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+99589+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+99589+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675430898; cv=none; d=zohomail.com; s=zohoarc; b=hizzhVaZHC0LwTsFUUZEzPV7xFyKKkQ7fufRHTHWWb/001yRc8d7L/9tDdeB6zMq+94rEpml1XG1azKi003vndlxz12wbZCHVrSXTSvTLtvgnHhJEmEWTkl0yaDNnaybK3RZEZuF/4b5gCLaFB14iGTlOSZ6BRdy+3Jz5bOmJc0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675430898; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=ZOUwZQZ+wgDsLX7S4XxGTNCB3OFYYEGjQLHmbuL36Gs=; b=H6tZFPOwZR/M7dGKfS8t93FemcKL/nb/67fQzCpgmn9sd+iwVbIrZZ8u8yVVJQM/f+px8g7vbfUO0Y2zZx6K4kV83UtJCA3bzWYw9ESEL0BJy5zph9pHEQpjXodqr8vmaEYzNokHS9hfEDEox1dhE0g0xQDaVrC8v9Zu6RQmPpg= 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+99589+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 1675430898457832.0107569687523; Fri, 3 Feb 2023 05:28:18 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id IObRYY1788612xZZSy4NoR7o; Fri, 03 Feb 2023 05:28:18 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.10305.1675430896672288621 for ; Fri, 03 Feb 2023 05:28:16 -0800 X-Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-466-Na_kCmn8NmehC8231bStDA-1; Fri, 03 Feb 2023 08:28:12 -0500 X-MC-Unique: Na_kCmn8NmehC8231bStDA-1 X-Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8A2C72A5956F; Fri, 3 Feb 2023 13:28:11 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.85]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2634D53AA; Fri, 3 Feb 2023 13:28:11 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 18E421801A92; Fri, 3 Feb 2023 14:28:06 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Min Xu , Ard Biesheuvel , Gerd Hoffmann , Michael Roth , Jiewen Yao , Jian J Wang , Jordan Justen , Pawel Polawski , Oliver Steffen , Tom Lendacky , Xiaoyu Lu , Erdem Aktas , Guomin Jiang , James Bottomley Subject: [edk2-devel] [PATCH 04/11] OvmfPkg: Add Crypto driver support, add more OvmfCrypto*.inc files. Date: Fri, 3 Feb 2023 14:27:59 +0100 Message-Id: <20230203132806.2275708-5-kraxel@redhat.com> In-Reply-To: <20230203132806.2275708-1-kraxel@redhat.com> References: <20230203132806.2275708-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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,kraxel@redhat.com X-Gm-Message-State: dR6BPgvH3b05H1fsbZDMqdqmx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1675430898; bh=BRs7KPKehZFoyt6o1nhatQ8Nl5EbIy+yRyLuo8jEYFw=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=Z33DoOuNt+rUNS8V+YL/3gsdrfcwyAbHi6kEoHf/MHkgUlDZMEBRudq4CtFoMACwXjM z+7b8UNzxzRXZLDAh/mrkXwv3HORLACCHJ+kfxr02YGJBUjWjg64C/cZVuEw6FxUEXb8C ieEYVzJPolFa7U3dXQ/ignC9bmb7prvlhGQ= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1675430900653100025 Content-Type: text/plain; charset="utf-8"; x-default="true" This patch adds optional CryptoDriver support to OvmfCryptoLibs.dsc.inc. This can be enabled by setting USE_CRYPTO_DRIVER to TRUE. Using the crypto driver needs changes in more places (configure CryptoDriver, add the driver to flash images etc.), so this patch adds more include files for that. Signed-off-by: Gerd Hoffmann --- .../Include/Dsc/OvmfCryptoComponents.dsc.inc | 41 +++++++++++++++++++ OvmfPkg/Include/Dsc/OvmfCryptoDefines.dsc.inc | 5 +++ OvmfPkg/Include/Dsc/OvmfCryptoLibs.dsc.inc | 18 ++++++++ OvmfPkg/Include/Fdf/OvmfCryptoDxeSmm.fdf.inc | 12 ++++++ OvmfPkg/Include/Fdf/OvmfCryptoPei.fdf.inc | 9 ++++ 5 files changed, 85 insertions(+) create mode 100644 OvmfPkg/Include/Dsc/OvmfCryptoComponents.dsc.inc create mode 100644 OvmfPkg/Include/Dsc/OvmfCryptoDefines.dsc.inc create mode 100644 OvmfPkg/Include/Fdf/OvmfCryptoDxeSmm.fdf.inc create mode 100644 OvmfPkg/Include/Fdf/OvmfCryptoPei.fdf.inc diff --git a/OvmfPkg/Include/Dsc/OvmfCryptoComponents.dsc.inc b/OvmfPkg/Inc= lude/Dsc/OvmfCryptoComponents.dsc.inc new file mode 100644 index 000000000000..e34444dde470 --- /dev/null +++ b/OvmfPkg/Include/Dsc/OvmfCryptoComponents.dsc.inc @@ -0,0 +1,41 @@ +## +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +# mostly following CryptoPkg/Readme.md recommendations +## + +!if $(USE_CRYPTO_DRIVER) =3D=3D TRUE + + CryptoPkg/Driver/CryptoPei.inf { + + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf + TlsLib|CryptoPkg/Library/TlsLibNull/TlsLibNull.inf + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf + +!include CryptoPkg/Include/Dsc/CryptoServicePcd.min_pei.dsc.inc + } + + CryptoPkg/Driver/CryptoSmm.inf { + + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf + TlsLib|CryptoPkg/Library/TlsLibNull/TlsLibNull.inf + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf + +!include CryptoPkg/Include/Dsc/CryptoServicePcd.min_dxe_smm.dsc.inc + } + + CryptoPkg/Driver/CryptoDxe.inf { + + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf +!if $(NETWORK_TLS_ENABLE) =3D=3D TRUE + TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf +!else + TlsLib|CryptoPkg/Library/TlsLibNull/TlsLibNull.inf + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf +!endif + +!include CryptoPkg/Include/Dsc/CryptoServicePcd.min_dxe_smm.dsc.inc + } + +!endif diff --git a/OvmfPkg/Include/Dsc/OvmfCryptoDefines.dsc.inc b/OvmfPkg/Includ= e/Dsc/OvmfCryptoDefines.dsc.inc new file mode 100644 index 000000000000..362146e04de8 --- /dev/null +++ b/OvmfPkg/Include/Dsc/OvmfCryptoDefines.dsc.inc @@ -0,0 +1,5 @@ +## +# SPDX-License-Identifier: BSD-2-Clause-Patent +## + + DEFINE USE_CRYPTO_DRIVER =3D FALSE diff --git a/OvmfPkg/Include/Dsc/OvmfCryptoLibs.dsc.inc b/OvmfPkg/Include/D= sc/OvmfCryptoLibs.dsc.inc index a9028352a45e..dc5440ca30c5 100644 --- a/OvmfPkg/Include/Dsc/OvmfCryptoLibs.dsc.inc +++ b/OvmfPkg/Include/Dsc/OvmfCryptoLibs.dsc.inc @@ -13,6 +13,22 @@ [LibraryClasses.common.SEC] TlsLib|CryptoPkg/Library/TlsLibNull/TlsLibNull.inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf =20 +!if $(USE_CRYPTO_DRIVER) =3D=3D TRUE + +[LibraryClasses.common] + BaseCryptLib|CryptoPkg/Library/BaseCryptLibOnProtocolPpi/DxeCryptLib.inf + TlsLib|CryptoPkg/Library/BaseCryptLibOnProtocolPpi/DxeCryptLib.inf + +[LibraryClasses.common.PEIM] + BaseCryptLib|CryptoPkg/Library/BaseCryptLibOnProtocolPpi/PeiCryptLib.inf + TlsLib|CryptoPkg/Library/BaseCryptLibOnProtocolPpi/PeiCryptLib.inf + +[LibraryClasses.common.DXE_SMM_DRIVER] + BaseCryptLib|CryptoPkg/Library/BaseCryptLibOnProtocolPpi/SmmCryptLib.inf + TlsLib|CryptoPkg/Library/BaseCryptLibOnProtocolPpi/SmmCryptLib.inf + +!else + [LibraryClasses.common] BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf !if $(NETWORK_TLS_ENABLE) =3D=3D TRUE @@ -37,3 +53,5 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER] BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf TlsLib|CryptoPkg/Library/TlsLibNull/TlsLibNull.inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf + +!endif diff --git a/OvmfPkg/Include/Fdf/OvmfCryptoDxeSmm.fdf.inc b/OvmfPkg/Include= /Fdf/OvmfCryptoDxeSmm.fdf.inc new file mode 100644 index 000000000000..ad425a7acfaf --- /dev/null +++ b/OvmfPkg/Include/Fdf/OvmfCryptoDxeSmm.fdf.inc @@ -0,0 +1,12 @@ +## +# SPDX-License-Identifier: BSD-2-Clause-Patent +## + +!if $(USE_CRYPTO_DRIVER) =3D=3D TRUE + +INF CryptoPkg/Driver/CryptoDxe.inf +!if $(SMM_REQUIRE) =3D=3D TRUE +INF CryptoPkg/Driver/CryptoSmm.inf +!endif + +!endif diff --git a/OvmfPkg/Include/Fdf/OvmfCryptoPei.fdf.inc b/OvmfPkg/Include/Fd= f/OvmfCryptoPei.fdf.inc new file mode 100644 index 000000000000..7c357d748acb --- /dev/null +++ b/OvmfPkg/Include/Fdf/OvmfCryptoPei.fdf.inc @@ -0,0 +1,9 @@ +## +# SPDX-License-Identifier: BSD-2-Clause-Patent +## + +!if $(USE_CRYPTO_DRIVER) =3D=3D TRUE + +INF CryptoPkg/Driver/CryptoPei.inf + +!endif --=20 2.39.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 (#99589): https://edk2.groups.io/g/devel/message/99589 Mute This Topic: https://groups.io/mt/96722237/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- From nobody Sun May 19 15:20:01 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+99587+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+99587+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675430897; cv=none; d=zohomail.com; s=zohoarc; b=SjtssamlaVvi0nknSBA3Z5lj3JRFlOtDXTVEqA/txzsqKnkLtjVo1lOMO+XlpwXxfvEiJqGoVo8krtS13Hq4P0PsICGsNuQkshTd63yz9Xyj7Xk4+CXbmPFxJbb14qoArJz4IdbMbUkGnJGLENw3MgYw3DCR1zMvxpjv3p4Inic= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675430897; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=LeZVMflAVoYTTK2DUH7m8Pq4iXeO6ZXLa1y4i7shOns=; b=CEfzRXWEfcjtJxjc6RtBkyevLBkMjGtlqN6+38rc7OLM3HAzNQLFTHzYRiYwdVAYZPuZ7mKC2hv2S+6q+HL+ZdBzHeFHcJdzDSMmxtFiJ/9t+jVLmcHZKzMOwVUrB58UZTPDNAUl1aoBEma5wMk467x0zRNo+8/zuaNFCLzS+xo= 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+99587+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 1675430897511324.16611731882017; Fri, 3 Feb 2023 05:28:17 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id 6KAAYY1788612xsVAguYutF5; Fri, 03 Feb 2023 05:28:17 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web10.10088.1675430896230023325 for ; Fri, 03 Feb 2023 05:28:16 -0800 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-504-9s5x7EYyO4aWbXEQY7K7Iw-1; Fri, 03 Feb 2023 08:28:12 -0500 X-MC-Unique: 9s5x7EYyO4aWbXEQY7K7Iw-1 X-Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A9C21101A52E; Fri, 3 Feb 2023 13:28:11 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.85]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6B2B52166B34; Fri, 3 Feb 2023 13:28:11 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 1D2DB1801A93; Fri, 3 Feb 2023 14:28:06 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Min Xu , Ard Biesheuvel , Gerd Hoffmann , Michael Roth , Jiewen Yao , Jian J Wang , Jordan Justen , Pawel Polawski , Oliver Steffen , Tom Lendacky , Xiaoyu Lu , Erdem Aktas , Guomin Jiang , James Bottomley Subject: [edk2-devel] [PATCH 05/11] OvmfPkg: OvmfPkgX64: use new Crypto support includes Date: Fri, 3 Feb 2023 14:28:00 +0100 Message-Id: <20230203132806.2275708-6-kraxel@redhat.com> In-Reply-To: <20230203132806.2275708-1-kraxel@redhat.com> References: <20230203132806.2275708-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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,kraxel@redhat.com X-Gm-Message-State: fwDHj9Y0ld6F3ePuZuZjB9Pqx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1675430897; bh=TgJ7vco5E9kuBQaGnVoFMtHhgBlrdCQ8a+aQnR8L6m0=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=UJoo9ga5ghf0lm8Kbwe1T3oa6G4YUbrpAn9FqE6ftoit9+alkbhQ4w/Va4VGihAQW/r Hyxw46Ak0JHmMdS1uoe/yrW46vZpwdcT6RPgAr/ue8saml0zirt8vQ0ngjNZ7e+ukU7vL OBt4RmW6V0eq1NFy0lkYla1+fubPcXHCLTI= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1675430898618100010 Content-Type: text/plain; charset="utf-8"; x-default="true" Use the new include files which needed for CryptoDriver support. This allows to build OvmfPkgX64.dsc with USE_CRYPTO_DRIVER=3DTRUE. Signed-off-by: Gerd Hoffmann --- OvmfPkg/OvmfPkgX64.dsc | 6 ++++++ OvmfPkg/OvmfPkgX64.fdf | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index be46e7e3746f..294883936a03 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -34,6 +34,7 @@ [Defines] DEFINE SOURCE_DEBUG_ENABLE =3D FALSE =20 !include OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfCryptoDefines.dsc.inc =20 # # Shell can be useful for debugging but should not be enabled for produc= tion @@ -954,6 +955,11 @@ [Components] =20 OvmfPkg/VirtioNetDxe/VirtioNet.inf =20 + # + # Crypto Support + # +!include OvmfPkg/Include/Dsc/OvmfCryptoComponents.dsc.inc + # # Usb Support # diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index 8c02dfe11e37..966d1371999e 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -189,6 +189,7 @@ [FV.PEIFV] INF FILE_GUID =3D $(UP_CPU_PEI_GUID) UefiCpuPkg/CpuMpPei/CpuMpPei.inf =20 !include OvmfPkg/OvmfTpmPei.fdf.inc +!include OvmfPkg/Include/Fdf/OvmfCryptoPei.fdf.inc =20 ##########################################################################= ###### =20 @@ -407,6 +408,11 @@ [FV.DXEFV] # !include OvmfPkg/OvmfTpmDxe.fdf.inc =20 +# +# Crypto support +# +!include OvmfPkg/Include/Fdf/OvmfCryptoDxeSmm.fdf.inc + ##########################################################################= ###### =20 [FV.FVMAIN_COMPACT] --=20 2.39.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 (#99587): https://edk2.groups.io/g/devel/message/99587 Mute This Topic: https://groups.io/mt/96722235/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- From nobody Sun May 19 15:20:01 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+99591+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+99591+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675430899; cv=none; d=zohomail.com; s=zohoarc; b=h9VSankNlhuSOzEXc8bVevg/dGaHdH8P66bDbUjvKhYfVrS+E8vkkrMsHlBQLWaw+i6guOBvGAvEtGXzwcL3A2V5ekoROoFwXuhCIL6D5a6fsHyAePPVHZ5FZNG4LcA2DwxElzeUYfkQIiULAcQ66bCFeuHJuI7AzADnR7yp51I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675430899; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=DBbwvcCa12m27tl+U3n3l3vZ49VnvdmaXlIOGElAmnc=; b=jTKZScasvmWKMPWJWv446tLAoxncuwsIKi7r0SiA6Yh8c4QJgd0nd+Dk29OI9V6IU9n70xn2MmENTVXf2MkgQnG3nTE6MkAMFOwxjSbBDKhfJC5W0dXoOGsKN2D0OAZwaAdGvE1zdPFD0iejYOxuKAc9YA4bfz8Z3c6e/VGpA8A= 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+99591+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 1675430899296930.4251441823011; Fri, 3 Feb 2023 05:28:19 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id 6XueYY1788612x1VEYVB6WCz; Fri, 03 Feb 2023 05:28:19 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web10.10089.1675430898061935627 for ; Fri, 03 Feb 2023 05:28:18 -0800 X-Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-130-jUBFvfIxOGCr-0NoglsG6Q-1; Fri, 03 Feb 2023 08:28:14 -0500 X-MC-Unique: jUBFvfIxOGCr-0NoglsG6Q-1 X-Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 662541C05135; Fri, 3 Feb 2023 13:28:13 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.85]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EBA3B7AD4; Fri, 3 Feb 2023 13:28:12 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 2153D1801A94; Fri, 3 Feb 2023 14:28:06 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Min Xu , Ard Biesheuvel , Gerd Hoffmann , Michael Roth , Jiewen Yao , Jian J Wang , Jordan Justen , Pawel Polawski , Oliver Steffen , Tom Lendacky , Xiaoyu Lu , Erdem Aktas , Guomin Jiang , James Bottomley Subject: [edk2-devel] [PATCH 06/11] OvmfPkg: add OVMF_X64_CRYPTO_DRIVER test case Date: Fri, 3 Feb 2023 14:28:01 +0100 Message-Id: <20230203132806.2275708-7-kraxel@redhat.com> In-Reply-To: <20230203132806.2275708-1-kraxel@redhat.com> References: <20230203132806.2275708-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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,kraxel@redhat.com X-Gm-Message-State: 4nx4AjSYNUY3S252gBXIHluFx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1675430899; bh=/htMOMr6Jf96PCgMH57F9VWeSN/fGYlIc9tO9BdEx74=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=m5GcFcCiPelX5RECcY7gSYSYWXm3GLEOD0IaVjLKDkRaMdYz68zzbbt0eYqWJz+NO9H DUvicpTb6Y1fDR27Ug5CWIx3JdoAaHqeC5/Xj/UofHGTFN3MWKNy21qEqmT9ECFy49icY WkPL/guMIwgpcfXROA01vjC4qK2V/EPYH2w= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1675430900618100021 Content-Type: text/plain; charset="utf-8"; x-default="true" Add one build config with USE_CRYPTO_DRIVER=3DTRUE to CI. Signed-off-by: Gerd Hoffmann --- OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml b/OvmfPkg/P= latformCI/.azurepipelines/Ubuntu-GCC5.yml index 1cf9bdf8b9c2..b3b6b02496ab 100644 --- a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml +++ b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml @@ -58,6 +58,13 @@ jobs: Build.Target: "DEBUG" Run.Flags: $(run_flags) Run: $(should_run) + OVMF_X64_CRYPTO_DRIVER: + Build.File: "$(package)/PlatformCI/PlatformBuild.py" + Build.Arch: "X64" + Build.Flags: "BLD_*_USE_CRYPTO_DRIVER=3D1" + Build.Target: "DEBUG" + Run.Flags: $(run_flags) + Run: $(should_run) OVMF_X64_RELEASE: Build.File: "$(package)/PlatformCI/PlatformBuild.py" Build.Arch: "X64" --=20 2.39.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 (#99591): https://edk2.groups.io/g/devel/message/99591 Mute This Topic: https://groups.io/mt/96722239/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- From nobody Sun May 19 15:20:01 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+99594+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+99594+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675430901; cv=none; d=zohomail.com; s=zohoarc; b=DbFufK7/RaY+ifgXixO0GmwrkPeXYYYRuYA96ms+upU5uJcWG9vxdFF0eGJFa04cbCX4wIievq1wjQEjHO/fGkALcBTm4u3OgV07Gx9vvedBGnwbjsWil3IIa95EsuK0R06o6GyCP9D9bh5fA/Cerqs8cPtuRKWvPlYhPR+eNVY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675430901; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=EGrf4II/e0+46PYS86IlPYLThTsBza+OBS8yYRGepxc=; b=FtIXqTGkjfcESPhbm4j7OEmWSo5TvdV/hAIDfv5fji1HOyx4ZSubFrzPBN8nmaDaaFAl2hp5R+JsvDJGLdzkbyRJrube7K5Q1cXzStyXUDxUH0Ym+xYHvOVc4OrwE7g0LOW6dcJJr/oeC4+V+FFpSPHhi9opB2zbX6OHYWye5fY= 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+99594+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 16754309018011018.2423736048279; Fri, 3 Feb 2023 05:28:21 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id tEVaYY1788612xJdzCUVhJYZ; Fri, 03 Feb 2023 05:28:21 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.10310.1675430900501604362 for ; Fri, 03 Feb 2023 05:28:20 -0800 X-Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-326-A9mQl9DZPDqlccJ_OODzyw-1; Fri, 03 Feb 2023 08:28:14 -0500 X-MC-Unique: A9mQl9DZPDqlccJ_OODzyw-1 X-Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2EB322A5956F; Fri, 3 Feb 2023 13:28:13 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.85]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EA2B853AA; Fri, 3 Feb 2023 13:28:12 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 259C81803098; Fri, 3 Feb 2023 14:28:06 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Min Xu , Ard Biesheuvel , Gerd Hoffmann , Michael Roth , Jiewen Yao , Jian J Wang , Jordan Justen , Pawel Polawski , Oliver Steffen , Tom Lendacky , Xiaoyu Lu , Erdem Aktas , Guomin Jiang , James Bottomley Subject: [edk2-devel] [PATCH 07/11] OvmfPkg: OvmfPkgIa32X64: use crypto includes Date: Fri, 3 Feb 2023 14:28:02 +0100 Message-Id: <20230203132806.2275708-8-kraxel@redhat.com> In-Reply-To: <20230203132806.2275708-1-kraxel@redhat.com> References: <20230203132806.2275708-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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,kraxel@redhat.com X-Gm-Message-State: BxI8DDdB2K3nKqVQMpmpTBgvx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1675430901; bh=XiOsCB9M3fxCDPLUpwLZWpQVodqV6V3vshrub9FKwKc=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=QDqu6CTeERL99X9qOdIWShdNgU6VF0h7RcJ6JfAyxCFsl5dwtFDrIBeF7OCUUvEKG+f Xc+XnCQKFz46x5lPShyfB34F0BU/R32+YiEue3HKnzEmQjHxYX1Rv45UIbSWHP3VXzBc8 dCJsLopy3naPmQ9KKyYuZv4vSDojwpycTRE= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1675430902618100032 Content-Type: text/plain; charset="utf-8"; x-default="true" Use the new crypto support include files. Signed-off-by: Gerd Hoffmann --- OvmfPkg/OvmfPkgIa32X64.dsc | 20 +++++++------------- OvmfPkg/OvmfPkgIa32X64.fdf | 6 ++++++ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index a9d422bd9169..12f3c4d5cf6f 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -34,6 +34,7 @@ [Defines] DEFINE SOURCE_DEBUG_ENABLE =3D FALSE =20 !include OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfCryptoDefines.dsc.inc =20 # # Shell can be useful for debugging but should not be enabled for produc= tion @@ -215,12 +216,6 @@ [LibraryClasses] LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseD= ebugPrintErrorLevelLib.inf =20 - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf -!if $(NETWORK_TLS_ENABLE) =3D=3D TRUE - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf -!else - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf -!endif RngLib|MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf =20 !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE @@ -243,10 +238,6 @@ [LibraryClasses] # !include NetworkPkg/NetworkLibs.dsc.inc =20 -!if $(NETWORK_TLS_ENABLE) =3D=3D TRUE - TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf -!endif - !if $(BUILD_SHELL) =3D=3D TRUE ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf !endif @@ -257,9 +248,9 @@ [LibraryClasses] OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib= /BaseOrderedCollectionRedBlackTreeLib.inf =20 !include OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfCryptoLibs.dsc.inc =20 [LibraryClasses.common] - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf CcExitLib|UefiCpuPkg/Library/CcExitLibNull/CcExitLibNull.inf TdxLib|MdePkg/Library/TdxLib/TdxLib.inf TdxMailboxLib|OvmfPkg/Library/TdxMailboxLib/TdxMailboxLibNull.inf @@ -364,7 +355,6 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER] DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.i= nf !endif UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyL= ibRuntimeDxe.inf @@ -452,7 +442,6 @@ [LibraryClasses.common.DXE_SMM_DRIVER] !if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.inf !endif - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf SmmCpuRendezvousLib|UefiCpuPkg/Library/SmmCpuRendezvousLib/SmmCpuRendezv= ousLib.inf =20 @@ -898,6 +887,11 @@ [Components.X64] =20 OvmfPkg/VirtioNetDxe/VirtioNet.inf =20 + # + # Crypto Support + # +!include OvmfPkg/Include/Dsc/OvmfCryptoComponents.dsc.inc + # # Usb Support # diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index 4c5bd0dbc3b0..cf287303cb2c 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -173,6 +173,7 @@ [FV.PEIFV] INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf =20 !include OvmfPkg/OvmfTpmPei.fdf.inc +!include OvmfPkg/Include/Fdf/OvmfCryptoPei.fdf.inc =20 ##########################################################################= ###### =20 @@ -380,6 +381,11 @@ [FV.DXEFV] # !include OvmfPkg/OvmfTpmDxe.fdf.inc =20 +# +# Crypto support +# +!include OvmfPkg/Include/Fdf/OvmfCryptoDxeSmm.fdf.inc + ##########################################################################= ###### =20 [FV.FVMAIN_COMPACT] --=20 2.39.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 (#99594): https://edk2.groups.io/g/devel/message/99594 Mute This Topic: https://groups.io/mt/96722243/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- From nobody Sun May 19 15:20:01 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+99590+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+99590+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675430898; cv=none; d=zohomail.com; s=zohoarc; b=dFAJloBqFQKuOGfgry7sPPeQz/UmgqJP2xVzBr2wjXbGStSdVZcPH9h/T+z9Ey3SKXdw80N6ZxH7iUS8ZwP8LzuH3s2BlPRz/aOV3pGUCOOYpXCy2IGQy54cU0+tEuaRUknkiSd2JdfzkHWkC1o0DNdDQTRWQ/cT5Vx8+e/pmNE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675430898; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=kze/UuSY0BGD9VW+hEiAXx1+zSG6cvXIizUGm++HD3k=; b=hVvP9Ppui6zGCh3Ryx2jPqc96bWo+yeiMZ9pAvuVhEuJTtARHkaTyn5qHh4THT9m+BlJTDBtj/zGAoYHnEaJO/yHajcXUnVryyZtmIBe300ZlPcmCPI/k/rgrq1/rio54RqpFRsFT6fXnmB4/aoEqvdsxBqDDVA+mOKrkfJuT1U= 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+99590+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 1675430898916199.2635934553365; Fri, 3 Feb 2023 05:28:18 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id Jxw1YY1788612xNdUDoZg9ls; Fri, 03 Feb 2023 05:28:18 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.10306.1675430897413057328 for ; Fri, 03 Feb 2023 05:28:17 -0800 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-518-NrpVWS0fMZ-6RNmlHQyUwQ-1; Fri, 03 Feb 2023 08:28:15 -0500 X-MC-Unique: NrpVWS0fMZ-6RNmlHQyUwQ-1 X-Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E32C385CCE1; Fri, 3 Feb 2023 13:28:14 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.85]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9EAF6C15BA0; Fri, 3 Feb 2023 13:28:14 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 296BF1804A67; Fri, 3 Feb 2023 14:28:06 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Min Xu , Ard Biesheuvel , Gerd Hoffmann , Michael Roth , Jiewen Yao , Jian J Wang , Jordan Justen , Pawel Polawski , Oliver Steffen , Tom Lendacky , Xiaoyu Lu , Erdem Aktas , Guomin Jiang , James Bottomley Subject: [edk2-devel] [PATCH 08/11] OvmfPkg: OvmfPkgIa32: use crypto includes Date: Fri, 3 Feb 2023 14:28:03 +0100 Message-Id: <20230203132806.2275708-9-kraxel@redhat.com> In-Reply-To: <20230203132806.2275708-1-kraxel@redhat.com> References: <20230203132806.2275708-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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,kraxel@redhat.com X-Gm-Message-State: eUiM9l6iQCPhee9ujji8MI7fx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1675430898; bh=3H5XtKvMDJjGAzVURx532VeSd9XGV9IS8cjUqHUIqTw=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=YBQbzZfx6Ptefz00dxNQR3nB35lVqh3FkNuiDuIAzAYKswfR8DEwtPQx+RDIkeM4QB+ U08O5uOgHH/tvzAAVG40XGycyknG/uth1Rvyk240ID1s6HOTPttFF2XMUg3Gd4cYNz9nN 7vk6BBT8dg2dPLSNhQuwAAq/smK3mo4rcJk= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1675430900637100023 Content-Type: text/plain; charset="utf-8"; x-default="true" Use the new crypto support include files. Signed-off-by: Gerd Hoffmann --- OvmfPkg/OvmfPkgIa32.dsc | 20 +++++++------------- OvmfPkg/OvmfPkgIa32.fdf | 6 ++++++ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index f232de13a7b6..2cd074b8a023 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -35,6 +35,7 @@ [Defines] DEFINE LOAD_X64_ON_IA32_ENABLE =3D FALSE =20 !include OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfCryptoDefines.dsc.inc =20 # # Shell can be useful for debugging but should not be enabled for produc= tion @@ -211,12 +212,6 @@ [LibraryClasses] LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseD= ebugPrintErrorLevelLib.inf =20 - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf -!if $(NETWORK_TLS_ENABLE) =3D=3D TRUE - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf -!else - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf -!endif RngLib|MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf =20 !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE @@ -239,10 +234,6 @@ [LibraryClasses] # !include NetworkPkg/NetworkLibs.dsc.inc =20 -!if $(NETWORK_TLS_ENABLE) =3D=3D TRUE - TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf -!endif - !if $(BUILD_SHELL) =3D=3D TRUE ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf !endif @@ -253,9 +244,9 @@ [LibraryClasses] OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib= /BaseOrderedCollectionRedBlackTreeLib.inf =20 !include OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfCryptoLibs.dsc.inc =20 [LibraryClasses.common] - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf CcExitLib|UefiCpuPkg/Library/CcExitLibNull/CcExitLibNull.inf TdxMailboxLib|OvmfPkg/Library/TdxMailboxLib/TdxMailboxLibNull.inf =20 @@ -359,7 +350,6 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER] DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.i= nf !endif UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyL= ibRuntimeDxe.inf @@ -447,7 +437,6 @@ [LibraryClasses.common.DXE_SMM_DRIVER] !if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.inf !endif - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf SmmCpuRendezvousLib|UefiCpuPkg/Library/SmmCpuRendezvousLib/SmmCpuRendezv= ousLib.inf =20 @@ -885,6 +874,11 @@ [Components] =20 OvmfPkg/VirtioNetDxe/VirtioNet.inf =20 + # + # Crypto Support + # +!include OvmfPkg/Include/Dsc/OvmfCryptoComponents.dsc.inc + # # Usb Support # diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index 5451bfb84525..552730485123 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -173,6 +173,7 @@ [FV.PEIFV] INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf =20 !include OvmfPkg/OvmfTpmPei.fdf.inc +!include OvmfPkg/Include/Fdf/OvmfCryptoPei.fdf.inc =20 ##########################################################################= ###### =20 @@ -373,6 +374,11 @@ [FV.DXEFV] # !include OvmfPkg/OvmfTpmDxe.fdf.inc =20 +# +# Crypto support +# +!include OvmfPkg/Include/Fdf/OvmfCryptoDxeSmm.fdf.inc + !if $(LOAD_X64_ON_IA32_ENABLE) =3D=3D TRUE INF OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf !endif --=20 2.39.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 (#99590): https://edk2.groups.io/g/devel/message/99590 Mute This Topic: https://groups.io/mt/96722238/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- From nobody Sun May 19 15:20:01 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+99592+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+99592+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675430900; cv=none; d=zohomail.com; s=zohoarc; b=ilGDt24qiPuhU3jxDp3cfSj1oayta8bq1EFNrO4NndLLH3qwM8IBFAbMcYlWR22oRXbAD4VGLoUwmg2+spplg9ttb00cbgqwe+rCynorYPZBOxUPhTHhfaIodO98kQIxOR54LQs68d0iaEmIvsg0EH0I6VgXMgRakpSg64+LkHo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675430900; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=539CN50twurAf/Y0HkQdatsWPB9Qqp7BymlUxcyVmJg=; b=E0CuUttX3SImtUONPis3yDT/fuwvZs7kbxSxk7+ZEV58VQMhxckJMmw7wZtr2RxMk+S9N0Nr27hkte5naGgF2zDxIsfVxLT5nEQVH2Hm2jpjG7Ci4BNfCOZm4BZ6f6L2Juu0fzR+XZFDDHcwBbE6BA3TAA7zPSGCn+x5A0xlIJ0= 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+99592+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 1675430900884879.7434893205357; Fri, 3 Feb 2023 05:28:20 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id RheEYY1788612xaoMrJatq4z; Fri, 03 Feb 2023 05:28:20 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web11.10308.1675430899822927716 for ; Fri, 03 Feb 2023 05:28:19 -0800 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-451-OAcdl4u1MAyGNuZ5NSiJXg-1; Fri, 03 Feb 2023 08:28:15 -0500 X-MC-Unique: OAcdl4u1MAyGNuZ5NSiJXg-1 X-Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1C773857F43; Fri, 3 Feb 2023 13:28:15 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.85]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A14422166B34; Fri, 3 Feb 2023 13:28:14 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 2D7951804A68; Fri, 3 Feb 2023 14:28:06 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Min Xu , Ard Biesheuvel , Gerd Hoffmann , Michael Roth , Jiewen Yao , Jian J Wang , Jordan Justen , Pawel Polawski , Oliver Steffen , Tom Lendacky , Xiaoyu Lu , Erdem Aktas , Guomin Jiang , James Bottomley Subject: [edk2-devel] [PATCH 09/11] OvmfPkg: Microvm: use crypto includes Date: Fri, 3 Feb 2023 14:28:04 +0100 Message-Id: <20230203132806.2275708-10-kraxel@redhat.com> In-Reply-To: <20230203132806.2275708-1-kraxel@redhat.com> References: <20230203132806.2275708-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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,kraxel@redhat.com X-Gm-Message-State: VXBTWQ43GmKWW8QqNUtK1HnOx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1675430900; bh=DV30p4kMN2nCPfS3rj3zUgohSN1rfX7WfXRX9yPKYjk=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=nf6jVf3win3KvsvzeKUeMjaf2fpLnkXsvwCptmZIymYXxrn1qA3XIG5OfU8rdAsOGqA iHmPmMkZCqzKfvsFd2TwSb2Oxu4F1G5DjJYwGw0KHjFPKcQK6OLEUBMrV4NYR/4MbY8cz STRrKh5ChyluLkne6ZXinq9lw3dmUpJ/9sc= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1675430902618100033 Content-Type: text/plain; charset="utf-8"; x-default="true" Use the new crypto support include files. Signed-off-by: Gerd Hoffmann --- OvmfPkg/Microvm/MicrovmX64.dsc | 22 +++++++++------------- OvmfPkg/Microvm/MicrovmX64.fdf | 7 +++++++ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc index 2d53b5c2950d..317b5c189214 100644 --- a/OvmfPkg/Microvm/MicrovmX64.dsc +++ b/OvmfPkg/Microvm/MicrovmX64.dsc @@ -33,6 +33,8 @@ [Defines] DEFINE SMM_REQUIRE =3D FALSE DEFINE SOURCE_DEBUG_ENABLE =3D FALSE =20 +!include OvmfPkg/Include/Dsc/OvmfCryptoDefines.dsc.inc + # # Network definition # @@ -206,12 +208,6 @@ [LibraryClasses] LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseD= ebugPrintErrorLevelLib.inf =20 - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf -!if $(NETWORK_TLS_ENABLE) =3D=3D TRUE - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf -!else - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf -!endif RngLib|MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf =20 !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE @@ -234,10 +230,6 @@ [LibraryClasses] # !include NetworkPkg/NetworkLibs.dsc.inc =20 -!if $(NETWORK_TLS_ENABLE) =3D=3D TRUE - TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf -!endif - ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScrip= tLib.inf @@ -247,8 +239,9 @@ [LibraryClasses] Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibNull/DxeT= cg2PhysicalPresenceLib.inf TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurem= entLibNull.inf =20 +!include OvmfPkg/Include/Dsc/OvmfCryptoLibs.dsc.inc + [LibraryClasses.common] - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf CcExitLib|OvmfPkg/Library/CcExitLib/CcExitLib.inf SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPort= Lib16550.inf PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatfor= mHookLibNull.inf @@ -356,7 +349,6 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER] DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.i= nf !endif UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf # PciLib|MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf # PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib= .inf # PciExpressLib|OvmfPkg/Library/BaseCachingPciExpressLib/BaseCachingPciEx= pressLib.inf @@ -441,7 +433,6 @@ [LibraryClasses.common.DXE_SMM_DRIVER] !if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.inf !endif - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf PciLib|MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.= inf PciExpressLib|OvmfPkg/Library/BaseCachingPciExpressLib/BaseCachingPciExp= ressLib.inf @@ -823,6 +814,11 @@ [Components] =20 OvmfPkg/VirtioNetDxe/VirtioNet.inf =20 + # + # Crypto Support + # +!include OvmfPkg/Include/Dsc/OvmfCryptoComponents.dsc.inc + # # Usb Support # diff --git a/OvmfPkg/Microvm/MicrovmX64.fdf b/OvmfPkg/Microvm/MicrovmX64.fdf index b83fd1e6e4fe..92d4b446b7fe 100644 --- a/OvmfPkg/Microvm/MicrovmX64.fdf +++ b/OvmfPkg/Microvm/MicrovmX64.fdf @@ -149,6 +149,8 @@ [FV.PEIFV] INF UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf =20 +!include OvmfPkg/Include/Fdf/OvmfCryptoPei.fdf.inc + ##########################################################################= ###### =20 [FV.DXEFV] @@ -302,6 +304,11 @@ [FV.DXEFV] INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf =20 +# +# Crypto support +# +!include OvmfPkg/Include/Fdf/OvmfCryptoDxeSmm.fdf.inc + ##########################################################################= ###### =20 [FV.FVMAIN_COMPACT] --=20 2.39.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 (#99592): https://edk2.groups.io/g/devel/message/99592 Mute This Topic: https://groups.io/mt/96722241/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- From nobody Sun May 19 15:20:01 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+99593+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+99593+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675430901; cv=none; d=zohomail.com; s=zohoarc; b=kbZSrZ75HI2Pxf3RJavU25GvUfWnf1JqLLAs1AkVS/Y9ktQq1m5/rdRkUGRVwoI79u+s1RUe/CP+Jnlt3wN7YEx2eaPMVYzvx92dU/5TTaDCcTrho3k55EY1wcFbKFSiNnFl5YeC/Y7RL5HfmzVaMrM3kdS2VZDxV7BEvBSaReg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675430901; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=JOb69F/Srvtn17ovdmfdDjG4jNdG05YtqrQqu33yONg=; b=hmYXXvWOo6etsvhQ15xn29uj9BaTyl6OV6gnsuKvyyffDmAPMJIEAVv20QtwAl4Ir4dWEM5UVwKby4y6b24qScER1iuHmhO+3qmNqWCy9ozeaGFugcetm3GMbic7Eqarj20F1NKreJUFFN5ldZIZmloInbHOgv/jNXuiB+eiets= 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+99593+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 1675430901378227.8309021218032; Fri, 3 Feb 2023 05:28:21 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id K5joYY1788612xx5b2gMVHfa; Fri, 03 Feb 2023 05:28:21 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web11.10309.1675430899942824642 for ; Fri, 03 Feb 2023 05:28:20 -0800 X-Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-167-zNDzoanRO6OFr_T0Sz90sw-1; Fri, 03 Feb 2023 08:28:17 -0500 X-MC-Unique: zNDzoanRO6OFr_T0Sz90sw-1 X-Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 916023806101; Fri, 3 Feb 2023 13:28:16 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.85]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 59421492C14; Fri, 3 Feb 2023 13:28:16 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 314C71804A69; Fri, 3 Feb 2023 14:28:06 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Min Xu , Ard Biesheuvel , Gerd Hoffmann , Michael Roth , Jiewen Yao , Jian J Wang , Jordan Justen , Pawel Polawski , Oliver Steffen , Tom Lendacky , Xiaoyu Lu , Erdem Aktas , Guomin Jiang , James Bottomley Subject: [edk2-devel] [PATCH 10/11] OvmfPkg: IntelTdx: use crypto includes Date: Fri, 3 Feb 2023 14:28:05 +0100 Message-Id: <20230203132806.2275708-11-kraxel@redhat.com> In-Reply-To: <20230203132806.2275708-1-kraxel@redhat.com> References: <20230203132806.2275708-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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,kraxel@redhat.com X-Gm-Message-State: A7ZWsqW74igSshzw3DqR8S0kx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1675430901; bh=xpgGIuS6uu7pqYBx/jsqwd5u++oB1bY1dkPNriUQQ+8=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=GM2vmJ5E3UA4tpxwuIGgKps/K70lGdR1PAT9F4dlamS/pPp/R5ZcVYytJKw9A2Ukprz BXPgvj6QTPb89YKsaOvPRPasFQW+BeuQnQAnle8/PMVb0qEeLeUpxv9uaNpn1OBmeGODo gnfpYftZl6xFVDyiRH/uonoCC3vXcocP3LE= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1675430902621100034 Content-Type: text/plain; charset="utf-8"; x-default="true" Use the new crypto support include files. Signed-off-by: Gerd Hoffmann --- OvmfPkg/IntelTdx/IntelTdxX64.dsc | 15 +++++++++------ OvmfPkg/IntelTdx/IntelTdxX64.fdf | 5 +++++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc b/OvmfPkg/IntelTdx/IntelTdxX6= 4.dsc index 0f1e970fbbb3..6b2b4d3f2dd5 100644 --- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc +++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc @@ -36,6 +36,8 @@ [Defines] # DEFINE BUILD_SHELL =3D TRUE =20 +!include OvmfPkg/Include/Dsc/OvmfCryptoDefines.dsc.inc + # # Device drivers # @@ -191,8 +193,6 @@ [LibraryClasses] LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseD= ebugPrintErrorLevelLib.inf =20 - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf RngLib|MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf =20 !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE @@ -220,8 +220,9 @@ [LibraryClasses] Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibNull/DxeT= cg2PhysicalPresenceLib.inf TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasure= mentLib.inf =20 +!include OvmfPkg/Include/Dsc/OvmfCryptoLibs.dsc.inc + [LibraryClasses.common] - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf CcExitLib|OvmfPkg/Library/CcExitLib/CcExitLib.inf TdxLib|MdePkg/Library/TdxLib/TdxLib.inf TdxMailboxLib|OvmfPkg/Library/TdxMailboxLib/TdxMailboxLib.inf @@ -280,7 +281,6 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER] DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.i= nf !endif UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyL= ibRuntimeDxe.inf @@ -355,7 +355,6 @@ [LibraryClasses.common.DXE_SMM_DRIVER] DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.i= nf !endif CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuE= xceptionHandlerLib.inf - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf =20 [LibraryClasses.common.SMM_CORE] @@ -549,7 +548,6 @@ [Components] NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompre= ssLib.inf TpmMeasurementLib|SecurityPkg/Library/SecTpmMeasurementLib/SecTpmMea= surementLibTdx.inf - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf HashLib|SecurityPkg/Library/HashLibTdx/HashLibTdx.inf NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384= .inf } @@ -717,6 +715,11 @@ [Components] MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.= inf MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsRes= ourceTableDxe.inf =20 + # + # Crypto Support + # +!include OvmfPkg/Include/Dsc/OvmfCryptoComponents.dsc.inc + # # Usb Support # diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.fdf b/OvmfPkg/IntelTdx/IntelTdxX6= 4.fdf index 73dffc104301..e1b07449b7a9 100644 --- a/OvmfPkg/IntelTdx/IntelTdxX64.fdf +++ b/OvmfPkg/IntelTdx/IntelTdxX64.fdf @@ -257,6 +257,11 @@ [FV.DXEFV] # INF SecurityPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.inf =20 +# +# Crypto support +# +!include OvmfPkg/Include/Fdf/OvmfCryptoDxeSmm.fdf.inc + ##########################################################################= ###### =20 [FV.NCCFV] --=20 2.39.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 (#99593): https://edk2.groups.io/g/devel/message/99593 Mute This Topic: https://groups.io/mt/96722242/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- From nobody Sun May 19 15:20:01 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+99595+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+99595+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675430903; cv=none; d=zohomail.com; s=zohoarc; b=R3RrPKoaC+ICFA0FYNbx9niz/EDK/dcZbA6hI5boKch+k4Sn0rD8m7d2uot4DerW59zM/xdvE+QRgyaUoObCQ9VnJbuZntADKC9YFP4Rx77zwcwA8sWuLmB6vz/xapwL4deDS4lUp2zr1cQDhjH6rHXpZ8xI7kiTxnDV4oi2C7s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675430903; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=zEVAZlS26Ojz09qdMT4E6H0FsUX9LQP2fDhbTCzaE0o=; b=WCucch0MzgRuD3h99/VMiDnLvY8d+7MCrfIiVs5xLQj4X8Ar21Rx6VMb67oz5K4VLb4z10JXWLI0iYkHL72eShCpsMU9w3Nv2MLF4wLOkN8e1rcT8e67NgCiE7V8JeI7sioDOaB9qK4jQBmteZIL6t1YDPsll6HXI5yC66QldO4= 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+99595+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 1675430903524831.2514954518722; Fri, 3 Feb 2023 05:28:23 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id 5Qw8YY1788612xXvqxnxtDmc; Fri, 03 Feb 2023 05:28:23 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web10.10092.1675430902200818992 for ; Fri, 03 Feb 2023 05:28:22 -0800 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-70-do_j1fLQPJSNCu7oKad93w-1; Fri, 03 Feb 2023 08:28:17 -0500 X-MC-Unique: do_j1fLQPJSNCu7oKad93w-1 X-Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9A69485A5B1; Fri, 3 Feb 2023 13:28:16 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.85]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5B6262026D37; Fri, 3 Feb 2023 13:28:16 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 352241804A6A; Fri, 3 Feb 2023 14:28:06 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Min Xu , Ard Biesheuvel , Gerd Hoffmann , Michael Roth , Jiewen Yao , Jian J Wang , Jordan Justen , Pawel Polawski , Oliver Steffen , Tom Lendacky , Xiaoyu Lu , Erdem Aktas , Guomin Jiang , James Bottomley Subject: [edk2-devel] [PATCH 11/11] OvmfPkg: AmdSev: use crypto includes Date: Fri, 3 Feb 2023 14:28:06 +0100 Message-Id: <20230203132806.2275708-12-kraxel@redhat.com> In-Reply-To: <20230203132806.2275708-1-kraxel@redhat.com> References: <20230203132806.2275708-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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,kraxel@redhat.com X-Gm-Message-State: CiAWG7WXIjMJMbwltJauBUtXx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1675430903; bh=61j4u0wklI6Cuka4igEtCf1og7X+F6VmG/vBj18TVo0=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=VYhB0auTnaWW3vQusAOSoy1s72HNshNkyExk5U10tJ8UJMC8tfgswbzIBhytjZKQRq8 y8lBEHEiRsN6QUm95cmJz+5GqYDdMzvxYanQY23NIB4xdYZmxtZqrgK6LsM3AdfQuCCIT 8CrpJbbo28mnluM4R60jGpE+e1cNTtgWRmQ= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1675430904632100044 Content-Type: text/plain; charset="utf-8"; x-default="true" Use the new crypto support include files. Signed-off-by: Gerd Hoffmann --- OvmfPkg/AmdSev/AmdSevX64.dsc | 11 +++++++---- OvmfPkg/AmdSev/AmdSevX64.fdf | 6 ++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc index 36100f5fdc11..c4624072db16 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc @@ -34,6 +34,7 @@ [Defines] DEFINE SOURCE_DEBUG_ENABLE =3D FALSE =20 !include OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfCryptoDefines.dsc.inc =20 # # Shell can be useful for debugging but should not be enabled for produc= tion @@ -182,8 +183,6 @@ [LibraryClasses] LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseD= ebugPrintErrorLevelLib.inf =20 - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf RngLib|MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf =20 AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLib= Null.inf @@ -201,9 +200,9 @@ [LibraryClasses] OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib= /BaseOrderedCollectionRedBlackTreeLib.inf =20 !include OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfCryptoLibs.dsc.inc =20 [LibraryClasses.common] - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf CcExitLib|OvmfPkg/Library/CcExitLib/CcExitLib.inf TdxLib|MdePkg/Library/TdxLib/TdxLib.inf TdxMailboxLib|OvmfPkg/Library/TdxMailboxLib/TdxMailboxLibNull.inf @@ -310,7 +309,6 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER] DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.i= nf !endif UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyL= ibRuntimeDxe.inf @@ -705,6 +703,11 @@ [Components] OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsRes= ourceTableDxe.inf =20 + # + # Crypto Support + # +!include OvmfPkg/Include/Dsc/OvmfCryptoComponents.dsc.inc + # # Usb Support # diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf index 5fb3b5d27632..84842a601262 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf @@ -163,6 +163,7 @@ [FV.PEIFV] INF OvmfPkg/AmdSev/SecretPei/SecretPei.inf =20 !include OvmfPkg/OvmfTpmPei.fdf.inc +!include OvmfPkg/Include/Fdf/OvmfCryptoPei.fdf.inc =20 ##########################################################################= ###### =20 @@ -318,6 +319,11 @@ [FV.DXEFV] # !include OvmfPkg/OvmfTpmDxe.fdf.inc =20 +# +# Crypto support +# +!include OvmfPkg/Include/Fdf/OvmfCryptoDxeSmm.fdf.inc + ##########################################################################= ###### =20 [FV.FVMAIN_COMPACT] --=20 2.39.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 (#99595): https://edk2.groups.io/g/devel/message/99595 Mute This Topic: https://groups.io/mt/96722244/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-