You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by kb...@apache.org on 2011/09/26 17:24:24 UTC
svn commit: r1175905 - /httpd/httpd/trunk/modules/ssl/ssl_engine_init.c
Author: kbrand
Date: Mon Sep 26 15:24:23 2011
New Revision: 1175905
URL: http://svn.apache.org/viewvc?rev=1175905&view=rev
Log:
replace another occurence of X509_NAME_oneline by SSL_X509_NAME_to_string
Modified:
httpd/httpd/trunk/modules/ssl/ssl_engine_init.c
Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_init.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_init.c?rev=1175905&r1=1175904&r2=1175905&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_init.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_init.c Mon Sep 26 15:24:23 2011
@@ -1385,7 +1385,8 @@ static int ssl_init_FindCAList_X509NameC
}
static void ssl_init_PushCAList(STACK_OF(X509_NAME) *ca_list,
- server_rec *s, const char *file)
+ server_rec *s, apr_pool_t *ptemp,
+ const char *file)
{
int n;
STACK_OF(X509_NAME) *sk;
@@ -1398,12 +1399,11 @@ static void ssl_init_PushCAList(STACK_OF
}
for (n = 0; n < sk_X509_NAME_num(sk); n++) {
- char name_buf[256];
X509_NAME *name = sk_X509_NAME_value(sk, n);
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
"CA certificate: %s",
- X509_NAME_oneline(name, name_buf, sizeof(name_buf)));
+ SSL_X509_NAME_to_string(ptemp, name, 0));
/*
* note that SSL_load_client_CA_file() checks for duplicates,
@@ -1441,7 +1441,7 @@ STACK_OF(X509_NAME) *ssl_init_FindCAList
* Process CA certificate bundle file
*/
if (ca_file) {
- ssl_init_PushCAList(ca_list, s, ca_file);
+ ssl_init_PushCAList(ca_list, s, ptemp, ca_file);
/*
* If ca_list is still empty after trying to load ca_file
* then the file failed to load, and users should hear about that.
@@ -1475,7 +1475,7 @@ STACK_OF(X509_NAME) *ssl_init_FindCAList
continue; /* don't try to load directories */
}
file = apr_pstrcat(ptemp, ca_path, "/", direntry.name, NULL);
- ssl_init_PushCAList(ca_list, s, file);
+ ssl_init_PushCAList(ca_list, s, ptemp, file);
}
apr_dir_close(dir);