84 lines
2.9 KiB
Diff
84 lines
2.9 KiB
Diff
|
|
https://issues.redhat.com/browse/RHEL-36755
|
|
|
|
--- httpd-2.4.59/modules/ssl/ssl_engine_init.c.pkcs11
|
|
+++ httpd-2.4.59/modules/ssl/ssl_engine_init.c
|
|
@@ -1439,7 +1439,7 @@
|
|
if (modssl_is_engine_id(keyfile)) {
|
|
apr_status_t rv;
|
|
|
|
- if ((rv = modssl_load_engine_keypair(s, ptemp, vhost_id,
|
|
+ if ((rv = modssl_load_engine_keypair(s, p, ptemp, vhost_id,
|
|
engine_certfile, keyfile,
|
|
&cert, &pkey))) {
|
|
return rv;
|
|
--- httpd-2.4.59/modules/ssl/ssl_engine_pphrase.c.pkcs11
|
|
+++ httpd-2.4.59/modules/ssl/ssl_engine_pphrase.c
|
|
@@ -826,8 +826,19 @@
|
|
}
|
|
#endif
|
|
|
|
+#if MODSSL_HAVE_ENGINE_API
|
|
+static apr_status_t modssl_engine_cleanup(void *engine)
|
|
+{
|
|
+ ENGINE *e = engine;
|
|
+
|
|
+ ENGINE_finish(e);
|
|
+
|
|
+ return APR_SUCCESS;
|
|
+}
|
|
+#endif
|
|
|
|
-apr_status_t modssl_load_engine_keypair(server_rec *s, apr_pool_t *p,
|
|
+apr_status_t modssl_load_engine_keypair(server_rec *s,
|
|
+ apr_pool_t *pconf, apr_pool_t *ptemp,
|
|
const char *vhostid,
|
|
const char *certid, const char *keyid,
|
|
X509 **pubkey, EVP_PKEY **privkey)
|
|
@@ -835,12 +846,12 @@
|
|
#if MODSSL_HAVE_ENGINE_API
|
|
const char *c, *scheme;
|
|
ENGINE *e;
|
|
- UI_METHOD *ui_method = get_passphrase_ui(p);
|
|
+ UI_METHOD *ui_method = get_passphrase_ui(ptemp);
|
|
pphrase_cb_arg_t ppcb;
|
|
|
|
memset(&ppcb, 0, sizeof ppcb);
|
|
ppcb.s = s;
|
|
- ppcb.p = p;
|
|
+ ppcb.p = ptemp;
|
|
ppcb.bPassPhraseDialogOnce = TRUE;
|
|
ppcb.key_id = vhostid;
|
|
ppcb.pkey_file = keyid;
|
|
@@ -853,7 +864,7 @@
|
|
return ssl_die(s);
|
|
}
|
|
|
|
- scheme = apr_pstrmemdup(p, keyid, c - keyid);
|
|
+ scheme = apr_pstrmemdup(ptemp, keyid, c - keyid);
|
|
if (!(e = ENGINE_by_id(scheme))) {
|
|
ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(10132)
|
|
"Init: Failed to load engine for private key %s",
|
|
@@ -902,7 +913,8 @@
|
|
return ssl_die(s);
|
|
}
|
|
|
|
- ENGINE_finish(e);
|
|
+ apr_pool_cleanup_register(pconf, e, modssl_engine_cleanup, modssl_engine_cleanup);
|
|
+
|
|
ENGINE_free(e);
|
|
|
|
return APR_SUCCESS;
|
|
--- httpd-2.4.59/modules/ssl/ssl_private.h.pkcs11
|
|
+++ httpd-2.4.59/modules/ssl/ssl_private.h
|
|
@@ -1076,7 +1076,8 @@
|
|
/* Load public and/or private key from the configured ENGINE. Private
|
|
* key returned as *pkey. certid can be NULL, in which case *pubkey
|
|
* is not altered. Errors logged on failure. */
|
|
-apr_status_t modssl_load_engine_keypair(server_rec *s, apr_pool_t *p,
|
|
+apr_status_t modssl_load_engine_keypair(server_rec *s,
|
|
+ apr_pool_t *pconf, apr_pool_t *ptemp,
|
|
const char *vhostid,
|
|
const char *certid, const char *keyid,
|
|
X509 **pubkey, EVP_PKEY **privkey);
|