From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 197057803D7 for ; Fri, 28 Jul 2023 06:41:55 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=9mBYH68x7NU+e6XagcOjw+e/ORbCdKup4r/0VzwSCXA=; c=relaxed/simple; d=groups.io; h=X-Received:X-Received:X-IronPort-AV:X-IronPort-AV:X-Received:X-ExtLoop1:X-IronPort-AV:X-IronPort-AV:X-Received:From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:X-Gm-Message-State:Content-Transfer-Encoding; s=20140610; t=1690526514; v=1; b=xBEd447Vutk6MEYIHz1PlcrujDg3zgahI5g+wGg59fF3yQHNCh5YMHLV2ppoVaadqI8ZuidZ QC0kMA49RRFYiL7iu68MY0rISQ1O7LIKRwuo6V6lcRtumpelhBNMgB6r0dHo9QW3oLaFjBG71N0 Bfpq+dC5c2T3Ru7UtU4V9dsY= X-Received: by 127.0.0.2 with SMTP id P8B9YY7687511xhKR9FfHr9Y; Thu, 27 Jul 2023 23:41:54 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web11.27232.1690526514264363438 for ; Thu, 27 Jul 2023 23:41:54 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10784"; a="434804325" X-IronPort-AV: E=Sophos;i="6.01,236,1684825200"; d="scan'208";a="434804325" X-Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jul 2023 23:41:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10784"; a="762496078" X-IronPort-AV: E=Sophos;i="6.01,236,1684825200"; d="scan'208";a="762496078" X-Received: from liyi4-desktop.ccr.corp.intel.com ([10.239.153.10]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jul 2023 23:41:08 -0700 From: "Li, Yi" To: devel@edk2.groups.io Cc: Gerd Hoffmann , Jiewen Yao , Xiaoyu Lu , Guomin Jiang Subject: [edk2-devel] [PATCH 13/29] CryptoPkg/openssl: adapt EcSm2Null.c for openssl 3.0 Date: Fri, 28 Jul 2023 14:39:59 +0800 Message-Id: <78317d35b7f1eae38e97167e1867bae894b677a3.1690444292.git.yi1.li@intel.com> In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk 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,yi1.li@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: Q5nKglFr6Jlkdowd12squT8Zx7686176AA= Content-Transfer-Encoding: 8bit X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=xBEd447V; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io From: Gerd Hoffmann Signed-off-by: Gerd Hoffmann Cc: Jiewen Yao Cc: Xiaoyu Lu Cc: Guomin Jiang --- CryptoPkg/Library/OpensslLib/EcSm2Null.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CryptoPkg/Library/OpensslLib/EcSm2Null.c b/CryptoPkg/Library/OpensslLib/EcSm2Null.c index 6d5ab2d4cc..b72a749189 100644 --- a/CryptoPkg/Library/OpensslLib/EcSm2Null.c +++ b/CryptoPkg/Library/OpensslLib/EcSm2Null.c @@ -9,8 +9,9 @@ #include #include -#undef OPENSSL_NO_EC +#undef EDK2_OPENSSL_NOEC +#include #include #include #include @@ -300,9 +301,9 @@ ECDH_compute_key ( return 0; } -struct ec_key_st * +const struct ec_key_st * EVP_PKEY_get0_EC_KEY ( - EVP_PKEY *pkey + const EVP_PKEY *pkey ) { ASSERT (FALSE); -- 2.31.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#107352): https://edk2.groups.io/g/devel/message/107352 Mute This Topic: https://groups.io/mt/100406056/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-