From mboxrd@z Thu Jan 1 00:00:00 1970 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.web12.8712.1651487681456643217 for ; Mon, 02 May 2022 03:34:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=FHvLXJO6; spf=pass (domain: redhat.com, ip: 170.10.129.124, mailfrom: kraxel@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1651487680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8pSrxTdk8OvfX5HSMkpuk7y/i5pk1fuX2Qfdm3SimBI=; b=FHvLXJO60z8cAhP5MDh/RAX2P6UbDtUHtVk/qOf1FlL5yXZFBg/lKiH5DIbJioxSopD1pw 8RJXz3F3CEhAt4Mw3q31Fdhwxx9abccE8+u18D5UMpKj/ESnaDdwKVlBdKH69wXoNKYVnr WE76qzar0lLIZZ6F8tqWn73TJ6NjeXI= 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-311-0JEj8B-8Mq-GGaaHANVuPg-1; Mon, 02 May 2022 06:34:39 -0400 X-MC-Unique: 0JEj8B-8Mq-GGaaHANVuPg-1 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 82E05811E76; Mon, 2 May 2022 10:34:38 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 121B0C202D1; Mon, 2 May 2022 10:34:38 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 90CE21800619; Mon, 2 May 2022 12:34:36 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Pawel Polawski , yi1.li@intel.com, Jiewen Yao , Oliver Steffen , Jian J Wang , Ard Biesheuvel , Guomin Jiang , Xiaoyu Lu , Jordan Justen , Gerd Hoffmann Subject: [PATCH 1/5] Revert "CryptoPkg: Declare PcdEcEnabled in Library consuming OpensslLib" Date: Mon, 2 May 2022 12:34:32 +0200 Message-Id: <20220502103436.3274412-2-kraxel@redhat.com> In-Reply-To: <20220502103436.3274412-1-kraxel@redhat.com> References: <20220502103436.3274412-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true This reverts commit b06a007b6471b6eba6d1c38ff1bcfff183b57488. Remove PcdEcEnabled switch, not needed when EC is enabled unconditionally. Signed-off-by: Gerd Hoffmann --- CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf | 3 --- CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf | 3 --- CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf | 3 --- CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf | 3 --- CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf | 3 --- CryptoPkg/Library/OpensslLib/OpensslLib.inf | 2 +- CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 2 +- CryptoPkg/Library/TlsLib/TlsLib.inf | 3 --- 8 files changed, 2 insertions(+), 20 deletions(-) diff --git a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf index 5bbdb387d6ba..15cf3dab105c 100644 --- a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf +++ b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf @@ -88,9 +88,6 @@ [LibraryClasses] IntrinsicLib PrintLib -[FixedPcd] - gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled - # # Remove these [BuildOptions] after this library is cleaned up # diff --git a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf index fd500e61ec99..bf1563b06407 100644 --- a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf +++ b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf @@ -77,9 +77,6 @@ [LibraryClasses] OpensslLib IntrinsicLib -[FixedPcd] - gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled - # # Remove these [BuildOptions] after this library is cleaned up # diff --git a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf index 3e4524896c45..6742da0be4fe 100644 --- a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf +++ b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf @@ -93,9 +93,6 @@ [LibraryClasses] IntrinsicLib PrintLib -[FixedPcd] - gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled - # # Remove these [BuildOptions] after this library is cleaned up # diff --git a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf index ae75bc87b5e5..8f39517f78b7 100644 --- a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf +++ b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf @@ -92,9 +92,6 @@ [LibraryClasses] MmServicesTableLib SynchronizationLib -[FixedPcd] - gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled - # # Remove these [BuildOptions] after this library is cleaned up # diff --git a/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf index 44c183b90563..b98f9635b27b 100644 --- a/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf +++ b/CryptoPkg/Library/BaseCryptLib/UnitTestHostBaseCryptLib.inf @@ -72,9 +72,6 @@ [LibraryClasses] DebugLib OpensslLib -[FixedPcd] - gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled - # # Remove these [BuildOptions] after this library is cleaned up # diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf index a97b3f5e8ff2..459ac4864a4e 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf @@ -633,7 +633,7 @@ [LibraryClasses] [LibraryClasses.ARM] ArmSoftFloatLib -[FixedPcd] +[Pcd] gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled ## CONSUMES [BuildOptions] diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf index 490b83602be9..c9d69a368e3c 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf @@ -582,7 +582,7 @@ [LibraryClasses] [LibraryClasses.ARM] ArmSoftFloatLib -[FixedPcd] +[Pcd] gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled ## CONSUMES [BuildOptions] diff --git a/CryptoPkg/Library/TlsLib/TlsLib.inf b/CryptoPkg/Library/TlsLib/TlsLib.inf index 001e13e3990b..27209f4d7fe3 100644 --- a/CryptoPkg/Library/TlsLib/TlsLib.inf +++ b/CryptoPkg/Library/TlsLib/TlsLib.inf @@ -41,9 +41,6 @@ [LibraryClasses] OpensslLib SafeIntLib -[FixedPcd] - gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled - [BuildOptions] # # suppress the following warnings so we do not break the build with warnings-as-errors: -- 2.35.1