[PATCH v2 1/1] CryptoPkg/OpensslLib: disable autoload-config for OpenSSL

[PATCH v2 1/1] CryptoPkg/OpensslLib: disable autoload-config for OpenSSL

[Xiaoyu Lu]

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>
---
 CryptoPkg/Library/Include/openssl/opensslconf.h | 3 +++
 CryptoPkg/Library/OpensslLib/process_files.pl   | 1 +
 2 files changed, 4 insertions(+)

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",
-- 
2.7.4

Re: [edk2-devel] [PATCH v2 1/1] CryptoPkg/OpensslLib: disable autoload-config for OpenSSL

[Wang, Jian J]

Pushed at b86fbe1f980102eee3e55eed92ac91937aee638e

Regards,
Jian


> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Xiaoyu Lu
> Sent: Thursday, June 20, 2019 1:55 PM
> To: devel@edk2.groups.io; Laszlo Ersek <lersek@redhat.com>; Wang, Jian J
> <jian.j.wang@intel.com>
> Cc: Lu, XiaoyuX <xiaoyux.lu@intel.com>
> Subject: [edk2-devel] [PATCH v2 1/1] 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>
> ---
>  CryptoPkg/Library/Include/openssl/opensslconf.h | 3 +++
>  CryptoPkg/Library/OpensslLib/process_files.pl   | 1 +
>  2 files changed, 4 insertions(+)
> 
> 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",
> --
> 2.7.4
> 
> 
>