diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 10:03:19 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 10:03:19 +0000 |
| commit | ac45e40b4d3cdc2497d5b6f5efe7d8a927beca21 (patch) | |
| tree | 96057c4c489cab1e8c112d689befe2b2b9fa34e7 /modules/ssl/ssl_engine_pphrase.c | |
| parent | Releasing progress-linux version 2.4.57-2~progress6.99u1. (diff) | |
| download | apache2-ac45e40b4d3cdc2497d5b6f5efe7d8a927beca21.tar.xz apache2-ac45e40b4d3cdc2497d5b6f5efe7d8a927beca21.zip | |
Merging upstream version 2.4.59.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | modules/ssl/ssl_engine_pphrase.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/modules/ssl/ssl_engine_pphrase.c b/modules/ssl/ssl_engine_pphrase.c index d1859f7..699019f 100644 --- a/modules/ssl/ssl_engine_pphrase.c +++ b/modules/ssl/ssl_engine_pphrase.c @@ -30,6 +30,8 @@ -- Clifford Stoll */ #include "ssl_private.h" +#include <openssl/ui.h> + typedef struct { server_rec *s; apr_pool_t *p; @@ -606,8 +608,7 @@ int ssl_pphrase_Handle_CB(char *buf, int bufsize, int verify, void *srv) return (len); } - -#if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_ENGINE_INIT) +#if MODSSL_HAVE_ENGINE_API /* OpenSSL UI implementation for passphrase entry; largely duplicated * from ssl_pphrase_Handle_CB but adjusted for UI API. TODO: Might be @@ -831,7 +832,7 @@ 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 defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_ENGINE_INIT) +#if MODSSL_HAVE_ENGINE_API const char *c, *scheme; ENGINE *e; UI_METHOD *ui_method = get_passphrase_ui(p); |