From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.61]) by mx.groups.io with SMTP id smtpd.web09.8350.1581696644591037956 for ; Fri, 14 Feb 2020 08:10:44 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=cq6zf8l8; spf=pass (domain: redhat.com, ip: 205.139.110.61, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581696643; 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=PCUsslZAzZw0qmltVroSEOQQGYgw20cSy4nzXbE3Dms=; b=cq6zf8l8aatH+dfG9Pfg5s6ZBOow+VmVyqtBpZ5wzo07iGbvi4kpBHMChClQhGY7VzG5nK 4qWgtRYm3ARwBhonWmwoV7wCz1mLjYfLyvkyTXb7r8VyeIb3ntdhYBX4uBntWjERSrS7kG GQGIbiZc5raISaJEPk9NmUTzrGwL/7w= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-348-gaFj-tGnMmOC1NNorPsS1w-1; Fri, 14 Feb 2020 11:10:39 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 90450A115A; Fri, 14 Feb 2020 16:10:37 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-153.ams2.redhat.com [10.36.116.153]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5590617DC8; Fri, 14 Feb 2020 16:10:36 +0000 (UTC) Subject: Re: [edk2-devel] [PATCH v3 1/2] CryptoPkg/OpensslLib: Add "sort" keyword to header file parsing loop To: devel@edk2.groups.io, christopher.j.zurcher@intel.com Cc: Jian J Wang , Xiaoyu Lu References: <20200214004021.17300-1-christopher.j.zurcher@intel.com> <20200214004021.17300-2-christopher.j.zurcher@intel.com> From: "Laszlo Ersek" Message-ID: Date: Fri, 14 Feb 2020 17:10:35 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20200214004021.17300-2-christopher.j.zurcher@intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: gaFj-tGnMmOC1NNorPsS1w-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit On 02/14/20 01:40, Zurcher, Christopher J wrote: > This prevents the .inf files from being randomized after every run > of process_files.pl. > > Cc: Jian J Wang > Cc: Xiaoyu Lu > Signed-off-by: Christopher J Zurcher > --- > CryptoPkg/Library/OpensslLib/OpensslLib.inf | 66 ++++++++++---------- > CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 62 +++++++++--------- > CryptoPkg/Library/OpensslLib/process_files.pl | 4 +- > 3 files changed, 66 insertions(+), 66 deletions(-) Reviewed-by: Laszlo Ersek Thanks! Laszlo > > diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf > index 3fa52f5543..3519a66885 100644 > --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf > +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf > @@ -1,7 +1,7 @@ > ## @file > # This module provides OpenSSL Library implementation. > # > -# Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.
> +# Copyright (c) 2010 - 2020, Intel Corporation. All rights reserved.
> # SPDX-License-Identifier: BSD-2-Clause-Patent > # > ## > @@ -494,57 +494,57 @@ > $(OPENSSL_PATH)/crypto/x509v3/v3_tlsf.c > $(OPENSSL_PATH)/crypto/x509v3/v3_utl.c > $(OPENSSL_PATH)/crypto/x509v3/v3err.c > - $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h > - $(OPENSSL_PATH)/crypto/dh/dh_locl.h > - $(OPENSSL_PATH)/crypto/bio/bio_lcl.h > - $(OPENSSL_PATH)/crypto/conf/conf_def.h > - $(OPENSSL_PATH)/crypto/conf/conf_lcl.h > - $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h > - $(OPENSSL_PATH)/crypto/sha/sha_locl.h > - $(OPENSSL_PATH)/crypto/md5/md5_locl.h > - $(OPENSSL_PATH)/crypto/store/store_locl.h > - $(OPENSSL_PATH)/crypto/dso/dso_locl.h > - $(OPENSSL_PATH)/crypto/pkcs12/p12_lcl.h > $(OPENSSL_PATH)/crypto/arm_arch.h > $(OPENSSL_PATH)/crypto/mips_arch.h > $(OPENSSL_PATH)/crypto/ppc_arch.h > $(OPENSSL_PATH)/crypto/s390x_arch.h > $(OPENSSL_PATH)/crypto/sparc_arch.h > $(OPENSSL_PATH)/crypto/vms_rms.h > - $(OPENSSL_PATH)/crypto/bn/bn_lcl.h > - $(OPENSSL_PATH)/crypto/bn/bn_prime.h > - $(OPENSSL_PATH)/crypto/bn/rsaz_exp.h > - $(OPENSSL_PATH)/crypto/ui/ui_locl.h > - $(OPENSSL_PATH)/crypto/md4/md4_locl.h > - $(OPENSSL_PATH)/crypto/rc4/rc4_locl.h > + $(OPENSSL_PATH)/crypto/aes/aes_locl.h > $(OPENSSL_PATH)/crypto/asn1/asn1_item_list.h > $(OPENSSL_PATH)/crypto/asn1/asn1_locl.h > $(OPENSSL_PATH)/crypto/asn1/charmap.h > $(OPENSSL_PATH)/crypto/asn1/standard_methods.h > $(OPENSSL_PATH)/crypto/asn1/tbl_standard.h > - $(OPENSSL_PATH)/crypto/evp/evp_locl.h > - $(OPENSSL_PATH)/crypto/rand/rand_lcl.h > - $(OPENSSL_PATH)/crypto/ocsp/ocsp_lcl.h > - $(OPENSSL_PATH)/crypto/modes/modes_lcl.h > - $(OPENSSL_PATH)/crypto/comp/comp_lcl.h > - $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h > - $(OPENSSL_PATH)/crypto/x509/x509_lcl.h > + $(OPENSSL_PATH)/crypto/async/async_locl.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/sm3/sm3_locl.h > + $(OPENSSL_PATH)/crypto/bio/bio_lcl.h > + $(OPENSSL_PATH)/crypto/bn/bn_lcl.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/conf/conf_def.h > + $(OPENSSL_PATH)/crypto/conf/conf_lcl.h > $(OPENSSL_PATH)/crypto/des/des_locl.h > $(OPENSSL_PATH)/crypto/des/spr.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/md4/md4_locl.h > + $(OPENSSL_PATH)/crypto/md5/md5_locl.h > + $(OPENSSL_PATH)/crypto/modes/modes_lcl.h > + $(OPENSSL_PATH)/crypto/objects/obj_dat.h > + $(OPENSSL_PATH)/crypto/objects/obj_lcl.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/rc4/rc4_locl.h > + $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h > + $(OPENSSL_PATH)/crypto/sha/sha_locl.h > $(OPENSSL_PATH)/crypto/siphash/siphash_local.h > - $(OPENSSL_PATH)/crypto/aes/aes_locl.h > - $(OPENSSL_PATH)/crypto/async/async_locl.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/x509v3/ext_dat.h > $(OPENSSL_PATH)/crypto/x509v3/pcy_int.h > $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h > $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h > - $(OPENSSL_PATH)/crypto/objects/obj_dat.h > - $(OPENSSL_PATH)/crypto/objects/obj_lcl.h > - $(OPENSSL_PATH)/crypto/objects/obj_xref.h > $(OPENSSL_PATH)/ssl/bio_ssl.c > $(OPENSSL_PATH)/ssl/d1_lib.c > $(OPENSSL_PATH)/ssl/d1_msg.c > @@ -589,13 +589,13 @@ > $(OPENSSL_PATH)/ssl/t1_trce.c > $(OPENSSL_PATH)/ssl/tls13_enc.c > $(OPENSSL_PATH)/ssl/tls_srp.c > - $(OPENSSL_PATH)/ssl/statem/statem.h > - $(OPENSSL_PATH)/ssl/statem/statem_locl.h > $(OPENSSL_PATH)/ssl/packet_locl.h > $(OPENSSL_PATH)/ssl/ssl_cert_table.h > $(OPENSSL_PATH)/ssl/ssl_locl.h > $(OPENSSL_PATH)/ssl/record/record.h > $(OPENSSL_PATH)/ssl/record/record_locl.h > + $(OPENSSL_PATH)/ssl/statem/statem.h > + $(OPENSSL_PATH)/ssl/statem/statem_locl.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 f1f9fbb938..8a723cb8cd 100644 > --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > @@ -1,7 +1,7 @@ > ## @file > # This module provides OpenSSL Library implementation. > # > -# Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.
> +# Copyright (c) 2010 - 2020, Intel Corporation. All rights reserved.
> # SPDX-License-Identifier: BSD-2-Clause-Patent > # > ## > @@ -494,57 +494,57 @@ > $(OPENSSL_PATH)/crypto/x509v3/v3_tlsf.c > $(OPENSSL_PATH)/crypto/x509v3/v3_utl.c > $(OPENSSL_PATH)/crypto/x509v3/v3err.c > - $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h > - $(OPENSSL_PATH)/crypto/dh/dh_locl.h > - $(OPENSSL_PATH)/crypto/bio/bio_lcl.h > - $(OPENSSL_PATH)/crypto/conf/conf_def.h > - $(OPENSSL_PATH)/crypto/conf/conf_lcl.h > - $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h > - $(OPENSSL_PATH)/crypto/sha/sha_locl.h > - $(OPENSSL_PATH)/crypto/md5/md5_locl.h > - $(OPENSSL_PATH)/crypto/store/store_locl.h > - $(OPENSSL_PATH)/crypto/dso/dso_locl.h > - $(OPENSSL_PATH)/crypto/pkcs12/p12_lcl.h > $(OPENSSL_PATH)/crypto/arm_arch.h > $(OPENSSL_PATH)/crypto/mips_arch.h > $(OPENSSL_PATH)/crypto/ppc_arch.h > $(OPENSSL_PATH)/crypto/s390x_arch.h > $(OPENSSL_PATH)/crypto/sparc_arch.h > $(OPENSSL_PATH)/crypto/vms_rms.h > - $(OPENSSL_PATH)/crypto/bn/bn_lcl.h > - $(OPENSSL_PATH)/crypto/bn/bn_prime.h > - $(OPENSSL_PATH)/crypto/bn/rsaz_exp.h > - $(OPENSSL_PATH)/crypto/ui/ui_locl.h > - $(OPENSSL_PATH)/crypto/md4/md4_locl.h > - $(OPENSSL_PATH)/crypto/rc4/rc4_locl.h > + $(OPENSSL_PATH)/crypto/aes/aes_locl.h > $(OPENSSL_PATH)/crypto/asn1/asn1_item_list.h > $(OPENSSL_PATH)/crypto/asn1/asn1_locl.h > $(OPENSSL_PATH)/crypto/asn1/charmap.h > $(OPENSSL_PATH)/crypto/asn1/standard_methods.h > $(OPENSSL_PATH)/crypto/asn1/tbl_standard.h > - $(OPENSSL_PATH)/crypto/evp/evp_locl.h > - $(OPENSSL_PATH)/crypto/rand/rand_lcl.h > - $(OPENSSL_PATH)/crypto/ocsp/ocsp_lcl.h > - $(OPENSSL_PATH)/crypto/modes/modes_lcl.h > - $(OPENSSL_PATH)/crypto/comp/comp_lcl.h > - $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h > - $(OPENSSL_PATH)/crypto/x509/x509_lcl.h > + $(OPENSSL_PATH)/crypto/async/async_locl.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/sm3/sm3_locl.h > + $(OPENSSL_PATH)/crypto/bio/bio_lcl.h > + $(OPENSSL_PATH)/crypto/bn/bn_lcl.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/conf/conf_def.h > + $(OPENSSL_PATH)/crypto/conf/conf_lcl.h > $(OPENSSL_PATH)/crypto/des/des_locl.h > $(OPENSSL_PATH)/crypto/des/spr.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/md4/md4_locl.h > + $(OPENSSL_PATH)/crypto/md5/md5_locl.h > + $(OPENSSL_PATH)/crypto/modes/modes_lcl.h > + $(OPENSSL_PATH)/crypto/objects/obj_dat.h > + $(OPENSSL_PATH)/crypto/objects/obj_lcl.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/rc4/rc4_locl.h > + $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h > + $(OPENSSL_PATH)/crypto/sha/sha_locl.h > $(OPENSSL_PATH)/crypto/siphash/siphash_local.h > - $(OPENSSL_PATH)/crypto/aes/aes_locl.h > - $(OPENSSL_PATH)/crypto/async/async_locl.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/x509v3/ext_dat.h > $(OPENSSL_PATH)/crypto/x509v3/pcy_int.h > $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h > $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h > - $(OPENSSL_PATH)/crypto/objects/obj_dat.h > - $(OPENSSL_PATH)/crypto/objects/obj_lcl.h > - $(OPENSSL_PATH)/crypto/objects/obj_xref.h > # Autogenerated files list ends here > buildinf.h > rand_pool_noise.h > diff --git a/CryptoPkg/Library/OpensslLib/process_files.pl b/CryptoPkg/Library/OpensslLib/process_files.pl > index bbcfa0d0e7..11cd58cc4e 100755 > --- a/CryptoPkg/Library/OpensslLib/process_files.pl > +++ b/CryptoPkg/Library/OpensslLib/process_files.pl > @@ -53,7 +53,7 @@ BEGIN { > "no-async", > "no-autoalginit", > "no-autoerrinit", > - "no-autoload-config", > + "no-autoload-config", > "no-bf", > "no-blake2", > "no-camellia", > @@ -157,7 +157,7 @@ foreach my $product ((@{$unified_info{libraries}}, > # Update the perl script to generate the missing header files > # > my @dir_list = (); > -for (keys %{$unified_info{dirinfo}}){ > +for (sort keys %{$unified_info{dirinfo}}){ > push @dir_list,$_; > } > >