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

various SSLCACertificatePath fixes:

Browse Source 
- return value from apr_dir_read() was checking != APR_SUCCESS rather
  than == APR_SUCCESS, so no certs were ever loaded.

- wasn't checking return value of apr_dir_open(), now log an error and
  ssl_die() on failure.

- don't bother trying to load directories


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93634 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Doug MacEachern
2002-02-28 05:17:03 +00:00
parent 2ed45ef1b1
commit 496a09a809
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
modules/ssl/ssl_engine_init.c
View File

@@ -913,10 +913,21 @@ STACK_OF(X509_NAME) *ssl_init_FindCAList(server_rec *s, apr_pool_t *pp, const ch
if (cpCApath != NULL) { if (cpCApath != NULL) {
apr_dir_t *dir; apr_dir_t *dir;
apr_finfo_t direntry; apr_finfo_t direntry;
apr_int32_t finfo_flags = APR_FINFO_MIN|APR_FINFO_NAME;
apr_dir_open(&dir, cpCApath, p); if (apr_dir_open(&dir, cpCApath, p) != APR_SUCCESS) {
while ((apr_dir_read(&direntry, APR_FINFO_DIRENT, dir)) != APR_SUCCESS) { ssl_log(s, SSL_LOG_ERROR|SSL_ADD_ERRNO,
const char *cp = apr_pstrcat(p, cpCApath, "/", direntry.name, NULL); "Init: Failed to open SSLCACertificatePath `%s'",
cpCApath);
ssl_die();
}
while ((apr_dir_read(&direntry, finfo_flags, dir)) == APR_SUCCESS) {
const char *cp;
if (direntry.filetype == APR_DIR) {
continue; /* don't try to load directories */
}
cp = apr_pstrcat(p, cpCApath, "/", direntry.name, NULL);
ssl_init_PushCAList(skCAList, s, cp); ssl_init_PushCAList(skCAList, s, cp);
} }
apr_dir_close(dir); apr_dir_close(dir);