From c42d2544ed46c701d6c5bd0272b9e76c302f71c7 Mon Sep 17 00:00:00 2001 From: Doug MacEachern Date: Thu, 28 Feb 2002 05:22:56 +0000 Subject: [PATCH] move SSL_load_client_CA_file() comment to where we moved the call to it git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@93635 13f79535-47bb-0310-9956-ffa450edef68 --- ssl_engine_init.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ssl_engine_init.c b/ssl_engine_init.c index 3e0dbaaf43e..89f62be2674 100644 --- a/ssl_engine_init.c +++ b/ssl_engine_init.c @@ -863,6 +863,12 @@ static void ssl_init_PushCAList(STACK_OF(X509_NAME) *skCAList, "CA certificate: %s", X509_NAME_oneline(name, name_buf, sizeof(name_buf))); + /* + * note that SSL_load_client_CA_file() checks for duplicates, + * but since we call it multiple times when reading a directory + * we must also check for duplicates ourselves. + */ + if (sk_X509_NAME_find(skCAList, name) < 0) { /* this will be freed when skCAList is */ sk_X509_NAME_push(skCAList, name); @@ -894,12 +900,6 @@ STACK_OF(X509_NAME) *ssl_init_FindCAList(server_rec *s, apr_pool_t *pp, const ch */ skCAList = sk_X509_NAME_new(ssl_init_FindCAList_X509NameCmp); - /* - * note that SSL_load_client_CA_file() checks for duplicates, - * but since we call it multiple times when reading a directory - * we must also check for duplicates ourselves. - */ - /* * Process CA certificate bundle file */ -- 2.47.2