[SCM] GNU gnutls branch, master, updated. gnutls_2_9_10-37-gc57f051

[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=c57f051d829a7e2c02e1ba2e82ed6af586589170

The branch, master has been updated
       via  c57f051d829a7e2c02e1ba2e82ed6af586589170 (commit)
      from  857ee3192c075020b5c65587ba49bc28f0ab0ed1 (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 c57f051d829a7e2c02e1ba2e82ed6af586589170
Author: Simon Josefsson <address@hidden>
Date:   Sat May 22 22:07:56 2010 +0200

    Doc fixes.

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

Summary of changes:
 lib/gnutls_errors.c                |    2 +-
 libextra/includes/gnutls/openssl.h |   10 +++++-----
 libextra/openssl_compat.c          |    3 ---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/lib/gnutls_errors.c b/lib/gnutls_errors.c
index 8bdb8ff..8b0afd3 100644
--- a/lib/gnutls_errors.c
+++ b/lib/gnutls_errors.c
@@ -326,7 +326,7 @@ gnutls_error_is_fatal (int error)
 void
 gnutls_perror (int error)
 {
-  fprintf (stderr, "GNUTLS ERROR: %s\n", gnutls_strerror (error));
+  fprintf (stderr, "GnuTLS error: %s\n", gnutls_strerror (error));
 }
 
 
diff --git a/libextra/includes/gnutls/openssl.h 
b/libextra/includes/gnutls/openssl.h
index 98548c6..be326f0 100644
--- a/libextra/includes/gnutls/openssl.h
+++ b/libextra/includes/gnutls/openssl.h
@@ -24,12 +24,12 @@
 
 /* WARNING: Error functions aren't currently thread-safe */
 
-/* This file contains prototypes about the OPENSSL compatibility
- * layer in GNUTLS. GNUTLS is not a replacement of OPENSSL so
- * this compatibility layer only support limited OPENSSL functionality.
+/* This file contains prototypes about the OpenSSL compatibility layer
+ * in GnuTLS.  GnuTLS is not a complete replacement of OPENSSL so this
+ * compatibility layer only support limited OpenSSL functionality.
  *
- * New programs should avoid using this compatibility layer, and
- * use the native GNUTLS API.
+ * New programs should avoid using this compatibility layer, and use
+ * the native GnuTLS API directly.
  */
 
 #ifndef GNUTLS_OPENSSL_H
diff --git a/libextra/openssl_compat.c b/libextra/openssl_compat.c
index 10bf458..5c5ae02 100644
--- a/libextra/openssl_compat.c
+++ b/libextra/openssl_compat.c
@@ -249,9 +249,6 @@ gnutls_x509_extract_certificate_issuer_dn (const 
gnutls_datum_t * cert,
  * This function will return the alternative names, contained in the
  * given certificate.
  *
- * This is specified in X509v3 Certificate Extensions.
- * GNUTLS will return the Alternative name, or a negative
- * error code.
  * Returns GNUTLS_E_SHORT_MEMORY_BUFFER if ret_size is not enough to hold the 
alternative
  * name, or the type of alternative name if everything was ok. The type is
  * one of the enumerated GNUTLS_X509_SUBJECT_ALT_NAME.


hooks/post-receive
-- 
GNU gnutls