From nobody Fri Oct 18 09:18:13 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+101074+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+101074+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678696237; cv=none; d=zohomail.com; s=zohoarc; b=nanGAR0k7lU52Brx0VaZgjQId2t41vvNl2UyxtoVAHQghwxJ9iWByLDedzbQ3xF4efsnO6dBtMXQ8N7J36vyZIdN1T/FnjVB/PQmvObbtWLblX1F13GxzqOj3JfCkVV0lKmjwDy3DCvJ9mMDmug28L607qT+JSS1VCfKD1KG7+8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678696237; 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=BkdI5l01HOgP0PPYmdNwib19i4ccwrGBnZHe1LCAJGY=; b=dc+WDBATqlqFjiKCv4jU8eFRTysJ90NgpNxFnGIuyhhbdBbx+xGV1Gl2PB1wu2Cwrd7KcEBZoinyzn03KE3MBzbavcpEwQngTrlYZDbl97XtBA3pdtn7t9Cn7bjh0/s8MVc3HbXUqWJ5ZmpsDo4E9H4480isWZ3zz/uIKtk7ORo= 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+101074+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 1678696237187166.04227316541233; Mon, 13 Mar 2023 01:30:37 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 8xMbYY1788612xKP7lzEGIA9; Mon, 13 Mar 2023 01:30:36 -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.web10.14707.1678696236247800707 for ; Mon, 13 Mar 2023 01:30:36 -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-564-WIYRV-vTNxOj7A1cv3biJw-1; Mon, 13 Mar 2023 04:30:32 -0400 X-MC-Unique: WIYRV-vTNxOj7A1cv3biJw-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 9E773101B42B; Mon, 13 Mar 2023 08:30:31 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.142]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 64F27C164E7; Mon, 13 Mar 2023 08:30:31 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 7244C1801E90; Mon, 13 Mar 2023 09:30:16 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Jian J Wang , Pawel Polawski , Xiaoyu Lu , Ard Biesheuvel , Guomin Jiang , Gerd Hoffmann , Jiewen Yao , Oliver Steffen , Jordan Justen Subject: [edk2-devel] [PATCH 15/22] CryptoPkg/openssl: adapt EcSm2Null.c for openssl 3.0 Date: Mon, 13 Mar 2023 09:30:09 +0100 Message-Id: <20230313083016.136448-16-kraxel@redhat.com> In-Reply-To: <20230313083016.136448-1-kraxel@redhat.com> References: <20230313083016.136448-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: 0MOAUTxqxixJ7aMiT1Z0kcmPx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1678696236; bh=6OM9fSNVZi9cK0EGgoLQH/3P9jfM5OZZhoAmccyEQcQ=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=HUe4oFC5fheCd4Ouz57EVcM2ZLH8UA5O9UuQXak0mmT9SmLE8vR7ORYGCk02kNDOoVo c34TMyrrfNw/lYeiY1wuFSaCoomitnYlpzQGsFjlfiak9VmV2I9fwHJcWC/txAN3ktdKj 25ab7E4W7Lswjh1I4fMcSLiXVBSX0ziwvAo= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1678696238928100055 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Gerd Hoffmann --- CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 2 +- CryptoPkg/Library/OpensslLib/EcSm2Null.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/= Library/OpensslLib/OpensslLibCrypto.inf index c796effe23fd..5bd6fa09ab33 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf @@ -38,7 +38,7 @@ [Sources] buildinf.c ossl_store.c rand_pool.c - SslNull.c +# SslNull.c EcSm2Null.c =20 [Packages] diff --git a/CryptoPkg/Library/OpensslLib/EcSm2Null.c b/CryptoPkg/Library/O= pensslLib/EcSm2Null.c index 6d5ab2d4cc88..b72a74918933 100644 --- a/CryptoPkg/Library/OpensslLib/EcSm2Null.c +++ b/CryptoPkg/Library/OpensslLib/EcSm2Null.c @@ -9,8 +9,9 @@ #include #include =20 -#undef OPENSSL_NO_EC +#undef EDK2_OPENSSL_NOEC =20 +#include #include #include #include @@ -300,9 +301,9 @@ ECDH_compute_key ( return 0; } =20 -struct ec_key_st * +const struct ec_key_st * EVP_PKEY_get0_EC_KEY ( - EVP_PKEY *pkey + const EVP_PKEY *pkey ) { ASSERT (FALSE); --=20 2.39.2 -=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 (#101074): https://edk2.groups.io/g/devel/message/101074 Mute This Topic: https://groups.io/mt/97576420/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-