summaryrefslogtreecommitdiffstats
path: root/usr.sbin/httpd/src/modules/ssl/ssl_engine_config.c
diff options
context:
space:
mode:
authorbrad <brad@openbsd.org>2001-06-20 18:06:11 +0000
committerbrad <brad@openbsd.org>2001-06-20 18:06:11 +0000
commitdd39ab30a7e2c7e9ca316c190feca87dc383f81e (patch)
tree546e22cd0773367ac6e8ce3a3d8136380794629a /usr.sbin/httpd/src/modules/ssl/ssl_engine_config.c
parentTypo. (diff)
downloadwireguard-openbsd-dd39ab30a7e2c7e9ca316c190feca87dc383f81e.tar.xz
wireguard-openbsd-dd39ab30a7e2c7e9ca316c190feca87dc383f81e.zip
merge mod_ssl 2.8.4
-- Ok'd by: beck@
Diffstat (limited to 'usr.sbin/httpd/src/modules/ssl/ssl_engine_config.c')
-rw-r--r--usr.sbin/httpd/src/modules/ssl/ssl_engine_config.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/usr.sbin/httpd/src/modules/ssl/ssl_engine_config.c b/usr.sbin/httpd/src/modules/ssl/ssl_engine_config.c
index f460ac5f805..c47340b2232 100644
--- a/usr.sbin/httpd/src/modules/ssl/ssl_engine_config.c
+++ b/usr.sbin/httpd/src/modules/ssl/ssl_engine_config.c
@@ -450,7 +450,16 @@ const char *ssl_cmd_SSLCryptoDevice(
SSLModConfigRec *mc = myModConfig();
const char *err;
ENGINE *e;
-
+#if SSL_LIBRARY_VERSION >= 0x00907000
+ static int loaded_engines = FALSE;
+
+ /* early loading to make sure the engines are already
+ available for ENGINE_by_id() above... */
+ if (!loaded_engines) {
+ ENGINE_load_builtin_engines();
+ loaded_engines = TRUE;
+ }
+#endif
if ((err = ap_check_cmd_context(cmd, GLOBAL_ONLY)) != NULL)
return err;
if (strcEQ(arg, "builtin")) {