diff options
| author | Xiaoyu Lu <xiaoyux.lu@intel.com> | 2019-06-20 13:55:13 +0800 |
|---|---|---|
| committer | Jian J Wang <jian.j.wang@intel.com> | 2019-06-21 17:25:02 +0800 |
| commit | b86fbe1f980102eee3e55eed92ac91937aee638e (patch) | |
| tree | 0290b28bb66239ee521657a8884e2408b043f9f1 /CryptoPkg | |
| parent | 90e8f13d51278791e9534fc736a5319f9b4f9f0a (diff) | |
| download | edk2-b86fbe1f980102eee3e55eed92ac91937aee638e.tar.gz edk2-b86fbe1f980102eee3e55eed92ac91937aee638e.tar.bz2 edk2-b86fbe1f980102eee3e55eed92ac91937aee638e.zip | |
CryptoPkg/OpensslLib: disable autoload-config for OpenSSL
Bugzilla: https://bugzilla.tianocore.org/show_bug.cgi?id=1926
This problem was found by Rebecca Cran <rebecca@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.wang@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Xiaoyu Lu <xiaoyux.lu@intel.com>
Reviewed-by: Rebecca Cran <rebecca@bluestop.org>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>
Diffstat (limited to 'CryptoPkg')
| -rw-r--r-- | CryptoPkg/Library/Include/openssl/opensslconf.h | 3 | ||||
| -rwxr-xr-x | CryptoPkg/Library/OpensslLib/process_files.pl | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/CryptoPkg/Library/Include/openssl/opensslconf.h b/CryptoPkg/Library/Include/openssl/opensslconf.h index 07fa2d3ce2..2b4d538e92 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 e277108f07..671587efe1 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",
|