From nobody Sun May 5 19:01:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+62715+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+62715+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1594949791; cv=none; d=zohomail.com; s=zohoarc; b=ICE0dXI6APjIbqTfN6JPOq74HU+zSjQXcLzqFOikxnn2Pfv0ygliXQ4SAntB9jX4T8EdXaB3IIP+m6MIRipnxsxmH44FtHLCXGi32Nq27LYM8i6Sl1piHzpzEHUxBGfoXrvLKp9y0XEX1Dj+pjzZEFFHD0xO2vhOeMrblikanbU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594949791; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=OQH8q82qlLulPB+tnXztyVGurTOX4cgGH0DAAi/vuis=; b=dtMJ8J5k9iiFAmq1yrYkrc/NTw5mx35B6zAUYKutxSLwHIXB5gnb7yUHTdsByGBS4V2E4X0wfwFnPjjxHOm9Mt9rHlwccpsDF/v4jDy1n1vpgtjSSpaZ2cTenfwulYuIWrteRD9cAenL+Lfoe/XkAogrzZcRbtw2iqrRv/7FSAQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+62715+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1594949791751300.55729783783033; Thu, 16 Jul 2020 18:36:31 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id lhi4YY1788612x6uhfxkUzc2; Thu, 16 Jul 2020 18:36:31 -0700 X-Received: from mga12.intel.com (mga12.intel.com []) by mx.groups.io with SMTP id smtpd.web10.2841.1594949789558165221 for ; Thu, 16 Jul 2020 18:36:31 -0700 IronPort-SDR: yRe9BrK1Rj95pRV2CVtUQmAGkWHQzb6VQhFkn8XKKmZbqzrXTplTLFc5ebstvHDM+5llrAUEaA SniI/B8RaXww== X-IronPort-AV: E=McAfee;i="6000,8403,9684"; a="129086455" X-IronPort-AV: E=Sophos;i="5.75,361,1589266800"; d="scan'208";a="129086455" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jul 2020 18:36:30 -0700 IronPort-SDR: EgGzcHQieaqTTIp42nx/tES7wCnGauQ+NW7UqsMzQpyPuSw4GICnSQOy3cjd5NZBd/tPa2MrE5 YNahXcIyYz0Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,361,1589266800"; d="scan'208";a="300419303" X-Received: from guominji-mobl.ccr.corp.intel.com ([10.238.13.140]) by orsmga002.jf.intel.com with ESMTP; 16 Jul 2020 18:36:29 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: Jian J Wang , Xiaoyu Lu , Laszlo Ersek Subject: [edk2-devel] [PATCH v2 1/1] CryptoPkg/OpensslLib: Upgrade OpenSSL to 1.1.1g Date: Fri, 17 Jul 2020 09:36:26 +0800 Message-Id: <20200717013626.846-2-guomin.jiang@intel.com> In-Reply-To: <20200717013626.846-1-guomin.jiang@intel.com> References: <20200717013626.846-1-guomin.jiang@intel.com> 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,guomin.jiang@intel.com X-Gm-Message-State: 6cDegXzd7hF0brjX79UvbYJIx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1594949791; bh=xbLo/E6/JN4tkuwFgCxIUr/XiMkNXzYX16iUdkto4bk=; h=Cc:Date:From:Reply-To:Subject:To; b=Jf/SxeUEgoqEObyaRQIJ9RqxQDhusoB0HRyGM94AImJejPnuYBVc8e9YZoh/+W4L+Sm MckA9dIGiKoWICautEW5CQAoHHbrPUaSp76LpRJPng+o+iN0mhwa1whbY6xedGEuy5pc2 /ct+02w7VC6sr2FwbEQFF1MAKjdr/KjzfZ8= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Upgrade openssl to 1.1.1g. the directory have been reorganized, openssl moved crypto/include/internal to include/crypto folder. So we change directory to match the re-organization. The dso_conf.h and opensslconf.h will generated in UNIX format, change process_files.pl to covent the EOL automatically. Cc: Jian J Wang Cc: Xiaoyu Lu Signed-off-by: Guomin Jiang Reviewed-by: Laszlo Ersek Tested-by: Laszlo Ersek Reviewed-by: Jian J Wang --- CryptoPkg/CryptoPkg.dec | 1 - CryptoPkg/Library/OpensslLib/OpensslLib.inf | 58 +++++++++---------- .../Library/OpensslLib/OpensslLibCrypto.inf | 50 ++++++++-------- .../Include/{internal =3D> crypto}/dso_conf.h | 32 +++++----- .../Library/Include/openssl/opensslconf.h | 3 - .../Library/BaseCryptLib/Hash/CryptSm3.c | 2 +- .../BaseCryptLib/Pk/CryptPkcs7VerifyEku.c | 4 +- CryptoPkg/Library/OpensslLib/rand_pool.c | 2 +- CryptoPkg/Library/OpensslLib/openssl | 2 +- CryptoPkg/Library/OpensslLib/process_files.pl | 25 +++++--- 10 files changed, 91 insertions(+), 88 deletions(-) rename CryptoPkg/Library/Include/{internal =3D> crypto}/dso_conf.h (76%) diff --git a/CryptoPkg/CryptoPkg.dec b/CryptoPkg/CryptoPkg.dec index 4d1a1368a8d4..5888941bab4c 100644 --- a/CryptoPkg/CryptoPkg.dec +++ b/CryptoPkg/CryptoPkg.dec @@ -23,7 +23,6 @@ [Includes.Common.Private] Private Library/Include Library/OpensslLib/openssl/include - Library/OpensslLib/openssl/crypto/include =20 [LibraryClasses] ## @libraryclass Provides basic library functions for cryptographic pr= imitives. diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Librar= y/OpensslLib/OpensslLib.inf index c8ec9454bd90..dbbe5386a10c 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf @@ -477,45 +477,45 @@ [Sources] $(OPENSSL_PATH)/crypto/s390x_arch.h $(OPENSSL_PATH)/crypto/sparc_arch.h $(OPENSSL_PATH)/crypto/vms_rms.h - $(OPENSSL_PATH)/crypto/aes/aes_locl.h + $(OPENSSL_PATH)/crypto/aes/aes_local.h $(OPENSSL_PATH)/crypto/asn1/asn1_item_list.h - $(OPENSSL_PATH)/crypto/asn1/asn1_locl.h + $(OPENSSL_PATH)/crypto/asn1/asn1_local.h $(OPENSSL_PATH)/crypto/asn1/charmap.h $(OPENSSL_PATH)/crypto/asn1/standard_methods.h $(OPENSSL_PATH)/crypto/asn1/tbl_standard.h - $(OPENSSL_PATH)/crypto/async/async_locl.h + $(OPENSSL_PATH)/crypto/async/async_local.h $(OPENSSL_PATH)/crypto/async/arch/async_null.h $(OPENSSL_PATH)/crypto/async/arch/async_posix.h $(OPENSSL_PATH)/crypto/async/arch/async_win.h - $(OPENSSL_PATH)/crypto/bio/bio_lcl.h - $(OPENSSL_PATH)/crypto/bn/bn_lcl.h + $(OPENSSL_PATH)/crypto/bio/bio_local.h + $(OPENSSL_PATH)/crypto/bn/bn_local.h $(OPENSSL_PATH)/crypto/bn/bn_prime.h $(OPENSSL_PATH)/crypto/bn/rsaz_exp.h - $(OPENSSL_PATH)/crypto/comp/comp_lcl.h + $(OPENSSL_PATH)/crypto/comp/comp_local.h $(OPENSSL_PATH)/crypto/conf/conf_def.h - $(OPENSSL_PATH)/crypto/conf/conf_lcl.h - $(OPENSSL_PATH)/crypto/dh/dh_locl.h - $(OPENSSL_PATH)/crypto/dso/dso_locl.h - $(OPENSSL_PATH)/crypto/evp/evp_locl.h - $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h - $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h - $(OPENSSL_PATH)/crypto/md5/md5_locl.h - $(OPENSSL_PATH)/crypto/modes/modes_lcl.h + $(OPENSSL_PATH)/crypto/conf/conf_local.h + $(OPENSSL_PATH)/crypto/dh/dh_local.h + $(OPENSSL_PATH)/crypto/dso/dso_local.h + $(OPENSSL_PATH)/crypto/evp/evp_local.h + $(OPENSSL_PATH)/crypto/hmac/hmac_local.h + $(OPENSSL_PATH)/crypto/lhash/lhash_local.h + $(OPENSSL_PATH)/crypto/md5/md5_local.h + $(OPENSSL_PATH)/crypto/modes/modes_local.h $(OPENSSL_PATH)/crypto/objects/obj_dat.h - $(OPENSSL_PATH)/crypto/objects/obj_lcl.h + $(OPENSSL_PATH)/crypto/objects/obj_local.h $(OPENSSL_PATH)/crypto/objects/obj_xref.h - $(OPENSSL_PATH)/crypto/ocsp/ocsp_lcl.h - $(OPENSSL_PATH)/crypto/pkcs12/p12_lcl.h - $(OPENSSL_PATH)/crypto/rand/rand_lcl.h - $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h - $(OPENSSL_PATH)/crypto/sha/sha_locl.h + $(OPENSSL_PATH)/crypto/ocsp/ocsp_local.h + $(OPENSSL_PATH)/crypto/pkcs12/p12_local.h + $(OPENSSL_PATH)/crypto/rand/rand_local.h + $(OPENSSL_PATH)/crypto/rsa/rsa_local.h + $(OPENSSL_PATH)/crypto/sha/sha_local.h $(OPENSSL_PATH)/crypto/siphash/siphash_local.h - $(OPENSSL_PATH)/crypto/sm3/sm3_locl.h - $(OPENSSL_PATH)/crypto/store/store_locl.h - $(OPENSSL_PATH)/crypto/ui/ui_locl.h - $(OPENSSL_PATH)/crypto/x509/x509_lcl.h + $(OPENSSL_PATH)/crypto/sm3/sm3_local.h + $(OPENSSL_PATH)/crypto/store/store_local.h + $(OPENSSL_PATH)/crypto/ui/ui_local.h + $(OPENSSL_PATH)/crypto/x509/x509_local.h $(OPENSSL_PATH)/crypto/x509v3/ext_dat.h - $(OPENSSL_PATH)/crypto/x509v3/pcy_int.h + $(OPENSSL_PATH)/crypto/x509v3/pcy_local.h $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h $(OPENSSL_PATH)/ssl/bio_ssl.c @@ -562,13 +562,13 @@ [Sources] $(OPENSSL_PATH)/ssl/t1_trce.c $(OPENSSL_PATH)/ssl/tls13_enc.c $(OPENSSL_PATH)/ssl/tls_srp.c - $(OPENSSL_PATH)/ssl/packet_locl.h + $(OPENSSL_PATH)/ssl/packet_local.h $(OPENSSL_PATH)/ssl/ssl_cert_table.h - $(OPENSSL_PATH)/ssl/ssl_locl.h + $(OPENSSL_PATH)/ssl/ssl_local.h $(OPENSSL_PATH)/ssl/record/record.h - $(OPENSSL_PATH)/ssl/record/record_locl.h + $(OPENSSL_PATH)/ssl/record/record_local.h $(OPENSSL_PATH)/ssl/statem/statem.h - $(OPENSSL_PATH)/ssl/statem/statem_locl.h + $(OPENSSL_PATH)/ssl/statem/statem_local.h # Autogenerated files list ends here buildinf.h rand_pool_noise.h diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/= Library/OpensslLib/OpensslLibCrypto.inf index 2f232e3e1289..616ccd9f62d1 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf @@ -477,45 +477,45 @@ [Sources] $(OPENSSL_PATH)/crypto/s390x_arch.h $(OPENSSL_PATH)/crypto/sparc_arch.h $(OPENSSL_PATH)/crypto/vms_rms.h - $(OPENSSL_PATH)/crypto/aes/aes_locl.h + $(OPENSSL_PATH)/crypto/aes/aes_local.h $(OPENSSL_PATH)/crypto/asn1/asn1_item_list.h - $(OPENSSL_PATH)/crypto/asn1/asn1_locl.h + $(OPENSSL_PATH)/crypto/asn1/asn1_local.h $(OPENSSL_PATH)/crypto/asn1/charmap.h $(OPENSSL_PATH)/crypto/asn1/standard_methods.h $(OPENSSL_PATH)/crypto/asn1/tbl_standard.h - $(OPENSSL_PATH)/crypto/async/async_locl.h + $(OPENSSL_PATH)/crypto/async/async_local.h $(OPENSSL_PATH)/crypto/async/arch/async_null.h $(OPENSSL_PATH)/crypto/async/arch/async_posix.h $(OPENSSL_PATH)/crypto/async/arch/async_win.h - $(OPENSSL_PATH)/crypto/bio/bio_lcl.h - $(OPENSSL_PATH)/crypto/bn/bn_lcl.h + $(OPENSSL_PATH)/crypto/bio/bio_local.h + $(OPENSSL_PATH)/crypto/bn/bn_local.h $(OPENSSL_PATH)/crypto/bn/bn_prime.h $(OPENSSL_PATH)/crypto/bn/rsaz_exp.h - $(OPENSSL_PATH)/crypto/comp/comp_lcl.h + $(OPENSSL_PATH)/crypto/comp/comp_local.h $(OPENSSL_PATH)/crypto/conf/conf_def.h - $(OPENSSL_PATH)/crypto/conf/conf_lcl.h - $(OPENSSL_PATH)/crypto/dh/dh_locl.h - $(OPENSSL_PATH)/crypto/dso/dso_locl.h - $(OPENSSL_PATH)/crypto/evp/evp_locl.h - $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h - $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h - $(OPENSSL_PATH)/crypto/md5/md5_locl.h - $(OPENSSL_PATH)/crypto/modes/modes_lcl.h + $(OPENSSL_PATH)/crypto/conf/conf_local.h + $(OPENSSL_PATH)/crypto/dh/dh_local.h + $(OPENSSL_PATH)/crypto/dso/dso_local.h + $(OPENSSL_PATH)/crypto/evp/evp_local.h + $(OPENSSL_PATH)/crypto/hmac/hmac_local.h + $(OPENSSL_PATH)/crypto/lhash/lhash_local.h + $(OPENSSL_PATH)/crypto/md5/md5_local.h + $(OPENSSL_PATH)/crypto/modes/modes_local.h $(OPENSSL_PATH)/crypto/objects/obj_dat.h - $(OPENSSL_PATH)/crypto/objects/obj_lcl.h + $(OPENSSL_PATH)/crypto/objects/obj_local.h $(OPENSSL_PATH)/crypto/objects/obj_xref.h - $(OPENSSL_PATH)/crypto/ocsp/ocsp_lcl.h - $(OPENSSL_PATH)/crypto/pkcs12/p12_lcl.h - $(OPENSSL_PATH)/crypto/rand/rand_lcl.h - $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h - $(OPENSSL_PATH)/crypto/sha/sha_locl.h + $(OPENSSL_PATH)/crypto/ocsp/ocsp_local.h + $(OPENSSL_PATH)/crypto/pkcs12/p12_local.h + $(OPENSSL_PATH)/crypto/rand/rand_local.h + $(OPENSSL_PATH)/crypto/rsa/rsa_local.h + $(OPENSSL_PATH)/crypto/sha/sha_local.h $(OPENSSL_PATH)/crypto/siphash/siphash_local.h - $(OPENSSL_PATH)/crypto/sm3/sm3_locl.h - $(OPENSSL_PATH)/crypto/store/store_locl.h - $(OPENSSL_PATH)/crypto/ui/ui_locl.h - $(OPENSSL_PATH)/crypto/x509/x509_lcl.h + $(OPENSSL_PATH)/crypto/sm3/sm3_local.h + $(OPENSSL_PATH)/crypto/store/store_local.h + $(OPENSSL_PATH)/crypto/ui/ui_local.h + $(OPENSSL_PATH)/crypto/x509/x509_local.h $(OPENSSL_PATH)/crypto/x509v3/ext_dat.h - $(OPENSSL_PATH)/crypto/x509v3/pcy_int.h + $(OPENSSL_PATH)/crypto/x509v3/pcy_local.h $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h # Autogenerated files list ends here diff --git a/CryptoPkg/Library/Include/internal/dso_conf.h b/CryptoPkg/Libr= ary/Include/crypto/dso_conf.h similarity index 76% rename from CryptoPkg/Library/Include/internal/dso_conf.h rename to CryptoPkg/Library/Include/crypto/dso_conf.h index 43c891588bc2..95f4db2b1586 100644 --- a/CryptoPkg/Library/Include/internal/dso_conf.h +++ b/CryptoPkg/Library/Include/crypto/dso_conf.h @@ -1,16 +1,16 @@ -/* WARNING: do not edit! */ -/* Generated from crypto/include/internal/dso_conf.h.in */ -/* - * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. - * - * Licensed under the OpenSSL license (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 - */ - -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H -# define DSO_NONE -# define DSO_EXTENSION ".so" -#endif +/* WARNING: do not edit! */ +/* Generated from include/crypto/dso_conf.h.in */ +/* + * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (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 + */ + +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H +# define DSO_NONE +# define DSO_EXTENSION ".so" +#endif diff --git a/CryptoPkg/Library/Include/openssl/opensslconf.h b/CryptoPkg/Li= brary/Include/openssl/opensslconf.h index 62c2736cb0b5..3a2544ea5ccc 100644 --- a/CryptoPkg/Library/Include/openssl/opensslconf.h +++ b/CryptoPkg/Library/Include/openssl/opensslconf.h @@ -247,9 +247,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif =20 =20 /* diff --git a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c b/CryptoPkg/Lib= rary/BaseCryptLib/Hash/CryptSm3.c index eacf4826c4f7..235331c2a038 100644 --- a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c +++ b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c @@ -7,7 +7,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ =20 #include "InternalCryptLib.h" -#include "internal/sm3.h" +#include "crypto/sm3.h" =20 /** Retrieves the size, in bytes, of the context buffer required for SM3 has= h operations. diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c b/Cryp= toPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c index 229c244b2657..c9fdb65b99d1 100644 --- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c +++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c @@ -15,13 +15,13 @@ #include #include #include -#include +#include #include #include #include #include #include -#include +#include =20 /** This function will return the leaf signer certificate in a chain. This = is diff --git a/CryptoPkg/Library/OpensslLib/rand_pool.c b/CryptoPkg/Library/O= pensslLib/rand_pool.c index 9f3983f7c35b..9e0179b03490 100644 --- a/CryptoPkg/Library/OpensslLib/rand_pool.c +++ b/CryptoPkg/Library/OpensslLib/rand_pool.c @@ -7,7 +7,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 -#include "internal/rand_int.h" +#include "crypto/rand.h" #include =20 #include diff --git a/CryptoPkg/Library/OpensslLib/openssl b/CryptoPkg/Library/Opens= slLib/openssl index c3656cc594da..e2e09d9fba11 160000 --- a/CryptoPkg/Library/OpensslLib/openssl +++ b/CryptoPkg/Library/OpensslLib/openssl @@ -1 +1 @@ -Subproject commit c3656cc594daac8167721dde7220f0e59ae146fc +Subproject commit e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72 diff --git a/CryptoPkg/Library/OpensslLib/process_files.pl b/CryptoPkg/Libr= ary/OpensslLib/process_files.pl index 65d07a2aed44..57ce1953947b 100755 --- a/CryptoPkg/Library/OpensslLib/process_files.pl +++ b/CryptoPkg/Library/OpensslLib/process_files.pl @@ -111,8 +111,8 @@ BEGIN { # Generate dso_conf.h per config data system( "perl -I. -Mconfigdata util/dofile.pl " . - "crypto/include/internal/dso_conf.h.in " . - "> include/internal/dso_conf.h" + "include/crypto/dso_conf.h.in " . + "> include/crypto/dso_conf.h" ) =3D=3D 0 || die "Failed to generate dso_conf.h!\n"; =20 @@ -263,14 +263,21 @@ print "Done!"; # Copy opensslconf.h and dso_conf.h generated from OpenSSL Configuration # print "\n--> Duplicating opensslconf.h into Include/openssl ... "; -copy($OPENSSL_PATH . "/include/openssl/opensslconf.h", - $OPENSSL_PATH . "/../../Include/openssl/") || - die "Cannot copy opensslconf.h!"; +system( + "perl -pe 's/\\n/\\r\\n/' " . + "< " . $OPENSSL_PATH . "/include/openssl/opensslconf.h " . + "> " . $OPENSSL_PATH . "/../../Include/openssl/opensslconf.h" + ) =3D=3D 0 || + die "Cannot copy opensslconf.h!"; print "Done!"; -print "\n--> Duplicating dso_conf.h into Include/internal ... "; -copy($OPENSSL_PATH . "/include/internal/dso_conf.h", - $OPENSSL_PATH . "/../../Include/internal/") || - die "Cannot copy dso_conf.h!"; + +print "\n--> Duplicating dso_conf.h into Include/crypto ... "; +system( + "perl -pe 's/\\n/\\r\\n/' " . + "< " . $OPENSSL_PATH . "/include/crypto/dso_conf.h" . + "> " . $OPENSSL_PATH . "/../../Include/crypto/dso_conf.h" + ) =3D=3D 0 || + die "Cannot copy dso_conf.h!"; print "Done!\n"; =20 print "\nProcessing Files Done!\n"; --=20 2.25.1.windows.1 -=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 (#62715): https://edk2.groups.io/g/devel/message/62715 Mute This Topic: https://groups.io/mt/75554881/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-