From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 20 Feb 2024 10:37:30 +0000 (+0000)
Subject: mod_ssl: Follow up to r1913815: szCryptoDevice to NULL when !MODSSL_HAVE_ENGINE_API
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=339cb1b5040dd83ce65f5c098870fabb1cbaf34c;p=thirdparty%2Fapache%2Fhttpd.git

mod_ssl: Follow up to r1913815: szCryptoDevice to NULL when !MODSSL_HAVE_ENGINE_API

Latest OpenSSL versions removed the ENGINE API completely, still provide NULL
SSLModConfigRec::szCryptoDevice since it's used outside MODSSL_HAVE_ENGINE_API.

SSLModConfigRec is a private struct, so no MMN change.

* modules/ssl/ssl_private(SSLModConfigRec):
  Provide szCryptoDevice (NULL) even if !MODSSL_HAVE_ENGINE_API.



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

diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h
index d6673ee9762..e26caf04b84 100644
--- a/modules/ssl/ssl_private.h
+++ b/modules/ssl/ssl_private.h
@@ -658,9 +658,7 @@ typedef struct {
     apr_array_header_t   *aRandSeed;
 #endif
 
-#if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_ENGINE_INIT)
-    const char     *szCryptoDevice;
-#endif
+    const char     *szCryptoDevice; /* ENGINE device (if available) */
 
 #ifdef HAVE_OCSP_STAPLING
     const ap_socache_provider_t *stapling_cache;