[SCM] GNU gnutls branch, master, updated. gnutls_3_1_4-13-gbbe9722

[Nikos Mavrogiannopoulos]

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=bbe972239e4d06871f983f6a7303717b29dae5f2

The branch, master has been updated
       via  bbe972239e4d06871f983f6a7303717b29dae5f2 (commit)
       via  8b0e0bf9ddbd45c937d27d43435c934c3ba41403 (commit)
      from  076b53bbbedb8c6bd792ac9a80411242cad27f67 (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 bbe972239e4d06871f983f6a7303717b29dae5f2
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Nov 14 18:13:31 2012 +0100

    corrected description.

commit 8b0e0bf9ddbd45c937d27d43435c934c3ba41403
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Nov 14 18:11:41 2012 +0100

    corrected typo

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

Summary of changes:
 lib/gnutls_cert.c |    5 +++--
 lib/gnutls_x509.c |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/gnutls_cert.c b/lib/gnutls_cert.c
index a51b2ca..2510f00 100644
--- a/lib/gnutls_cert.c
+++ b/lib/gnutls_cert.c
@@ -645,7 +645,7 @@ _gnutls_openpgp_crt_verify_peers (gnutls_session_t session,
  * its status (trusted, invalid etc.).  The value of @status will
  * be one or more of the gnutls_certificate_status_t flags
  * bitwise or'd or zero if the certificate is trusted. Note that verification 
- * does not imply a negative return value. Only the @status is updated.
+ * failure does not imply a negative return value. Only the @status is updated.
  *
  * If available the OCSP Certificate Status extension will be
  * utilized by this function.
@@ -655,7 +655,8 @@ _gnutls_openpgp_crt_verify_peers (gnutls_session_t session,
  * size are set. To override them use gnutls_certificate_set_verify_limits().
  *
  * Note that you must also check the peer's name in order to check if
- * the verified certificate belongs to the actual peer, see 
gnutls_x509_crt_check_hostname().
+ * the verified certificate belongs to the actual peer, see 
gnutls_x509_crt_check_hostname(),
+ * or use gnutls_certificate_verify_peers3().
  *
  * Returns: a negative error code on error and %GNUTLS_E_SUCCESS (0) on 
success.
  **/
diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c
index b650ce7..1ae5bdd 100644
--- a/lib/gnutls_x509.c
+++ b/lib/gnutls_x509.c
@@ -1846,7 +1846,7 @@ gnutls_certificate_set_x509_crl_mem 
(gnutls_certificate_credentials_t res,
  * gnutls_certificate_verify_peers2().  This function may be called
  * multiple times.
  *
- * Returns: %GNUTLS_E_SUCCESS (0) on success, or a negative error code.
+ * Returns: number of CRLs processed, or a negative error code on error.
  *
  * Since: 2.4.0
  **/


hooks/post-receive
-- 
GNU gnutls