From: Joe Orton <jorton@apache.org>
Date: Tue, 24 Jul 2018 11:32:17 +0000 (+0000)
Subject: * modules/ssl/ssl_engine_pphrase.c: Fix linking against OpenSSL without
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2444
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af45dd7e80039ef8ae1741c2a1a3b10d9b4eac7b;p=thirdparty%2Fapache%2Fhttpd.git

* modules/ssl/ssl_engine_pphrase.c: Fix linking against OpenSSL without
  ENGINE support.

PR: 62563


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1836547 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/ssl/ssl_engine_pphrase.c b/modules/ssl/ssl_engine_pphrase.c
index c32debd45aa..6a5e1eb0aaf 100644
--- a/modules/ssl/ssl_engine_pphrase.c
+++ b/modules/ssl/ssl_engine_pphrase.c
@@ -803,6 +803,7 @@ static UI_METHOD *get_passphrase_ui(apr_pool_t *p)
     
     return ui_method;
 }
+#endif
 
 
 apr_status_t modssl_load_engine_keypair(server_rec *s, apr_pool_t *p,
@@ -810,6 +811,7 @@ apr_status_t modssl_load_engine_keypair(server_rec *s, apr_pool_t *p,
                                         const char *certid, const char *keyid,
                                         X509 **pubkey, EVP_PKEY **privkey)
 {
+#if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_ENGINE_INIT)
     const char *c, *scheme;
     ENGINE *e;
     UI_METHOD *ui_method = get_passphrase_ui(p);
@@ -883,5 +885,7 @@ apr_status_t modssl_load_engine_keypair(server_rec *s, apr_pool_t *p,
     ENGINE_free(e);
 
     return APR_SUCCESS;
-}
+#else
+    return APR_ENOTIMPL;
 #endif
+}