Re: [Wget-dev] [PATCH] openssl: Do not use engines when OpenSSL does not support

[Tim Rühsen]

Thank you, pushed.

On 11/9/18 12:59 AM, Rosen Penev wrote:
> Fixes compilation with no engines compiled.
> 
> Signed-off-by: Rosen Penev <address@hidden>
> ---
>  src/openssl.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/src/openssl.c b/src/openssl.c
> index 6cf4afe9..73e7f0f4 100644
> --- a/src/openssl.c
> +++ b/src/openssl.c
> @@ -43,8 +43,10 @@ as that of the covered work.  */
>  #include <openssl/bio.h>
>  #if OPENSSL_VERSION_NUMBER >= 0x00907000
>  #include <openssl/conf.h>
> +#ifndef OPENSSL_NO_ENGINE
>  #include <openssl/engine.h>
>  #endif
> +#endif
>  
>  #include "utils.h"
>  #include "connect.h"
> @@ -193,7 +195,9 @@ ssl_init (void)
>  
>  #if OPENSSL_VERSION_NUMBER >= 0x00907000
>    OPENSSL_load_builtin_modules();
> +#ifndef OPENSSL_NO_ENGINE
>    ENGINE_load_builtin_engines();
> +#endif
>    CONF_modules_load_file(NULL, NULL,
>        CONF_MFLAGS_DEFAULT_SECTION|CONF_MFLAGS_IGNORE_MISSING_FILE);
>  #endif
>

signature.asc
Description: OpenPGP digital signature