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.133.124]) by mx.groups.io with SMTP id smtpd.web10.14707.1678696236247800707 for ; Mon, 13 Mar 2023 01:30:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ClGhYuu3; spf=pass (domain: redhat.com, ip: 170.10.133.124, mailfrom: kraxel@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678696235; 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=7RQChoVxGZSpDYpaFMfilR0UioaimklLTr4Kh2dwG6U=; b=ClGhYuu3d8f+HdJmuSSwZ0o0pO8A8RuGEy/7BqG5terCI+cx0nO2n4mmEJZV+MNI1dQIps Ha4g20JlppBBbR17eRKoBaa3FSEimnAK2n2OIR9kjiXrOI4Bi9JPVsSgbwfZNtZUbW3xk9 2uvXJpuPKj2U0figZGLfR9SUhuBDZC4= 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 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) 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) 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: [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 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; 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 [Packages] diff --git a/CryptoPkg/Library/OpensslLib/EcSm2Null.c b/CryptoPkg/Library/OpensslLib/EcSm2Null.c index 6d5ab2d4cc88..b72a74918933 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.39.2