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

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;
}
/* _________________________________________________________________
**
** 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