From nobody Sat Apr 20 07:17:32 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+89456+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+89456+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1651487684; cv=none; d=zohomail.com; s=zohoarc; b=lVTAKydNxKZfqmpyyecDhZHl1IbjrLkDfeew301bpxsmCJyf9tcjVv4zwZPlrMyTKSjtkOomrGCjRMaW692pq3PvLJ0PGSNJ5Lj6NImOjFtFAjVDmxV7H7TgTfJ/EPWpP6gmi3Oibyx7+cSkXx6lhqZJLCEUJpgT2IPvUmKcXFQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1651487684; 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=GqY7/2ZZu3nqyJ7n0WQFRl1q/aGPO3dGz2sKrdFFEnM=; b=Q3mWs74F5AfWU9WgEp4vNIjogwR+PF2/xvoFF76FtQAw+g02mzcsuZTAXo5Fmu0n27tkTdjPxa7AUxqS3ieG9OmoJ1pmANsV/8ACyF0HcUlln1NAuyQvJ5mjuqZm9gFaR3A7+6WEKjdvfcswYv460gOt/2CuTnUOrBem+cj47m4= 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+89456+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 1651487684550831.6555534962533; Mon, 2 May 2022 03:34:44 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id S5S3YY1788612xO3P2gz7xJB; Mon, 02 May 2022 03:34:44 -0700 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.web12.8712.1651487681456643217 for ; Mon, 02 May 2022 03:34:41 -0700 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-311-0JEj8B-8Mq-GGaaHANVuPg-1; Mon, 02 May 2022 06:34:39 -0400 X-MC-Unique: 0JEj8B-8Mq-GGaaHANVuPg-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 82E05811E76; Mon, 2 May 2022 10:34:38 +0000 (UTC) X-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) X-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: [edk2-devel] [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 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: pucqqxzc0IjiHUsAY8AQ3iukx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1651487684; bh=8MdKSXPIlHidBcoV95t4Tl5twl5MInBfsO3x4Hn/Bxw=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=oI2JgMw7PQQ1hFS9NN6wtludXpXowXScyNyOEasQSO8Amw+UpgpYHgq+naIidETTfv+ bpG4eyv9pvyQl0cOS/xD1xaXz1WrphODWRG44DI2ci6t5J+gknACND2VxHCMsQU1U474R lsSPcoc+msFvASeg+s1TP2C2OcEru53nYv4= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1651487685468100004 Content-Type: text/plain; charset="utf-8"; 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/Li= brary/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 =20 -[FixedPcd] - gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled - # # Remove these [BuildOptions] after this library is cleaned up # diff --git a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf b/CryptoPkg/Lib= rary/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 =20 -[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 =20 -[FixedPcd] - gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled - # # Remove these [BuildOptions] after this library is cleaned up # diff --git a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf b/CryptoPkg/Lib= rary/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 =20 -[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 =20 -[FixedPcd] - gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled - # # Remove these [BuildOptions] after this library is cleaned up # diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Librar= y/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 =20 -[FixedPcd] +[Pcd] gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled ## CONSUMES =20 [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 =20 -[FixedPcd] +[Pcd] gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled ## CONSUMES =20 [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 =20 -[FixedPcd] - gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled - [BuildOptions] # # suppress the following warnings so we do not break the build with warn= ings-as-errors: --=20 2.35.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 (#89456): https://edk2.groups.io/g/devel/message/89456 Mute This Topic: https://groups.io/mt/90832150/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 Sat Apr 20 07:17:32 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+89461+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+89461+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1651487692; cv=none; d=zohomail.com; s=zohoarc; b=F7prHvY5GzNEiBOBmPmRXxnV018d/+E/OmeKwlPzymJNvcd555XxU7podgkqGRSSkq6dePQCT0D+kCB2RZjA6M0RuKx2/FZLHmQrI+LdFvXbTGUdr2bzua27Rz1z73nTkEpTSI6oTAxWSJEceRyln5FF6Qava+b6yVFbB45BThE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1651487692; 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=vl8wjtc9nKpefvis0IP2noq3rNq+g6HGxEft2jYhf/w=; b=L96qW8g8NA4+tYoU3vmj+4H/wYftcO9xhlY31wLhpklyA+y7ELsyDec3NZ8sTBENRIt8I5/8s8ID1rcAVqnfZaTC7bieB0XAQbYMRxn00FQwP4LV6gtkIOmemW2VgaTkB58Aqg2EKIrT8FFLqs3o59TrIyIxMbTERrvIayzaXyc= 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+89461+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 1651487692251677.7680361401059; Mon, 2 May 2022 03:34:52 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ZCvDYY1788612x8Ua1DEQoD6; Mon, 02 May 2022 03:34:51 -0700 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.web08.8889.1651487690449160839 for ; Mon, 02 May 2022 03:34:50 -0700 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-176-Ov1LG9G3NX6Kqre6HVxrYA-1; Mon, 02 May 2022 06:34:46 -0400 X-MC-Unique: Ov1LG9G3NX6Kqre6HVxrYA-1 X-Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6595F29AB403; Mon, 2 May 2022 10:34:46 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D2489112131B; Mon, 2 May 2022 10:34:39 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 966D01800632; 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: [edk2-devel] [PATCH 2/5] Revert "CryptoPkg: Make EC source file config-able" Date: Mon, 2 May 2022 12:34:33 +0200 Message-Id: <20220502103436.3274412-3-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.78 on 10.11.54.3 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: fQ66wA739gBDXrwUOA4wjYm4x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1651487691; bh=Ebe0aFi34eix7yIOtofrpbba+TnnAdugE/33k1+jlhY=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=KoutAAED0Lg6lJLL4B9A2Na6/GemRkc114E78LzVf9yaBRAsSjumr979fundpa/pJPL A3IjnI877eB74xBUWO8NyIBCCF7JnJ46dJmpBgnKB06F/Ms3fel74Bxbcq7MMpxoxAk7j HC/FepmCp9JdngPYsRBCWKEUTinAgCsS7Dg= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1651487693552100013 Content-Type: text/plain; charset="utf-8"; x-default="true" This reverts commit 0c901fcc200e411b78b9ca42d07d5ea4aaa13b21. Patch introduces manual changes to files generated by process_files.pl. Which is a rather bad idea, updates will be very error-prone with this. Signed-off-by: Gerd Hoffmann --- CryptoPkg/CryptoPkg.dec | 4 - CryptoPkg/Library/OpensslLib/OpensslLib.inf | 95 +++++++++---------- .../Library/OpensslLib/OpensslLibCrypto.inf | 95 +++++++++---------- .../Library/Include/openssl/opensslconf.h | 7 +- 4 files changed, 93 insertions(+), 108 deletions(-) diff --git a/CryptoPkg/CryptoPkg.dec b/CryptoPkg/CryptoPkg.dec index ebec64050b71..5888941bab4c 100644 --- a/CryptoPkg/CryptoPkg.dec +++ b/CryptoPkg/CryptoPkg.dec @@ -81,9 +81,5 @@ [PcdsFixedAtBuild] # @ValidList 0x80000001 | 0x00000001, 0x00000002, 0x00000004, 0x00000008= , 0x00000010 gEfiCryptoPkgTokenSpaceGuid.PcdHashApiLibPolicy|0x00000002|UINT32|0x0000= 0001 =20 - ## Enable/Disable the ECC feature in openssl library. The default is dis= abled. - # If ECC feature is disabled, all related source files will not be comp= iled. - gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled|FALSE|BOOLEAN|0x0000003 - [UserExtensions.TianoCore."ExtraFiles"] CryptoPkgExtra.uni diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Librar= y/OpensslLib/OpensslLib.inf index 459ac4864a4e..1d67ed55e1b1 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf @@ -199,43 +199,43 @@ [Sources] $(OPENSSL_PATH)/crypto/dso/dso_vms.c $(OPENSSL_PATH)/crypto/dso/dso_win32.c $(OPENSSL_PATH)/crypto/ebcdic.c - $(OPENSSL_PATH)/crypto/ec/curve25519.c |*|*|*|gEfiCryptoPkgTokenSpa= ceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.c |*|*|*|gEfiCrypt= oPkgTokenSpaceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/curve448/curve448.c |*|*|*|gEfiCryptoPkgTo= kenSpaceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/curve448/curve448_tables.c |*|*|*|gEfiCry= ptoPkgTokenSpaceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/curve448/eddsa.c |*|*|*|gEfiCryptoPkgToke= nSpaceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/curve448/f_generic.c |*|*|*|gEfiCryptoPkg= TokenSpaceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/curve448/scalar.c |*|*|*|gEfiCryptoPkgToke= nSpaceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ec2_oct.c |*|*|*|gEfiCryptoPkgTokenSpaceGu= id.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ec2_smpl.c |*|*|*|gEfiCryptoPkgTokenSpace= Guid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ec_ameth.c |*|*|*|gEfiCryptoPkgTokenSpace= Guid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ec_asn1.c |*|*|*|gEfiCryptoPkgTokenSpaceGu= id.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ec_check.c |*|*|*|gEfiCryptoPkgTokenSpace= Guid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ec_curve.c |*|*|*|gEfiCryptoPkgTokenSpace= Guid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ec_cvt.c |*|*|*|gEfiCryptoPkgTokenSpaceGu= id.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ec_err.c |*|*|*|gEfiCryptoPkgTokenSpaceGu= id.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ec_key.c |*|*|*|gEfiCryptoPkgTokenSpaceGu= id.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ec_kmeth.c |*|*|*|gEfiCryptoPkgTokenSpace= Guid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ec_lib.c |*|*|*|gEfiCryptoPkgTokenSpaceGui= d.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ec_mult.c |*|*|*|gEfiCryptoPkgTokenSpaceGu= id.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ec_oct.c |*|*|*|gEfiCryptoPkgTokenSpaceGu= id.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ec_pmeth.c |*|*|*|gEfiCryptoPkgTokenSpace= Guid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ec_print.c |*|*|*|gEfiCryptoPkgTokenSpace= Guid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ecdh_kdf.c |*|*|*|gEfiCryptoPkgTokenSpace= Guid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ecdh_ossl.c |*|*|*|gEfiCryptoPkgTokenSpace= Guid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ecdsa_ossl.c |*|*|*|gEfiCryptoPkgTokenSpa= ceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ecdsa_sign.c |*|*|*|gEfiCryptoPkgTokenSpa= ceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ecdsa_vrf.c |*|*|*|gEfiCryptoPkgTokenSpace= Guid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/eck_prn.c |*|*|*|gEfiCryptoPkgTokenSpaceGu= id.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ecp_mont.c |*|*|*|gEfiCryptoPkgTokenSpace= Guid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ecp_nist.c |*|*|*|gEfiCryptoPkgTokenSpace= Guid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ecp_nistp224.c |*|*|*|gEfiCryptoPkgTokenS= paceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ecp_nistp256.c |*|*|*|gEfiCryptoPkgTokenS= paceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ecp_nistp521.c |*|*|*|gEfiCryptoPkgTokenS= paceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ecp_nistputil.c |*|*|*|gEfiCryptoPkgTokenS= paceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ecp_oct.c |*|*|*|gEfiCryptoPkgTokenSpaceGu= id.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ecp_smpl.c |*|*|*|gEfiCryptoPkgTokenSpace= Guid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ecx_meth.c |*|*|*|gEfiCryptoPkgTokenSpace= Guid.PcdEcEnabled + $(OPENSSL_PATH)/crypto/ec/curve25519.c + $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.c + $(OPENSSL_PATH)/crypto/ec/curve448/curve448.c + $(OPENSSL_PATH)/crypto/ec/curve448/curve448_tables.c + $(OPENSSL_PATH)/crypto/ec/curve448/eddsa.c + $(OPENSSL_PATH)/crypto/ec/curve448/f_generic.c + $(OPENSSL_PATH)/crypto/ec/curve448/scalar.c + $(OPENSSL_PATH)/crypto/ec/ec2_oct.c + $(OPENSSL_PATH)/crypto/ec/ec2_smpl.c + $(OPENSSL_PATH)/crypto/ec/ec_ameth.c + $(OPENSSL_PATH)/crypto/ec/ec_asn1.c + $(OPENSSL_PATH)/crypto/ec/ec_check.c + $(OPENSSL_PATH)/crypto/ec/ec_curve.c + $(OPENSSL_PATH)/crypto/ec/ec_cvt.c + $(OPENSSL_PATH)/crypto/ec/ec_err.c + $(OPENSSL_PATH)/crypto/ec/ec_key.c + $(OPENSSL_PATH)/crypto/ec/ec_kmeth.c + $(OPENSSL_PATH)/crypto/ec/ec_lib.c + $(OPENSSL_PATH)/crypto/ec/ec_mult.c + $(OPENSSL_PATH)/crypto/ec/ec_oct.c + $(OPENSSL_PATH)/crypto/ec/ec_pmeth.c + $(OPENSSL_PATH)/crypto/ec/ec_print.c + $(OPENSSL_PATH)/crypto/ec/ecdh_kdf.c + $(OPENSSL_PATH)/crypto/ec/ecdh_ossl.c + $(OPENSSL_PATH)/crypto/ec/ecdsa_ossl.c + $(OPENSSL_PATH)/crypto/ec/ecdsa_sign.c + $(OPENSSL_PATH)/crypto/ec/ecdsa_vrf.c + $(OPENSSL_PATH)/crypto/ec/eck_prn.c + $(OPENSSL_PATH)/crypto/ec/ecp_mont.c + $(OPENSSL_PATH)/crypto/ec/ecp_nist.c + $(OPENSSL_PATH)/crypto/ec/ecp_nistp224.c + $(OPENSSL_PATH)/crypto/ec/ecp_nistp256.c + $(OPENSSL_PATH)/crypto/ec/ecp_nistp521.c + $(OPENSSL_PATH)/crypto/ec/ecp_nistputil.c + $(OPENSSL_PATH)/crypto/ec/ecp_oct.c + $(OPENSSL_PATH)/crypto/ec/ecp_smpl.c + $(OPENSSL_PATH)/crypto/ec/ecx_meth.c $(OPENSSL_PATH)/crypto/err/err.c $(OPENSSL_PATH)/crypto/err/err_prn.c $(OPENSSL_PATH)/crypto/evp/bio_b64.c @@ -533,15 +533,15 @@ [Sources] $(OPENSSL_PATH)/crypto/conf/conf_local.h $(OPENSSL_PATH)/crypto/dh/dh_local.h $(OPENSSL_PATH)/crypto/dso/dso_local.h - $(OPENSSL_PATH)/crypto/ec/ec_local.h |*|*|*|gEfiCryptoPkgTokenSpace= Guid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/curve448/curve448_local.h |*|*|*|gEfiCrypt= oPkgTokenSpaceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/curve448/curve448utils.h |*|*|*|gEfiCrypt= oPkgTokenSpaceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/curve448/ed448.h |*|*|*|gEfiCryptoPkgToke= nSpaceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/curve448/field.h |*|*|*|gEfiCryptoPkgToke= nSpaceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/curve448/point_448.h |*|*|*|gEfiCryptoPkg= TokenSpaceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/curve448/word.h |*|*|*|gEfiCryptoPkgTokenS= paceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/arch_intrinsics.h |*|*|*= |gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.h |*|*|*|gEfiCrypt= oPkgTokenSpaceGuid.PcdEcEnabled + $(OPENSSL_PATH)/crypto/ec/ec_local.h + $(OPENSSL_PATH)/crypto/ec/curve448/curve448_local.h + $(OPENSSL_PATH)/crypto/ec/curve448/curve448utils.h + $(OPENSSL_PATH)/crypto/ec/curve448/ed448.h + $(OPENSSL_PATH)/crypto/ec/curve448/field.h + $(OPENSSL_PATH)/crypto/ec/curve448/point_448.h + $(OPENSSL_PATH)/crypto/ec/curve448/word.h + $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/arch_intrinsics.h + $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.h $(OPENSSL_PATH)/crypto/evp/evp_local.h $(OPENSSL_PATH)/crypto/hmac/hmac_local.h $(OPENSSL_PATH)/crypto/lhash/lhash_local.h @@ -633,9 +633,6 @@ [LibraryClasses] [LibraryClasses.ARM] ArmSoftFloatLib =20 -[Pcd] - gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled ## CONSUMES - [BuildOptions] # # Disables the following Visual Studio compiler warnings brought by open= ssl source, diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/= Library/OpensslLib/OpensslLibCrypto.inf index c9d69a368e3c..66ca5b1250c1 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf @@ -199,43 +199,43 @@ [Sources] $(OPENSSL_PATH)/crypto/dso/dso_vms.c $(OPENSSL_PATH)/crypto/dso/dso_win32.c $(OPENSSL_PATH)/crypto/ebcdic.c - $(OPENSSL_PATH)/crypto/ec/curve25519.c |*|*|*|gEfiCryptoPkgTokenSpace= Guid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.c |*|*|*|gEfiCryptoP= kgTokenSpaceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/curve448/curve448.c |*|*|*|gEfiCryptoPkgToke= nSpaceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/curve448/curve448_tables.c |*|*|*|gEfiCrypt= oPkgTokenSpaceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/curve448/eddsa.c |*|*|*|gEfiCryptoPkgTokenS= paceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/curve448/f_generic.c |*|*|*|gEfiCryptoPkgTo= kenSpaceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/curve448/scalar.c |*|*|*|gEfiCryptoPkgTokenS= paceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ec2_oct.c |*|*|*|gEfiCryptoPkgTokenSpaceGuid= .PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ec2_smpl.c |*|*|*|gEfiCryptoPkgTokenSpaceGu= id.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ec_ameth.c |*|*|*|gEfiCryptoPkgTokenSpaceGu= id.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ec_asn1.c |*|*|*|gEfiCryptoPkgTokenSpaceGuid= .PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ec_check.c |*|*|*|gEfiCryptoPkgTokenSpaceGu= id.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ec_curve.c |*|*|*|gEfiCryptoPkgTokenSpaceGu= id.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ec_cvt.c |*|*|*|gEfiCryptoPkgTokenSpaceGuid= .PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ec_err.c |*|*|*|gEfiCryptoPkgTokenSpaceGuid= .PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ec_key.c |*|*|*|gEfiCryptoPkgTokenSpaceGuid= .PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ec_kmeth.c |*|*|*|gEfiCryptoPkgTokenSpaceGu= id.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ec_lib.c |*|*|*|gEfiCryptoPkgTokenSpaceGuid= .PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ec_mult.c |*|*|*|gEfiCryptoPkgTokenSpaceGuid= .PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ec_oct.c |*|*|*|gEfiCryptoPkgTokenSpaceGuid= .PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ec_pmeth.c |*|*|*|gEfiCryptoPkgTokenSpaceGu= id.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ec_print.c |*|*|*|gEfiCryptoPkgTokenSpaceGu= id.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ecdh_kdf.c |*|*|*|gEfiCryptoPkgTokenSpaceGu= id.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ecdh_ossl.c |*|*|*|gEfiCryptoPkgTokenSpaceGu= id.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ecdsa_ossl.c |*|*|*|gEfiCryptoPkgTokenSpace= Guid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ecdsa_sign.c |*|*|*|gEfiCryptoPkgTokenSpace= Guid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ecdsa_vrf.c |*|*|*|gEfiCryptoPkgTokenSpaceGu= id.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/eck_prn.c |*|*|*|gEfiCryptoPkgTokenSpaceGuid= .PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ecp_mont.c |*|*|*|gEfiCryptoPkgTokenSpaceGu= id.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ecp_nist.c |*|*|*|gEfiCryptoPkgTokenSpaceGu= id.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ecp_nistp224.c |*|*|*|gEfiCryptoPkgTokenSpa= ceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ecp_nistp256.c |*|*|*|gEfiCryptoPkgTokenSpa= ceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ecp_nistp521.c |*|*|*|gEfiCryptoPkgTokenSpa= ceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ecp_nistputil.c |*|*|*|gEfiCryptoPkgTokenSpa= ceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ecp_oct.c |*|*|*|gEfiCryptoPkgTokenSpaceGuid= .PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ecp_smpl.c |*|*|*|gEfiCryptoPkgTokenSpaceGu= id.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/ecx_meth.c |*|*|*|gEfiCryptoPkgTokenSpaceGu= id.PcdEcEnabled + $(OPENSSL_PATH)/crypto/ec/curve25519.c + $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.c + $(OPENSSL_PATH)/crypto/ec/curve448/curve448.c + $(OPENSSL_PATH)/crypto/ec/curve448/curve448_tables.c + $(OPENSSL_PATH)/crypto/ec/curve448/eddsa.c + $(OPENSSL_PATH)/crypto/ec/curve448/f_generic.c + $(OPENSSL_PATH)/crypto/ec/curve448/scalar.c + $(OPENSSL_PATH)/crypto/ec/ec2_oct.c + $(OPENSSL_PATH)/crypto/ec/ec2_smpl.c + $(OPENSSL_PATH)/crypto/ec/ec_ameth.c + $(OPENSSL_PATH)/crypto/ec/ec_asn1.c + $(OPENSSL_PATH)/crypto/ec/ec_check.c + $(OPENSSL_PATH)/crypto/ec/ec_curve.c + $(OPENSSL_PATH)/crypto/ec/ec_cvt.c + $(OPENSSL_PATH)/crypto/ec/ec_err.c + $(OPENSSL_PATH)/crypto/ec/ec_key.c + $(OPENSSL_PATH)/crypto/ec/ec_kmeth.c + $(OPENSSL_PATH)/crypto/ec/ec_lib.c + $(OPENSSL_PATH)/crypto/ec/ec_mult.c + $(OPENSSL_PATH)/crypto/ec/ec_oct.c + $(OPENSSL_PATH)/crypto/ec/ec_pmeth.c + $(OPENSSL_PATH)/crypto/ec/ec_print.c + $(OPENSSL_PATH)/crypto/ec/ecdh_kdf.c + $(OPENSSL_PATH)/crypto/ec/ecdh_ossl.c + $(OPENSSL_PATH)/crypto/ec/ecdsa_ossl.c + $(OPENSSL_PATH)/crypto/ec/ecdsa_sign.c + $(OPENSSL_PATH)/crypto/ec/ecdsa_vrf.c + $(OPENSSL_PATH)/crypto/ec/eck_prn.c + $(OPENSSL_PATH)/crypto/ec/ecp_mont.c + $(OPENSSL_PATH)/crypto/ec/ecp_nist.c + $(OPENSSL_PATH)/crypto/ec/ecp_nistp224.c + $(OPENSSL_PATH)/crypto/ec/ecp_nistp256.c + $(OPENSSL_PATH)/crypto/ec/ecp_nistp521.c + $(OPENSSL_PATH)/crypto/ec/ecp_nistputil.c + $(OPENSSL_PATH)/crypto/ec/ecp_oct.c + $(OPENSSL_PATH)/crypto/ec/ecp_smpl.c + $(OPENSSL_PATH)/crypto/ec/ecx_meth.c $(OPENSSL_PATH)/crypto/err/err.c $(OPENSSL_PATH)/crypto/err/err_prn.c $(OPENSSL_PATH)/crypto/evp/bio_b64.c @@ -533,15 +533,15 @@ [Sources] $(OPENSSL_PATH)/crypto/conf/conf_local.h $(OPENSSL_PATH)/crypto/dh/dh_local.h $(OPENSSL_PATH)/crypto/dso/dso_local.h - $(OPENSSL_PATH)/crypto/ec/ec_local.h |*|*|*|gEfiCryptoPkgTokenSpaceGu= id.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/curve448/curve448_local.h |*|*|*|gEfiCryptoP= kgTokenSpaceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/curve448/curve448utils.h |*|*|*|gEfiCryptoP= kgTokenSpaceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/curve448/ed448.h |*|*|*|gEfiCryptoPkgTokenS= paceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/curve448/field.h |*|*|*|gEfiCryptoPkgTokenS= paceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/curve448/point_448.h |*|*|*|gEfiCryptoPkgTo= kenSpaceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/curve448/word.h |*|*|*|gEfiCryptoPkgTokenSpa= ceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/arch_intrinsics.h |*|*|*|g= EfiCryptoPkgTokenSpaceGuid.PcdEcEnabled - $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.h |*|*|*|gEfiCryptoP= kgTokenSpaceGuid.PcdEcEnabled + $(OPENSSL_PATH)/crypto/ec/ec_local.h + $(OPENSSL_PATH)/crypto/ec/curve448/curve448_local.h + $(OPENSSL_PATH)/crypto/ec/curve448/curve448utils.h + $(OPENSSL_PATH)/crypto/ec/curve448/ed448.h + $(OPENSSL_PATH)/crypto/ec/curve448/field.h + $(OPENSSL_PATH)/crypto/ec/curve448/point_448.h + $(OPENSSL_PATH)/crypto/ec/curve448/word.h + $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/arch_intrinsics.h + $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.h $(OPENSSL_PATH)/crypto/evp/evp_local.h $(OPENSSL_PATH)/crypto/hmac/hmac_local.h $(OPENSSL_PATH)/crypto/lhash/lhash_local.h @@ -582,9 +582,6 @@ [LibraryClasses] [LibraryClasses.ARM] ArmSoftFloatLib =20 -[Pcd] - gEfiCryptoPkgTokenSpaceGuid.PcdEcEnabled ## CONSUMES - [BuildOptions] # # Disables the following Visual Studio compiler warnings brought by open= ssl source, diff --git a/CryptoPkg/Library/Include/openssl/opensslconf.h b/CryptoPkg/Li= brary/Include/openssl/opensslconf.h index 1485b8c9f108..7ea976b2252e 100644 --- a/CryptoPkg/Library/Include/openssl/opensslconf.h +++ b/CryptoPkg/Library/Include/openssl/opensslconf.h @@ -9,7 +9,7 @@ * in the file LICENSE in the source distribution or at * https://www.openssl.org/source/license.html */ -#include + #include =20 #ifdef __cplusplus @@ -55,11 +55,6 @@ extern "C" { #ifndef OPENSSL_NO_DSA #define OPENSSL_NO_DSA #endif -#if !FixedPcdGetBool (PcdEcEnabled) - #ifndef OPENSSL_NO_EC -#define OPENSSL_NO_EC - #endif -#endif #ifndef OPENSSL_NO_IDEA #define OPENSSL_NO_IDEA #endif --=20 2.35.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 (#89461): https://edk2.groups.io/g/devel/message/89461 Mute This Topic: https://groups.io/mt/90832157/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 Sat Apr 20 07:17:32 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+89459+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+89459+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1651487688; cv=none; d=zohomail.com; s=zohoarc; b=PAKDRjmZ9NVreDu+A/Ss1vckPbK6WuA2XSftaQoxrb8kniHRPaA1k6CCDVS8Wl9qf+D1nEY4QBC/+FMgYGOltZfXNIohxvVrxq0tcj/d0Sk0Xt6sEUPrSJXKMrpPkzEHgUi7ITY2MQySg0yCgoPBUFTzXl5SZunoTdX+EPjNhKU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1651487688; 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=+WiW0VWnb0jCKbufBhgiBQs2jgx8HX0xklpzxir5YEY=; b=G2djc3PJX/M038VyYT0q8v7A0ER+f2oWiP+ldGYHA684AhMKJNBIT0IU0YErvsR8qBqgJRR5nUH0m/IB4Yt6vk84iCCu9Pu/fV2vnfGgPYM1ouLJWBAUDnbnu6btfIdrt5J1DpWFiNASgjRisGSf5QkT2kKcsR17IwIyJCrTODs= 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+89459+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 1651487688925418.4684726239327; Mon, 2 May 2022 03:34:48 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id niN5YY1788612xBjyPqAmiEp; Mon, 02 May 2022 03:34:48 -0700 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.web09.8783.1651487687567665875 for ; Mon, 02 May 2022 03:34:47 -0700 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-428-cLPI7CybMlubW8dBuJ2ncQ-1; Mon, 02 May 2022 06:34:41 -0400 X-MC-Unique: cLPI7CybMlubW8dBuJ2ncQ-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 12C081014A61; Mon, 2 May 2022 10:34:40 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D35784010E4F; Mon, 2 May 2022 10:34:39 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 99B701800638; 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: [edk2-devel] [PATCH 3/5] OvmfPkg: make DXEFV larger Date: Mon, 2 May 2022 12:34:34 +0200 Message-Id: <20220502103436.3274412-4-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.84 on 10.11.54.2 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: cGSSpgwFqkvvXMVPPhbvXI7Sx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1651487688; bh=AZC+00xjYFpO5MZwAN3McqTXh+19D5avYycCV37G4Yg=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=PDgj73ueZ8QtMmivww8FvtHQE1zDwQPmi1Dq8NaEO97tYX6lY6XpeNyQaepgJitbEbk QpKr8A7iUqSAn7pRU0eTgS+Cr5fX/GL7vOtllMMsVrWK05EFDjVlEyMgc4sHJdXqaZDtE 2jSbV8WI+xePIdujwTGlCzUZ4FvaDM+NzKM= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1651488590424100001 Content-Type: text/plain; charset="utf-8"; x-default="true" openssl with ec enabled needs more space. Signed-off-by: Gerd Hoffmann Acked-by: Ard Biesheuvel --- OvmfPkg/OvmfPkgIa32.fdf | 6 +++--- OvmfPkg/OvmfPkgIa32X64.fdf | 6 +++--- OvmfPkg/OvmfPkgX64.fdf | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index 3ab1755749d4..d9c4a7c8ad26 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -62,10 +62,10 @@ [FD.OVMF_CODE] =20 [FD.MEMFD] BaseAddress =3D $(MEMFD_BASE_ADDRESS) -Size =3D 0xD00000 +Size =3D 0xE00000 ErasePolarity =3D 1 BlockSize =3D 0x10000 -NumBlocks =3D 0xD0 +NumBlocks =3D 0xE0 =20 0x000000|0x006000 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase|gUefiOvmfPkgTokenSpace= Guid.PcdOvmfSecPageTablesSize @@ -83,7 +83,7 @@ [FD.MEMFD] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase|gUefiOvmfPkgTokenSpaceGuid.= PcdOvmfPeiMemFvSize FV =3D PEIFV =20 -0x100000|0xC00000 +0x100000|0xD00000 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvBase|gUefiOvmfPkgTokenSpaceGuid.= PcdOvmfDxeMemFvSize FV =3D DXEFV =20 diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index e1638fa6ea38..5a366798ccbd 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -62,10 +62,10 @@ [FD.OVMF_CODE] =20 [FD.MEMFD] BaseAddress =3D $(MEMFD_BASE_ADDRESS) -Size =3D 0xD00000 +Size =3D 0xE00000 ErasePolarity =3D 1 BlockSize =3D 0x10000 -NumBlocks =3D 0xD0 +NumBlocks =3D 0xE0 =20 0x000000|0x006000 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase|gUefiOvmfPkgTokenSpace= Guid.PcdOvmfSecPageTablesSize @@ -86,7 +86,7 @@ [FD.MEMFD] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase|gUefiOvmfPkgTokenSpaceGuid.= PcdOvmfPeiMemFvSize FV =3D PEIFV =20 -0x100000|0xC00000 +0x100000|0xD00000 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvBase|gUefiOvmfPkgTokenSpaceGuid.= PcdOvmfDxeMemFvSize FV =3D DXEFV =20 diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index 6e72cdf3453e..2ce7a023f2d1 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -62,10 +62,10 @@ [FD.OVMF_CODE] =20 [FD.MEMFD] BaseAddress =3D $(MEMFD_BASE_ADDRESS) -Size =3D 0xD00000 +Size =3D 0xE00000 ErasePolarity =3D 1 BlockSize =3D 0x10000 -NumBlocks =3D 0xD0 +NumBlocks =3D 0xE0 =20 0x000000|0x006000 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase|gUefiOvmfPkgTokenSpace= Guid.PcdOvmfSecPageTablesSize @@ -101,7 +101,7 @@ [FD.MEMFD] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase|gUefiOvmfPkgTokenSpaceGuid.= PcdOvmfPeiMemFvSize FV =3D PEIFV =20 -0x100000|0xC00000 +0x100000|0xD00000 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvBase|gUefiOvmfPkgTokenSpaceGuid.= PcdOvmfDxeMemFvSize FV =3D DXEFV =20 --=20 2.35.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 (#89459): https://edk2.groups.io/g/devel/message/89459 Mute This Topic: https://groups.io/mt/90832155/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 Sat Apr 20 07:17:32 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+89458+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+89458+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1651487688; cv=none; d=zohomail.com; s=zohoarc; b=dWgz5p4wMMIXrgUfWm9kl5gbng2sry4t24BkzdawLBgY/LI5G9TWhLYQLptXWhfyvS0OKvTzpUmSqTkw5FRoHtZNbRgSk94RS5Rfop8vp5kIT7Evx4OoEk1KIJfDbkLwIdFNgyW+8yPRpN/KKRikpFyPD4+OHkvofYgpHPUajkk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1651487688; 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=HGnH3qOlRH8QQqCo/mEeND2FrdcyQgCEUcSCHaTaM48=; b=mjqbp0Z9/6mpmBP8C/JnhtBjIhnVkbDHe7LtrdaKz7kX/OHwm4lx4cKNV2R+NfTIkT3QOamIpzFyUCYxfEXeFl+NdyKNYTAaQbLo3uT3dK8viLPJ8Xxb+Xf/niTfAsT7hs2/rybN5xQExukjWEN4VbkOACD//1duw8/mbySMmso= 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+89458+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 1651487688032361.63118060885495; Mon, 2 May 2022 03:34:48 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id yrFJYY1788612xXqkGHTdBUB; Mon, 02 May 2022 03:34:47 -0700 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.8859.1651487686649346031 for ; Mon, 02 May 2022 03:34:47 -0700 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-628-_yQ14_FTODqg9o9Yy7fIng-1; Mon, 02 May 2022 06:34:42 -0400 X-MC-Unique: _yQ14_FTODqg9o9Yy7fIng-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 E1394185A79C; Mon, 2 May 2022 10:34:41 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 822F5C202D1; Mon, 2 May 2022 10:34:41 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 9CFCA180063A; 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: [edk2-devel] [PATCH 4/5] CryptoPkg/openssl: update generated files Date: Mon, 2 May 2022 12:34:35 +0200 Message-Id: <20220502103436.3274412-5-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 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: ADaoJxLh1ddizm6sxRN51HOOx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1651487687; bh=EUjmPBimyaMR9RfxYqBb5L80SAMjMdENPJX+W/BcrRY=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=ca/3MIveSZYkYbHoujSLF8urfn+/WDwmYC1fjG7yjl21jm2/LIYQ6jkVp0QYajDkTUw 4w3IphYkwS/DUIsbk2hRmm9t0v25X2N7l9ytrhCZM0Q+decnGk59YMKbr0VVc4whdir5R rXPKdlLXch4Aw0Q1HEUs1C3ee5SRMPAAl+o= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1651488590440100002 Content-Type: text/plain; charset="utf-8"; x-default="true" Run process_files.pl with the current openssl submodule version. Signed-off-by: Gerd Hoffmann --- CryptoPkg/Library/OpensslLib/OpensslLib.inf | 4 + .../Library/OpensslLib/OpensslLibCrypto.inf | 4 + CryptoPkg/Library/Include/crypto/dso_conf.h | 7 +- .../Library/Include/openssl/opensslconf.h | 233 +++++++++--------- 4 files changed, 122 insertions(+), 126 deletions(-) diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Librar= y/OpensslLib/OpensslLib.inf index 1d67ed55e1b1..bd3d9cc90f99 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf @@ -421,6 +421,10 @@ [Sources] $(OPENSSL_PATH)/crypto/siphash/siphash.c $(OPENSSL_PATH)/crypto/siphash/siphash_ameth.c $(OPENSSL_PATH)/crypto/siphash/siphash_pmeth.c + $(OPENSSL_PATH)/crypto/sm2/sm2_crypt.c + $(OPENSSL_PATH)/crypto/sm2/sm2_err.c + $(OPENSSL_PATH)/crypto/sm2/sm2_pmeth.c + $(OPENSSL_PATH)/crypto/sm2/sm2_sign.c $(OPENSSL_PATH)/crypto/sm3/m_sm3.c $(OPENSSL_PATH)/crypto/sm3/sm3.c $(OPENSSL_PATH)/crypto/sm4/sm4.c diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/= Library/OpensslLib/OpensslLibCrypto.inf index 66ca5b1250c1..38ccf1a5b6ec 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf @@ -421,6 +421,10 @@ [Sources] $(OPENSSL_PATH)/crypto/siphash/siphash.c $(OPENSSL_PATH)/crypto/siphash/siphash_ameth.c $(OPENSSL_PATH)/crypto/siphash/siphash_pmeth.c + $(OPENSSL_PATH)/crypto/sm2/sm2_crypt.c + $(OPENSSL_PATH)/crypto/sm2/sm2_err.c + $(OPENSSL_PATH)/crypto/sm2/sm2_pmeth.c + $(OPENSSL_PATH)/crypto/sm2/sm2_sign.c $(OPENSSL_PATH)/crypto/sm3/m_sm3.c $(OPENSSL_PATH)/crypto/sm3/sm3.c $(OPENSSL_PATH)/crypto/sm4/sm4.c diff --git a/CryptoPkg/Library/Include/crypto/dso_conf.h b/CryptoPkg/Librar= y/Include/crypto/dso_conf.h index b9c38b416697..95f4db2b1586 100644 --- a/CryptoPkg/Library/Include/crypto/dso_conf.h +++ b/CryptoPkg/Library/Include/crypto/dso_conf.h @@ -1,6 +1,5 @@ /* WARNING: do not edit! */ /* Generated from include/crypto/dso_conf.h.in */ - /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -11,7 +10,7 @@ */ =20 #ifndef OSSL_CRYPTO_DSO_CONF_H -#define OSSL_CRYPTO_DSO_CONF_H -#define DSO_NONE -#define DSO_EXTENSION ".so" +# define OSSL_CRYPTO_DSO_CONF_H +# define DSO_NONE +# define DSO_EXTENSION ".so" #endif diff --git a/CryptoPkg/Library/Include/openssl/opensslconf.h b/CryptoPkg/Li= brary/Include/openssl/opensslconf.h index 7ea976b2252e..09a6641ffcf9 100644 --- a/CryptoPkg/Library/Include/openssl/opensslconf.h +++ b/CryptoPkg/Library/Include/openssl/opensslconf.h @@ -17,7 +17,7 @@ extern "C" { #endif =20 #ifdef OPENSSL_ALGORITHM_DEFINES - #error OPENSSL_ALGORITHM_DEFINES no longer supported +# error OPENSSL_ALGORITHM_DEFINES no longer supported #endif =20 /* @@ -25,228 +25,217 @@ extern "C" { */ =20 #ifndef OPENSSL_SYS_UEFI -#define OPENSSL_SYS_UEFI 1 +# define OPENSSL_SYS_UEFI 1 #endif -#define OPENSSL_MIN_API 0x10100000L +#define OPENSSL_MIN_API 0x10100000L #ifndef OPENSSL_NO_BF -#define OPENSSL_NO_BF +# define OPENSSL_NO_BF #endif #ifndef OPENSSL_NO_BLAKE2 -#define OPENSSL_NO_BLAKE2 +# define OPENSSL_NO_BLAKE2 #endif #ifndef OPENSSL_NO_CAMELLIA -#define OPENSSL_NO_CAMELLIA +# define OPENSSL_NO_CAMELLIA #endif #ifndef OPENSSL_NO_CAST -#define OPENSSL_NO_CAST +# define OPENSSL_NO_CAST #endif #ifndef OPENSSL_NO_CHACHA -#define OPENSSL_NO_CHACHA +# define OPENSSL_NO_CHACHA #endif #ifndef OPENSSL_NO_CMS -#define OPENSSL_NO_CMS +# define OPENSSL_NO_CMS #endif #ifndef OPENSSL_NO_CT -#define OPENSSL_NO_CT +# define OPENSSL_NO_CT #endif #ifndef OPENSSL_NO_DES -#define OPENSSL_NO_DES +# define OPENSSL_NO_DES #endif #ifndef OPENSSL_NO_DSA -#define OPENSSL_NO_DSA +# define OPENSSL_NO_DSA #endif #ifndef OPENSSL_NO_IDEA -#define OPENSSL_NO_IDEA +# define OPENSSL_NO_IDEA #endif #ifndef OPENSSL_NO_MD2 -#define OPENSSL_NO_MD2 +# define OPENSSL_NO_MD2 #endif #ifndef OPENSSL_NO_MD4 -#define OPENSSL_NO_MD4 +# define OPENSSL_NO_MD4 #endif #ifndef OPENSSL_NO_MDC2 -#define OPENSSL_NO_MDC2 +# define OPENSSL_NO_MDC2 #endif #ifndef OPENSSL_NO_POLY1305 -#define OPENSSL_NO_POLY1305 +# define OPENSSL_NO_POLY1305 #endif #ifndef OPENSSL_NO_RC2 -#define OPENSSL_NO_RC2 +# define OPENSSL_NO_RC2 #endif #ifndef OPENSSL_NO_RC4 -#define OPENSSL_NO_RC4 +# define OPENSSL_NO_RC4 #endif #ifndef OPENSSL_NO_RC5 -#define OPENSSL_NO_RC5 +# define OPENSSL_NO_RC5 #endif #ifndef OPENSSL_NO_RMD160 -#define OPENSSL_NO_RMD160 +# define OPENSSL_NO_RMD160 #endif #ifndef OPENSSL_NO_SEED -#define OPENSSL_NO_SEED -#endif -#ifndef OPENSSL_NO_SM2 -#define OPENSSL_NO_SM2 +# define OPENSSL_NO_SEED #endif #ifndef OPENSSL_NO_SRP -#define OPENSSL_NO_SRP +# define OPENSSL_NO_SRP #endif #ifndef OPENSSL_NO_TS -#define OPENSSL_NO_TS +# define OPENSSL_NO_TS #endif #ifndef OPENSSL_NO_WHIRLPOOL -#define OPENSSL_NO_WHIRLPOOL +# define OPENSSL_NO_WHIRLPOOL #endif #ifndef OPENSSL_RAND_SEED_NONE -#define OPENSSL_RAND_SEED_NONE +# define OPENSSL_RAND_SEED_NONE #endif #ifndef OPENSSL_NO_AFALGENG -#define OPENSSL_NO_AFALGENG +# define OPENSSL_NO_AFALGENG #endif #ifndef OPENSSL_NO_APPS -#define OPENSSL_NO_APPS +# define OPENSSL_NO_APPS #endif #ifndef OPENSSL_NO_ASAN -#define OPENSSL_NO_ASAN +# define OPENSSL_NO_ASAN #endif #ifndef OPENSSL_NO_ASYNC -#define OPENSSL_NO_ASYNC +# define OPENSSL_NO_ASYNC #endif #ifndef OPENSSL_NO_AUTOERRINIT -#define OPENSSL_NO_AUTOERRINIT +# define OPENSSL_NO_AUTOERRINIT #endif #ifndef OPENSSL_NO_AUTOLOAD_CONFIG -#define OPENSSL_NO_AUTOLOAD_CONFIG +# define OPENSSL_NO_AUTOLOAD_CONFIG #endif #ifndef OPENSSL_NO_CAPIENG -#define OPENSSL_NO_CAPIENG +# define OPENSSL_NO_CAPIENG #endif #ifndef OPENSSL_NO_CRYPTO_MDEBUG -#define OPENSSL_NO_CRYPTO_MDEBUG +# define OPENSSL_NO_CRYPTO_MDEBUG #endif #ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE -#define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE +# define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE #endif #ifndef OPENSSL_NO_DEPRECATED -#define OPENSSL_NO_DEPRECATED +# define OPENSSL_NO_DEPRECATED #endif #ifndef OPENSSL_NO_DEVCRYPTOENG -#define OPENSSL_NO_DEVCRYPTOENG +# define OPENSSL_NO_DEVCRYPTOENG #endif #ifndef OPENSSL_NO_DGRAM -#define OPENSSL_NO_DGRAM +# define OPENSSL_NO_DGRAM #endif #ifndef OPENSSL_NO_DTLS -#define OPENSSL_NO_DTLS +# define OPENSSL_NO_DTLS #endif #ifndef OPENSSL_NO_DTLS1 -#define OPENSSL_NO_DTLS1 +# define OPENSSL_NO_DTLS1 #endif #ifndef OPENSSL_NO_DTLS1_2 -#define OPENSSL_NO_DTLS1_2 +# define OPENSSL_NO_DTLS1_2 #endif #ifndef OPENSSL_NO_EC2M -#define OPENSSL_NO_EC2M +# define OPENSSL_NO_EC2M #endif #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 -#define OPENSSL_NO_EC_NISTP_64_GCC_128 -#endif -#ifndef OPENSSL_NO_ECDH -#define OPENSSL_NO_ECDH -#endif -#ifndef OPENSSL_NO_ECDSA -#define OPENSSL_NO_ECDSA +# define OPENSSL_NO_EC_NISTP_64_GCC_128 #endif #ifndef OPENSSL_NO_EGD -#define OPENSSL_NO_EGD +# define OPENSSL_NO_EGD #endif #ifndef OPENSSL_NO_ENGINE -#define OPENSSL_NO_ENGINE +# define OPENSSL_NO_ENGINE #endif #ifndef OPENSSL_NO_ERR -#define OPENSSL_NO_ERR +# define OPENSSL_NO_ERR #endif #ifndef OPENSSL_NO_EXTERNAL_TESTS -#define OPENSSL_NO_EXTERNAL_TESTS +# define OPENSSL_NO_EXTERNAL_TESTS #endif #ifndef OPENSSL_NO_FILENAMES -#define OPENSSL_NO_FILENAMES +# define OPENSSL_NO_FILENAMES #endif #ifndef OPENSSL_NO_FUZZ_AFL -#define OPENSSL_NO_FUZZ_AFL +# define OPENSSL_NO_FUZZ_AFL #endif #ifndef OPENSSL_NO_FUZZ_LIBFUZZER -#define OPENSSL_NO_FUZZ_LIBFUZZER +# define OPENSSL_NO_FUZZ_LIBFUZZER #endif #ifndef OPENSSL_NO_GOST -#define OPENSSL_NO_GOST +# define OPENSSL_NO_GOST #endif #ifndef OPENSSL_NO_HEARTBEATS -#define OPENSSL_NO_HEARTBEATS +# define OPENSSL_NO_HEARTBEATS #endif #ifndef OPENSSL_NO_HW -#define OPENSSL_NO_HW +# define OPENSSL_NO_HW #endif #ifndef OPENSSL_NO_MSAN -#define OPENSSL_NO_MSAN +# define OPENSSL_NO_MSAN #endif #ifndef OPENSSL_NO_OCB -#define OPENSSL_NO_OCB +# define OPENSSL_NO_OCB #endif #ifndef OPENSSL_NO_POSIX_IO -#define OPENSSL_NO_POSIX_IO +# define OPENSSL_NO_POSIX_IO #endif #ifndef OPENSSL_NO_RFC3779 -#define OPENSSL_NO_RFC3779 +# define OPENSSL_NO_RFC3779 #endif #ifndef OPENSSL_NO_SCRYPT -#define OPENSSL_NO_SCRYPT +# define OPENSSL_NO_SCRYPT #endif #ifndef OPENSSL_NO_SCTP -#define OPENSSL_NO_SCTP +# define OPENSSL_NO_SCTP #endif #ifndef OPENSSL_NO_SOCK -#define OPENSSL_NO_SOCK +# define OPENSSL_NO_SOCK #endif #ifndef OPENSSL_NO_SSL_TRACE -#define OPENSSL_NO_SSL_TRACE +# define OPENSSL_NO_SSL_TRACE #endif #ifndef OPENSSL_NO_SSL3 -#define OPENSSL_NO_SSL3 +# define OPENSSL_NO_SSL3 #endif #ifndef OPENSSL_NO_SSL3_METHOD -#define OPENSSL_NO_SSL3_METHOD +# define OPENSSL_NO_SSL3_METHOD #endif #ifndef OPENSSL_NO_STDIO -#define OPENSSL_NO_STDIO +# define OPENSSL_NO_STDIO #endif #ifndef OPENSSL_NO_TESTS -#define OPENSSL_NO_TESTS -#endif -#ifndef OPENSSL_NO_TLS1_3 -#define OPENSSL_NO_TLS1_3 +# define OPENSSL_NO_TESTS #endif #ifndef OPENSSL_NO_UBSAN -#define OPENSSL_NO_UBSAN +# define OPENSSL_NO_UBSAN #endif #ifndef OPENSSL_NO_UI_CONSOLE -#define OPENSSL_NO_UI_CONSOLE +# define OPENSSL_NO_UI_CONSOLE #endif #ifndef OPENSSL_NO_UNIT_TEST -#define OPENSSL_NO_UNIT_TEST +# define OPENSSL_NO_UNIT_TEST #endif #ifndef OPENSSL_NO_WEAK_SSL_CIPHERS -#define OPENSSL_NO_WEAK_SSL_CIPHERS +# define OPENSSL_NO_WEAK_SSL_CIPHERS #endif #ifndef OPENSSL_NO_DYNAMIC_ENGINE -#define OPENSSL_NO_DYNAMIC_ENGINE +# define OPENSSL_NO_DYNAMIC_ENGINE #endif =20 + /* * Sometimes OPENSSSL_NO_xxx ends up with an empty file and some compilers * don't like that. This will hopefully silence them. */ -#define NON_EMPTY_TRANSLATION_UNIT static void *dummy =3D &dummy; +#define NON_EMPTY_TRANSLATION_UNIT static void *dummy =3D &dummy; =20 /* * Applications should use -DOPENSSL_API_COMPAT=3D to suppress the @@ -255,37 +244,37 @@ extern "C" { * functions. */ #ifndef DECLARE_DEPRECATED -#define DECLARE_DEPRECATED(f) f; - #ifdef __GNUC__ - #if __GNUC__ > 3 || (__GNUC__ =3D=3D 3 && __GNUC_MINOR__ > 0) - #undef DECLARE_DEPRECATED -#define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); - #endif - #elif defined (__SUNPRO_C) - #if (__SUNPRO_C >=3D 0x5130) - #undef DECLARE_DEPRECATED -#define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); - #endif - #endif +# define DECLARE_DEPRECATED(f) f; +# ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ =3D=3D 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# elif defined(__SUNPRO_C) +# if (__SUNPRO_C >=3D 0x5130) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif +# endif #endif =20 #ifndef OPENSSL_FILE - #ifdef OPENSSL_NO_FILENAMES -#define OPENSSL_FILE "" -#define OPENSSL_LINE 0 - #else -#define OPENSSL_FILE __FILE__ -#define OPENSSL_LINE __LINE__ - #endif +# ifdef OPENSSL_NO_FILENAMES +# define OPENSSL_FILE "" +# define OPENSSL_LINE 0 +# else +# define OPENSSL_FILE __FILE__ +# define OPENSSL_LINE __LINE__ +# endif #endif =20 #ifndef OPENSSL_MIN_API -#define OPENSSL_MIN_API 0 +# define OPENSSL_MIN_API 0 #endif =20 -#if !defined (OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < OPENSSL_MIN_API - #undef OPENSSL_API_COMPAT -#define OPENSSL_API_COMPAT OPENSSL_MIN_API +#if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < OPENSSL_MIN_API +# undef OPENSSL_API_COMPAT +# define OPENSSL_API_COMPAT OPENSSL_MIN_API #endif =20 /* @@ -293,51 +282,51 @@ extern "C" { * OpenSSL version number matches. */ #if OPENSSL_VERSION_NUMBER < 0x10200000L -#define DEPRECATEDIN_1_2_0(f) f; +# define DEPRECATEDIN_1_2_0(f) f; #elif OPENSSL_API_COMPAT < 0x10200000L -#define DEPRECATEDIN_1_2_0(f) DECLARE_DEPRECATED(f) +# define DEPRECATEDIN_1_2_0(f) DECLARE_DEPRECATED(f) #else -#define DEPRECATEDIN_1_2_0(f) +# define DEPRECATEDIN_1_2_0(f) #endif =20 #if OPENSSL_API_COMPAT < 0x10100000L -#define DEPRECATEDIN_1_1_0(f) DECLARE_DEPRECATED(f) +# define DEPRECATEDIN_1_1_0(f) DECLARE_DEPRECATED(f) #else -#define DEPRECATEDIN_1_1_0(f) +# define DEPRECATEDIN_1_1_0(f) #endif =20 #if OPENSSL_API_COMPAT < 0x10000000L -#define DEPRECATEDIN_1_0_0(f) DECLARE_DEPRECATED(f) +# define DEPRECATEDIN_1_0_0(f) DECLARE_DEPRECATED(f) #else -#define DEPRECATEDIN_1_0_0(f) +# define DEPRECATEDIN_1_0_0(f) #endif =20 #if OPENSSL_API_COMPAT < 0x00908000L -#define DEPRECATEDIN_0_9_8(f) DECLARE_DEPRECATED(f) +# define DEPRECATEDIN_0_9_8(f) DECLARE_DEPRECATED(f) #else -#define DEPRECATEDIN_0_9_8(f) +# define DEPRECATEDIN_0_9_8(f) #endif =20 /* Generate 80386 code? */ #undef I386_ONLY =20 #undef OPENSSL_UNISTD -#define OPENSSL_UNISTD +#define OPENSSL_UNISTD =20 #undef OPENSSL_EXPORT_VAR_AS_FUNCTION =20 /* * The following are cipher-specific, but are part of the public API. */ -#if !defined (OPENSSL_SYS_UEFI) - #undef BN_LLONG +#if !defined(OPENSSL_SYS_UEFI) +# undef BN_LLONG /* Only one for the following should be defined */ - #undef SIXTY_FOUR_BIT_LONG - #undef SIXTY_FOUR_BIT -#define THIRTY_TWO_BIT +# undef SIXTY_FOUR_BIT_LONG +# undef SIXTY_FOUR_BIT +# define THIRTY_TWO_BIT #endif =20 -#define RC4_INT unsigned int +#define RC4_INT unsigned int =20 #ifdef __cplusplus } --=20 2.35.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 (#89458): https://edk2.groups.io/g/devel/message/89458 Mute This Topic: https://groups.io/mt/90832154/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 Sat Apr 20 07:17:32 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+89460+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+89460+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1651487689; cv=none; d=zohomail.com; s=zohoarc; b=DIM14RWmVBnYqqPnP/TC8dTOizI64ngkrKF7U400eIsRCU52ddxPBmB5T+/Xs+2JTwG/sfuwBVTl1zaBp/byrnpDLJZW4jO/7fMf2T4vg8GIwIiwlQmhmmS8Zoiq8dveAiFsIv9HtEuB4ogX6p2DvnTZfpyHxPAeI2PWRFtqXCs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1651487689; 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=wXP2uNHsygyLwB+qldwm7kdQTAqM8mHQWjLwrwbFGkA=; b=PzaOSM+9/Xwgow8hVWhgOaZDLDPuPDpfxNO3Xwp6fJ6yilZ1OQmWKfUnml65B6fnL8FdmhVJicMascULJbmuPWd+6NVqaXMgMtv4hexBzlMj5uabtMJ/j8TXVK9ey2eveqg0NXjwhcsgxDjlWaqCEfNhZyQgd0qMEocVZ6XxTQ4= 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+89460+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 1651487689293356.3122494552139; Mon, 2 May 2022 03:34:49 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id HaEjYY1788612xTWvMSJpsrQ; Mon, 02 May 2022 03:34:49 -0700 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.web12.8714.1651487687861988375 for ; Mon, 02 May 2022 03:34:48 -0700 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-90-8PPGnextOpeO76o5mQk4aw-1; Mon, 02 May 2022 06:34:44 -0400 X-MC-Unique: 8PPGnextOpeO76o5mQk4aw-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8F9F41014A61; Mon, 2 May 2022 10:34:43 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5D5E8403D163; Mon, 2 May 2022 10:34:43 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id A02F11800794; 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: [edk2-devel] [PATCH 5/5] CryptoPkg/openssl: disable codestyle checks for generated files Date: Mon, 2 May 2022 12:34:36 +0200 Message-Id: <20220502103436.3274412-6-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.84 on 10.11.54.2 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: nyNfPMZX8wZp5WahK4kDe2Vpx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1651487689; bh=NDcVVE6q1tq3D/xTWpK8LxniveC+nQEu6B/Qh2nqCis=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=nfJH0h4uh2NRMZySUbGIaDyaB6wKlQ0d0Gzi5rPCnomzm6kpJOwW9iCPr8A1+zkyIlB DZoXL6phyx+PEhEJi/XLCuydRinOC5Pssl1RJIWJb2FGaUwt8hIDhbTtGzt/lkJIqm6cA 2Vo383XzF713Ug3ibEu0zPV+Fj2M9VZx8mY= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1651487689444100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Files generated by process_files.pl from openssl sources should not be checked for edk2 code style. Signed-off-by: Gerd Hoffmann --- CryptoPkg/CryptoPkg.ci.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CryptoPkg/CryptoPkg.ci.yaml b/CryptoPkg/CryptoPkg.ci.yaml index 396ca93dbe49..09fba0bcc685 100644 --- a/CryptoPkg/CryptoPkg.ci.yaml +++ b/CryptoPkg/CryptoPkg.ci.yaml @@ -26,6 +26,8 @@ ## Both file path and directory path are accepted. "IgnoreFiles": [ "Library/OpensslLib/openssl", + "Library/Include/openssl", + "Library/Include/crypto", # The unit testing folder is not to be checked "Test/UnitTest", # This has OpenSSL interfaces that aren't UEFI spec compliant @@ -89,5 +91,13 @@ "ExtendWords": [], # words to extend to the dictionary f= or this package "IgnoreStandardPaths": [], # Standard Plugin defined paths that = should be ignore "AdditionalIncludePaths": [] # Additional paths to spell check (wi= ldcards supported) + }, + + # options defined in .pytool/Plugin/UncrustifyCheck + "UncrustifyCheck": { + "IgnoreFiles": [ + "opensslconf.h", + "dso_conf.h", + ] } } --=20 2.35.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 (#89460): https://edk2.groups.io/g/devel/message/89460 Mute This Topic: https://groups.io/mt/90832156/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-