From nobody Fri May 3 07:45:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+42396+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+42396+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1560468775; cv=none; d=zoho.com; s=zohoarc; b=eZdX24BNsgAy2Io5dQbz4gt3TcDjdsEnsq5hTj4RF+LyfjuQ6U4eD4r+/oDD+pTf2ys6o7sAeNSpJBQbhzJjBRhcdVrDiEXJus8luXMFOA1r1pbRYchQdRCT9uoHn3wWYZ+rr0c4s7KlRB56bKff+drP+v9GPbwDG16Qi6jk/rI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560468775; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To:ARC-Authentication-Results; bh=I0IF/CcnB95cokNzUlpz7c79MgHl+qtGGOS7ql1kchs=; b=F8c+gJ0XOdY3k1e2NTP3pGgOcQ6WF9Mz7NENGxzULV3pFTFKJ2QWmx77MUmoWhQRlltA5YT4s7JPdc4+nC8Pt8QkxzkT/TJDWKrAXoKWL4fC693fNrag+3nIwRiAHu+fH/pvQInKQDcnWt6ZTQfY2VVqpGTXWK5BmjRRoS2T8iQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+42396+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1560468775620426.56118767876796; Thu, 13 Jun 2019 16:32:55 -0700 (PDT) Return-Path: X-Received: from muon.bluestop.org (muon.bluestop.org [96.73.9.1]) by groups.io with SMTP; Thu, 13 Jun 2019 16:32:54 -0700 X-Received: from muon.bluestop.org (localhost [127.0.0.1]) by muon.bluestop.org (Postfix) with ESMTP id 71DE56A689; Thu, 13 Jun 2019 17:36:57 -0600 (MDT) X-Received: from muon.bluestop.org ([127.0.0.1]) by muon.bluestop.org (muon.bluestop.org [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id H_5VX2p-Bh1S; Thu, 13 Jun 2019 17:36:56 -0600 (MDT) X-Received: from photon.int.bluestop.org (unknown [96.73.9.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by muon.bluestop.org (Postfix) with ESMTPSA; Thu, 13 Jun 2019 17:36:56 -0600 (MDT) From: rebecca@bluestop.org To: Jian Wang , Ting Ye , devel@edk2.groups.io Cc: Rebecca Cran Subject: [edk2-devel] [PATCH] CryptoPkg: define DSO_NONE in the OpenSSL build Date: Thu, 13 Jun 2019 17:32:39 -0600 Message-Id: <20190613233239.54074-1-rebecca@bluestop.org> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,rebecca@bluestop.org Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1560468775; bh=eaEhNFPKH1J7utOv0VLXPLVRGkdsDRfn4dzmcT+6904=; h=Cc:Date:From:Reply-To:Subject:To; b=GC8vSXtX1HVUtOaGcOCl6zx1KbU+diOJP0s93mVL44AASxpJyX2gK8ag9iIT21SoM9H GVOHBiBPWA5E10CXzLd8ZMzDQXAgiQjA0ECZ4RSFlfnuIlbLmdV5Dbc/qIyEvIgoYeqLB xUzrW2qqHeHf+HKOiXfM8w1gYj22FGw0bYA= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" This fixes the build on FreeBSD, where DSO_METHOD_openssl is undefined since dso_openssl.c only compiles the function if DSO_NONE is defined. Signed-off-by: Rebecca Cran --- CryptoPkg/Library/OpensslLib/OpensslLib.inf | 2 +- CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Librar= y/OpensslLib/OpensslLib.inf index 5f36edeeef..fa8cc660be 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf @@ -15,7 +15,7 @@ VERSION_STRING =3D 1.0 LIBRARY_CLASS =3D OpensslLib DEFINE OPENSSL_PATH =3D openssl - DEFINE OPENSSL_FLAGS =3D -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRINT = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE + DEFINE OPENSSL_FLAGS =3D -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRINT = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DDSO_NONE =20 # # VALID_ARCHITECTURES =3D IA32 X64 ARM AARCH64 diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/= Library/OpensslLib/OpensslLibCrypto.inf index de05cac931..680df19a4a 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf @@ -15,7 +15,7 @@ VERSION_STRING =3D 1.0 LIBRARY_CLASS =3D OpensslLib DEFINE OPENSSL_PATH =3D openssl - DEFINE OPENSSL_FLAGS =3D -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRINT = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE + DEFINE OPENSSL_FLAGS =3D -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRINT = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DDSO_NONE =20 # # VALID_ARCHITECTURES =3D IA32 X64 ARM AARCH64 --=20 2.21.0 -=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 (#42396): https://edk2.groups.io/g/devel/message/42396 Mute This Topic: https://groups.io/mt/32058409/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-