mirror of
https://github.com/apache/httpd.git
synced 2025-08-08 15:02:10 +03:00
* modules/ssl/ssl_engine_pphrase.c (modssl_load_engine_keypair): Fix
build (hopefully) for OpenSSL 3.x with OPENSSL_NO_ENGINE defined. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1914622 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -982,7 +982,12 @@ apr_status_t modssl_load_engine_keypair(server_rec *s, apr_pool_t *p,
|
|||||||
#if MODSSL_HAVE_OPENSSL_STORE
|
#if MODSSL_HAVE_OPENSSL_STORE
|
||||||
SSLModConfigRec *mc = myModConfig(s);
|
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)
|
||||||
|
#endif
|
||||||
return modssl_load_keypair_store(s, p, vhostid, certid, keyid,
|
return modssl_load_keypair_store(s, p, vhostid, certid, keyid,
|
||||||
pubkey, privkey);
|
pubkey, privkey);
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user