diff options
| author | Stefan Eissing <icing@apache.org> | 2017-08-08 13:33:45 +0000 |
|---|---|---|
| committer | Stefan Eissing <icing@apache.org> | 2017-08-08 13:33:45 +0000 |
| commit | 266f140fa876890e51b7e0aba37cd66b4173e178 (patch) | |
| tree | 734abcd62fcd356b911bb6c8cdeed3ffa4152d65 | |
| parent | ceeed43c79bae4316297e3ac3a56a533c799487a (diff) | |
| download | httpd-266f140fa876890e51b7e0aba37cd66b4173e178.tar.gz | |
mod_ssl uses now mod_md header file for optional function declaration
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-md@1804422 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | modules/ssl/ssl_engine_init.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c index a8e0dcec6b..736a6c792f 100644 --- a/modules/ssl/ssl_engine_init.c +++ b/modules/ssl/ssl_engine_init.c @@ -30,6 +30,7 @@ #include "mod_ssl.h" #include "mod_ssl_openssl.h" #include "mpm_common.h" +#include "mod_md.h" static apr_status_t ssl_init_ca_cert_path(server_rec *, apr_pool_t *, const char *, STACK_OF(X509_NAME) *, STACK_OF(X509_INFO) *); @@ -168,20 +169,8 @@ static void ssl_add_version_components(apr_pool_t *p, } /**************************************************************************************************/ -/* Managed Domains Interface (temporary here) */ - -APR_DECLARE_OPTIONAL_FN(int, - md_is_managed, (struct server_rec *)); - -APR_DECLARE_OPTIONAL_FN(apr_status_t, - md_get_credentials, (struct server_rec *, apr_pool_t *, - const char **pkeyfile, - const char **pcertfile, - const char **pchainfile)); -APR_DECLARE_OPTIONAL_FN(int, - md_is_challenge, (struct conn_rec *, const char *, - X509 **, EVP_PKEY **)); - +/* Managed Domains Interface */ + static APR_OPTIONAL_FN_TYPE(md_is_managed) *md_is_managed; static APR_OPTIONAL_FN_TYPE(md_get_credentials) *md_get_credentials; static APR_OPTIONAL_FN_TYPE(md_is_challenge) *md_is_challenge; |