www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00
Code Activity

mod_ssl namespacing: SSL_X509_INFO_load_file -> modssl_X509_INFO_load_file

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677159 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Sperling
2015-05-01 14:49:45 +00:00
parent a5d078e9b8
commit 8fd38131f9
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ssl/ssl_engine_init.c
View File

@@ -1243,7 +1243,7 @@ static apr_status_t ssl_init_proxy_certs(server_rec *s,
sk = sk_X509_INFO_new_null(); sk = sk_X509_INFO_new_null();
if (pkp->cert_file) { 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) { if (pkp->cert_path) {

8
modules/ssl/ssl_util_ssl.c
View File

@@ -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, BOOL modssl_X509_INFO_load_file(apr_pool_t *ptemp,
STACK_OF(X509_INFO) *sk, STACK_OF(X509_INFO) *sk,
const char *filename) const char *filename)
{ {
BIO *in; BIO *in;
@@ -468,7 +468,7 @@ BOOL SSL_X509_INFO_load_path(apr_pool_t *ptemp,
pathname, "/", dirent.name, pathname, "/", dirent.name,
NULL); NULL);
if (SSL_X509_INFO_load_file(ptemp, sk, fullname)) { if (modssl_X509_INFO_load_file(ptemp, sk, fullname)) {
ok = TRUE; ok = TRUE;
} }
} }

2
modules/ssl/ssl_util_ssl.h
View File

@@ -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); 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_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 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 *); 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 *); int SSL_CTX_use_certificate_chain(SSL_CTX *, char *, int, pem_password_cb *);
char *SSL_SESSION_id2sz(unsigned char *, int, char *, int); char *SSL_SESSION_id2sz(unsigned char *, int, char *, int);