[SCM] GNU gnutls branch, master, updated. gnutls_2_9_9-14-g2ae95bf

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=2ae95bfe200b6a39bd3908bf5b74f84c643bd5e3

The branch, master has been updated
       via  2ae95bfe200b6a39bd3908bf5b74f84c643bd5e3 (commit)
      from  e41855f26a3ab2e8136c87e819002beca07afc53 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2ae95bfe200b6a39bd3908bf5b74f84c643bd5e3
Author: Simon Josefsson <address@hidden>
Date:   Mon Nov 30 19:02:26 2009 +0100

    Doc fix.

-----------------------------------------------------------------------

Summary of changes:
 lib/gnutls_x509.c |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c
index 810a569..482c7f6 100644
--- a/lib/gnutls_x509.c
+++ b/lib/gnutls_x509.c
@@ -730,7 +730,9 @@ gnutls_certificate_set_x509_key_mem 
(gnutls_certificate_credentials_t res,
   * This function sets a certificate/private key pair in the
   * gnutls_certificate_credentials_t structure.  This function may be
   * called more than once (in case multiple keys/certificates exist
-  * for the server).
+  * for the server).  For clients that wants to send more than its own
+  * end entity certificate (e.g., also an intermediate CA cert) then
+  * put the certificate chain in @cert_list.
   *
   * Returns: %GNUTLS_E_SUCCESS on success, or an error code.
   *
@@ -744,7 +746,7 @@ gnutls_certificate_set_x509_key 
(gnutls_certificate_credentials_t res,
 {
   int ret, i;
 
-  /* this should be first 
+  /* this should be first
    */
 
   res->pkey =
@@ -817,8 +819,10 @@ gnutls_certificate_set_x509_key 
(gnutls_certificate_credentials_t res,
  *
  * This function sets a certificate/private key pair in the
  * gnutls_certificate_credentials_t structure.  This function may be
- * called more than once (in case multiple keys/certificates exist
- * for the server).
+ * called more than once (in case multiple keys/certificates exist for
+ * the server).  For clients that wants to send more than its own end
+ * entity certificate (e.g., also an intermediate CA cert) then put
+ * the certificate chain in @certfile.
  *
  * Currently only PKCS-1 encoded RSA and DSA private keys are accepted by
  * this function.
@@ -833,7 +837,7 @@ gnutls_certificate_set_x509_key_file 
(gnutls_certificate_credentials_t res,
 {
   int ret;
 
-  /* this should be first 
+  /* this should be first
    */
   if ((ret = read_key_file (res, keyfile, type)) < 0)
     return ret;


hooks/post-receive
-- 
GNU gnutls