summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES9
-rw-r--r--ssl/ssl_cert.c2
2 files changed, 6 insertions, 5 deletions
diff --git a/CHANGES b/CHANGES
index cd7a84a1eb..c0962e8eca 100644
--- a/CHANGES
+++ b/CHANGES
@@ -189,10 +189,11 @@
unsigned to signed types: this was killing the Win32 compile.
[Steve Henson]
- *) Add new certificate file to stack functions, SSL_add_cert_file_to_stack()
- and SSL_add_cert_dir_to_stack(). These largely supplant
- SSL_load_client_CA_file(), and can be used to add multiple certs easily to
- a stack (usually this is then handed to SSL_CTX_set_client_CA_list()).
+ *) Add new certificate file to stack functions,
+ SSL_add_dir_cert_subjects_to_stack() and
+ SSL_add_file_cert_subjects_to_stack(). These largely supplant
+ SSL_load_client_CA_file(), and can be used to add multiple certs easily
+ to a stack (usually this is then handed to SSL_CTX_set_client_CA_list()).
This means that Apache-SSL and similar packages don't have to mess around
to add as many CAs as they want to the preferred list.
[Ben Laurie]
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index cc3df56830..f50de34a06 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -425,7 +425,7 @@ err:
* \param stack the stack to append to.
* \param dir the directory to append from. All files in this directory will be
* examined as potential certs. Any that are acceptable to
- * SSL_add_cert_file_to_stack() that are not already in the stack will be
+ * SSL_add_dir_cert_subjects_to_stack() that are not already in the stack will be
* included.
* \return 1 for success, 0 for failure. Note that in the case of failure some
* certs may have been added to \c stack.