From 8fd38131f9ad2e294b676cd09587807e7733e71c Mon Sep 17 00:00:00 2001 From: Stefan Sperling Date: Fri, 1 May 2015 14:49:45 +0000 Subject: [PATCH] mod_ssl namespacing: SSL_X509_INFO_load_file -> modssl_X509_INFO_load_file git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677159 13f79535-47bb-0310-9956-ffa450edef68 --- modules/ssl/ssl_engine_init.c | 2 +- modules/ssl/ssl_util_ssl.c | 8 ++++---- modules/ssl/ssl_util_ssl.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c index 6d07e5edf4..e7b45c2b58 100644 --- a/modules/ssl/ssl_engine_init.c +++ b/modules/ssl/ssl_engine_init.c @@ -1243,7 +1243,7 @@ static apr_status_t ssl_init_proxy_certs(server_rec *s, sk = sk_X509_INFO_new_null(); if (pkp->cert_file) { - SSL_X509_INFO_load_file(ptemp, sk, pkp->cert_file); + modssl_X509_INFO_load_file(ptemp, sk, pkp->cert_file); } if (pkp->cert_path) { diff --git a/modules/ssl/ssl_util_ssl.c b/modules/ssl/ssl_util_ssl.c index 40e343da7c..d265762791 100644 --- a/modules/ssl/ssl_util_ssl.c +++ b/modules/ssl/ssl_util_ssl.c @@ -417,9 +417,9 @@ BOOL modssl_X509_match_name(apr_pool_t *p, X509 *x509, const char *name, ** _________________________________________________________________ */ -BOOL SSL_X509_INFO_load_file(apr_pool_t *ptemp, - STACK_OF(X509_INFO) *sk, - const char *filename) +BOOL modssl_X509_INFO_load_file(apr_pool_t *ptemp, + STACK_OF(X509_INFO) *sk, + const char *filename) { BIO *in; @@ -468,7 +468,7 @@ BOOL SSL_X509_INFO_load_path(apr_pool_t *ptemp, pathname, "/", dirent.name, NULL); - if (SSL_X509_INFO_load_file(ptemp, sk, fullname)) { + if (modssl_X509_INFO_load_file(ptemp, sk, fullname)) { ok = TRUE; } } diff --git a/modules/ssl/ssl_util_ssl.h b/modules/ssl/ssl_util_ssl.h index a4130b125d..fba516a75a 100644 --- a/modules/ssl/ssl_util_ssl.h +++ b/modules/ssl/ssl_util_ssl.h @@ -67,7 +67,7 @@ char *modssl_X509_NAME_ENTRY_to_string(apr_pool_t *p, X509_NAME_ENTRY *xsn char *modssl_X509_NAME_to_string(apr_pool_t *, X509_NAME *, int); BOOL modssl_X509_getSAN(apr_pool_t *, X509 *, int, int, apr_array_header_t **); BOOL modssl_X509_match_name(apr_pool_t *, X509 *, const char *, BOOL, server_rec *); -BOOL SSL_X509_INFO_load_file(apr_pool_t *, STACK_OF(X509_INFO) *, const char *); +BOOL modssl_X509_INFO_load_file(apr_pool_t *, STACK_OF(X509_INFO) *, const char *); BOOL SSL_X509_INFO_load_path(apr_pool_t *, STACK_OF(X509_INFO) *, const char *); int SSL_CTX_use_certificate_chain(SSL_CTX *, char *, int, pem_password_cb *); char *SSL_SESSION_id2sz(unsigned char *, int, char *, int); -- 2.40.0