github-repos/wget
1
0
Fork 0
mirror of https://github.com/mirror/wget.git synced 2025-03-04 23:00:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

openssl: Do not use engines when OpenSSL does not support

Browse Source 
* src/openssl.c: Check for OPENSSL_NO_ENGINE before
 including openssl/engine.h and before calling ENGINE_load_builtin_engines()

Fixes compilation with no engines compiled.

Copyright-paperwork-exempt: Yes
Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2018-11-08 16:01:05 -08:00 committed by Tim Rühsen
parent ed23e682da
commit a3643c6076
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openssl.c
View File

@ -43,8 +43,10 @@ as that of the covered work. */
#include <openssl/bio.h> #include <openssl/bio.h>
#if OPENSSL_VERSION_NUMBER >= 0x00907000 #if OPENSSL_VERSION_NUMBER >= 0x00907000
#include <openssl/conf.h> #include <openssl/conf.h>
#ifndef OPENSSL_NO_ENGINE
#include <openssl/engine.h> #include <openssl/engine.h>
#endif #endif
#endif
#include "utils.h" #include "utils.h"
#include "connect.h" #include "connect.h"
@ -193,7 +195,9 @@ ssl_init (void)
#if OPENSSL_VERSION_NUMBER >= 0x00907000 #if OPENSSL_VERSION_NUMBER >= 0x00907000
OPENSSL_load_builtin_modules(); OPENSSL_load_builtin_modules();
#ifndef OPENSSL_NO_ENGINE
ENGINE_load_builtin_engines(); ENGINE_load_builtin_engines();
#endif
CONF_modules_load_file(NULL, NULL, CONF_modules_load_file(NULL, NULL,
CONF_MFLAGS_DEFAULT_SECTION|CONF_MFLAGS_IGNORE_MISSING_FILE); CONF_MFLAGS_DEFAULT_SECTION|CONF_MFLAGS_IGNORE_MISSING_FILE);
#endif #endif