VladPolskiy/apache_httpd
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-01 16:07:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

* modules/ssl/ssl_engine_pphrase.c (modssl_load_engine_keypair):

Browse Source 
Update to avoid GCC warning for no-engine builds where the
  SSLModConfigRec is not used. Also log an error for the ENOTIMPL
  path.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1916057 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joe Orton
2024-02-29 15:28:36 +00:00
parent 0e7a32bcd4
commit fcaf73d28c
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/log-message-tags/next-number
View File

@ -1 +1 @@
10496
10497

19
modules/ssl/ssl_engine_pphrase.c
View File

@ -979,22 +979,23 @@ 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 MODSSL_HAVE_OPENSSL_STORE
#if MODSSL_HAVE_ENGINE_API
SSLModConfigRec *mc = myModConfig(s);
/* For OpenSSL 3.x, use the STORE-based API if either ENGINE
* support was not present compile-time, or if it's built but
* SSLCryptoDevice is not configured. */
#if MODSSL_HAVE_ENGINE_API
if (!mc->szCryptoDevice)
if (mc->szCryptoDevice)
return modssl_load_keypair_engine(s, p, vhostid, certid, keyid,
pubkey, privkey);
#endif
return modssl_load_keypair_store(s, p, vhostid, certid, keyid,
pubkey, privkey);
#endif
#if MODSSL_HAVE_ENGINE_API
return modssl_load_keypair_engine(s, p, vhostid, certid, keyid,
pubkey, privkey);
#if MODSSL_HAVE_OPENSSL_STORE
return modssl_load_keypair_store(s, p, vhostid, certid, keyid,
pubkey, privkey);
#else
ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(10496)
"Init: no method for loading keypair for %s (%s | %s)",
vhostid, certid ? certid : "no cert", keyid);
return APR_ENOTIMPL;
#endif
}