Agree with Laszlo's comment. With it's addressed, Reviewed-by: Jian J Wang <jian.j.w...@intel.com>
> -----Original Message----- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > Laszlo Ersek > Sent: Thursday, June 20, 2019 6:20 AM > To: devel@edk2.groups.io; Lu, XiaoyuX <xiaoyux...@intel.com>; Rebecca Cran > <rebe...@bluestop.org> > Cc: Wang, Jian J <jian.j.w...@intel.com> > Subject: Re: [edk2-devel] [PATCH 1/1] CryptoPkg/OpensslLib: disable autoload- > config for OpenSSL > > Hi, > > On 06/19/19 09:22, Xiaoyu Lu wrote: > > This problem was found by Rebecca Cran <rebe...@bluestop.org>. > > REF: https://edk2.groups.io/g/devel/topic/32100684 > > > > OpenSSL will automatically load a system config file which configures > > default ssl options. In UEFI, It will cause TlsInitialize failed > > without OPENSSL_INIT_NO_LOAD_CONFIG flag. we don't use this feature, > > So disable it. > > > > Re-run process_files.py to generate OpensslLib[Crypto].inf files. > > > > Cc: Jian J Wang <jian.j.w...@intel.com> > > Signed-off-by: Xiaoyu Lu <xiaoyux...@intel.com> > > --- > > CryptoPkg/Library/Include/openssl/opensslconf.h | 3 +++ > > CryptoPkg/Library/OpensslLib/process_files.pl | 1 + > > 2 files changed, 4 insertions(+) > > I think -- also from the discussion in the other thread, linked above -- > that this qualifies as a regression from the OpenSSL update in > edk2-stable201905. > > I suggest that we please file a TianoCore BZ for this issue, and > cross-reference the BZ with the patch (the patch should be reposted with > a BZ reference, and the BZ should reference the posting / final commit > hash). > > In addition, the BZ should get the "Regression" keyword (in the > "keywords" field), and it should include a pointer to the OpenSSL > upgrade BZ (1089) in the See Also field. > > These metadata make it easier for consumers of edk2 to track this fix. > > Thanks > Laszlo > > > diff --git a/CryptoPkg/Library/Include/openssl/opensslconf.h > b/CryptoPkg/Library/Include/openssl/opensslconf.h > > index 07fa2d3ce280..2b4d538e92d2 100644 > > --- a/CryptoPkg/Library/Include/openssl/opensslconf.h > > +++ b/CryptoPkg/Library/Include/openssl/opensslconf.h > > @@ -115,6 +115,9 @@ extern "C" { > > #ifndef OPENSSL_NO_AUTOERRINIT > > # define OPENSSL_NO_AUTOERRINIT > > #endif > > +#ifndef OPENSSL_NO_AUTOLOAD_CONFIG > > +# define OPENSSL_NO_AUTOLOAD_CONFIG > > +#endif > > #ifndef OPENSSL_NO_CAPIENG > > # define OPENSSL_NO_CAPIENG > > #endif > > diff --git a/CryptoPkg/Library/OpensslLib/process_files.pl > b/CryptoPkg/Library/OpensslLib/process_files.pl > > index 2783ff54f95a..3e8669e30fd7 100755 > > --- a/CryptoPkg/Library/OpensslLib/process_files.pl > > +++ b/CryptoPkg/Library/OpensslLib/process_files.pl > > @@ -53,6 +53,7 @@ BEGIN { > > "no-async", > > "no-autoalginit", > > "no-autoerrinit", > > + "no-autoload-config", > > "no-bf", > > "no-blake2", > > "no-camellia", > > > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#42610): https://edk2.groups.io/g/devel/message/42610 Mute This Topic: https://groups.io/mt/32120649/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
