From nobody Fri Oct 18 09:19:28 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+101078+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+101078+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678696242; cv=none; d=zohomail.com; s=zohoarc; b=fxvAf+b+1K0iEtwR6kH9iOd7A9rgEoVzAVvwc67Iv2WD5oLmNm60WlM5MP23NWlsk7H0fFU48B5RI9hHuwem4UAKDoqYr9fr8y5jCfn9LYxs59NvydsrgAZOqTZr+axOnvlbg3pAxI4yoZPFtUz6j2sQb7lEgGpERHlI9OSoYl4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678696242; 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=TthWVpr2mQj57Eay2WE7eCa9bAQ0T3SvoiXReP2H0CA=; b=KlE7aePb7hYFZmhJtWJ3bNe91Oc3wAz3K48VIslCJyLNXsSBeH82G/g6hfek+rfqIVg3AHSQCwzQjC0ZdlftN2UXEwgPMOqRtjoct99Qzv2jDd9LesjVxatNqQ8sYivalPIoSFoE1ffk/aAVpKv5ZCIO3bRmpcInV9gJnx7UfkM= 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+101078+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 1678696242371866.0645335366339; Mon, 13 Mar 2023 01:30:42 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id MJ9sYY1788612xhcdzoePUXq; Mon, 13 Mar 2023 01:30:42 -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.web11.15107.1678696241288738410 for ; Mon, 13 Mar 2023 01:30:41 -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-637-0jCecvySNB6TtO5CWlWysw-1; Mon, 13 Mar 2023 04:30:37 -0400 X-MC-Unique: 0jCecvySNB6TtO5CWlWysw-1 X-Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C31F12A5957C; Mon, 13 Mar 2023 08:30:36 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.142]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 578CF20341A0; Mon, 13 Mar 2023 08:30:36 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 7D00B1801E94; 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 18/22] [provider] CryptoPkg/openssl: use our own predefined providers Date: Mon, 13 Mar 2023 09:30:12 +0100 Message-Id: <20230313083016.136448-19-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.4 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: aXn77Ee69K3hTCOIR3E0evkKx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1678696242; bh=XVyE4mRJHygrYDOsxMlyRxlSyuOhALXy06b6GecrBaI=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=m6fEdQheQ+D3KWTxSNbB7huKVqH6QJ/eEu6YpFHc13UUVTxLW8aPc4+TdgIFWlp4JJu PMhr+T3RJz0iWdcMcz2lhst8hRskrM4Ql15/wA8VSluw4J5/EO7TP+NqQUoTJ0J4N5hSk nx+/YU/3yzWuXKdAgq9YHVincplSFMP07F8= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1678696242934100073 Content-Type: text/plain; charset="utf-8"; x-default="true" Define our own ossl_predefined_providers, so we can easily compile out some or all of them for testing purposes. Effect seems to not be that big though: 1157758 TlsDxe ('default' + 'base' + 'null') 897022 TlsDxe (only 'null') So not sure yet if we actually want/need this ... Signed-off-by: Gerd Hoffmann --- CryptoPkg/Library/OpensslLib/OpensslLib.inf | 1 + .../Library/OpensslLib/OpensslLibAccel.inf | 1 + .../Library/OpensslLib/OpensslLibCrypto.inf | 1 + .../Library/OpensslLib/OpensslLibFull.inf | 1 + .../OpensslLib/OpensslLibFullAccel.inf | 1 + CryptoPkg/Library/OpensslLib/provider.c | 21 +++++++++++++++++++ CryptoPkg/Library/OpensslLib/configure.py | 1 + 7 files changed, 27 insertions(+) create mode 100644 CryptoPkg/Library/OpensslLib/provider.c diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Librar= y/OpensslLib/OpensslLib.inf index b92b1daf2096..05a88d9a13ff 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf @@ -36,6 +36,7 @@ [Sources] buildinf.h buildinf.c ossl_store.c + provider.c rand_pool.c # SslNull.c EcSm2Null.c diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf b/CryptoPkg/L= ibrary/OpensslLib/OpensslLibAccel.inf index 59c5d42bc78e..b2ff45a2f771 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf @@ -39,6 +39,7 @@ [Sources] buildinf.h buildinf.c ossl_store.c + provider.c rand_pool.c # SslNull.c EcSm2Null.c diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/= Library/OpensslLib/OpensslLibCrypto.inf index 5bd6fa09ab33..64341653ff9e 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf @@ -37,6 +37,7 @@ [Sources] buildinf.h buildinf.c ossl_store.c + provider.c rand_pool.c # SslNull.c EcSm2Null.c diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf b/CryptoPkg/Li= brary/OpensslLib/OpensslLibFull.inf index aaea1bab5b26..fcb898bba2d2 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf @@ -41,6 +41,7 @@ [Sources] buildinf.h buildinf.c ossl_store.c + provider.c rand_pool.c # SslNull.c # EcSm2Null.c diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf b/CryptoP= kg/Library/OpensslLib/OpensslLibFullAccel.inf index 2f559042dbab..e152ab278c94 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf @@ -43,6 +43,7 @@ [Sources] # Autogenerated files list ends here buildinf.h ossl_store.c + provider.c rand_pool.c # SslNull.c # EcSm2Null.c diff --git a/CryptoPkg/Library/OpensslLib/provider.c b/CryptoPkg/Library/Op= ensslLib/provider.c new file mode 100644 index 000000000000..bb17b008270f --- /dev/null +++ b/CryptoPkg/Library/OpensslLib/provider.c @@ -0,0 +1,21 @@ +/* + * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#include +#include "provider_local.h" + +OSSL_provider_init_fn ossl_default_provider_init; +OSSL_provider_init_fn ossl_base_provider_init; +OSSL_provider_init_fn ossl_null_provider_init; +const OSSL_PROVIDER_INFO ossl_predefined_providers[] =3D { + { "default", NULL, ossl_default_provider_init, NULL, 1 }, + { "base", NULL, ossl_base_provider_init, NULL, 0 }, + { "null", NULL, ossl_null_provider_init, NULL, 0 }, + { NULL, NULL, NULL, NULL, 0 } +}; diff --git a/CryptoPkg/Library/OpensslLib/configure.py b/CryptoPkg/Library/= OpensslLib/configure.py index d8aa0cb03edf..8b44e3124a1e 100755 --- a/CryptoPkg/Library/OpensslLib/configure.py +++ b/CryptoPkg/Library/OpensslLib/configure.py @@ -195,6 +195,7 @@ def sources_filter_fn(filename): 'randfile.c', '/store/', '/storemgmt/', + 'provider_predefined.c' ] for item in exclude: if item in filename: --=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 (#101078): https://edk2.groups.io/g/devel/message/101078 Mute This Topic: https://groups.io/mt/97576425/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-