From 983ad1f383ec340a256bb719c7faed7da52f4bc5 Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Thu, 22 Feb 2024 14:06:46 +0000 Subject: [PATCH] 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. Merges r1915889 from https://svn.apache.org/repos/asf/httpd/httpd/trunk. Submitted by: ylavic Reviewed by: ylavic, jorton, jfclere git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915949 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 6 ------ modules/ssl/ssl_private.h | 4 +--- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/STATUS b/STATUS index 97d73858d96..69dfe04867b 100644 --- a/STATUS +++ b/STATUS @@ -171,12 +171,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: Github PR: https://github.com/apache/httpd/pull/412 +1: jorton, ylavic, jfclere - *) mod_ssl: fix build with !MODSSL_HAVE_ENGINE_API (follow up to r1913912 in 2.4.59) - trunk patch: https://svn.apache.org/r1915889 - 2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/413.patch - Github PR: https://github.com/apache/httpd/pull/413 - +1: ylavic, jorton, jfclere - PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h index 63cb7197ad4..859e932507f 100644 --- a/modules/ssl/ssl_private.h +++ b/modules/ssl/ssl_private.h @@ -652,9 +652,7 @@ typedef struct { * index), for example the string "vhost.example.com:443:0". */ apr_hash_t *tPrivateKey; -#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; -- 2.47.2