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: Move modssl_X509_INFO_load_file() into ssl_engine_init.c

Browse Source 
and make it a static function called load_x509_info().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677832 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Sperling
2015-05-05 14:20:19 +00:00
parent 2548969450
commit aa6037fa61
3 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
modules/ssl/ssl_engine_init.c
View File

@@ -1221,6 +1221,30 @@ static apr_status_t ssl_init_ticket_key(server_rec *s,
} }
#endif #endif
static BOOL load_x509_info(apr_pool_t *ptemp,
STACK_OF(X509_INFO) *sk,
const char *filename)
{
BIO *in;
if (!(in = BIO_new(BIO_s_file()))) {
return FALSE;
}
if (BIO_read_filename(in, filename) <= 0) {
BIO_free(in);
return FALSE;
}
ERR_clear_error();
PEM_X509_INFO_read_bio(in, sk, NULL, NULL);
BIO_free(in);
return TRUE;
}
static apr_status_t ssl_init_proxy_certs(server_rec *s, static apr_status_t ssl_init_proxy_certs(server_rec *s,
apr_pool_t *p, apr_pool_t *p,
apr_pool_t *ptemp, apr_pool_t *ptemp,
@@ -1243,7 +1267,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) {
modssl_X509_INFO_load_file(ptemp, sk, pkp->cert_file); load_x509_info(ptemp, sk, pkp->cert_file);
} }
if (pkp->cert_path) { if (pkp->cert_path) {
@@ -1262,7 +1286,7 @@ static apr_status_t ssl_init_proxy_certs(server_rec *s,
fullname = apr_pstrcat(ptemp, fullname = apr_pstrcat(ptemp,
pkp->cert_path, "/", dirent.name, pkp->cert_path, "/", dirent.name,
NULL); NULL);
modssl_X509_INFO_load_file(ptemp, sk, fullname); load_x509_info(ptemp, sk, fullname);
} }
apr_dir_close(dir); apr_dir_close(dir);

30
modules/ssl/ssl_util_ssl.c
View File

@@ -411,36 +411,6 @@ BOOL modssl_X509_match_name(apr_pool_t *p, X509 *x509, const char *name,
return matched; return matched;
} }
/* _________________________________________________________________
**
** Low-Level CA Certificate Loading
** _________________________________________________________________
*/
BOOL modssl_X509_INFO_load_file(apr_pool_t *ptemp,
STACK_OF(X509_INFO) *sk,
const char *filename)
{
BIO *in;
if (!(in = BIO_new(BIO_s_file()))) {
return FALSE;
}
if (BIO_read_filename(in, filename) <= 0) {
BIO_free(in);
return FALSE;
}
ERR_clear_error();
PEM_X509_INFO_read_bio(in, sk, NULL, NULL);
BIO_free(in);
return TRUE;
}
/* _________________________________________________________________ /* _________________________________________________________________
** **
** Custom (EC)DH parameter support ** Custom (EC)DH parameter support

1
modules/ssl/ssl_util_ssl.h
View File

@@ -67,7 +67,6 @@ 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 modssl_X509_INFO_load_file(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);