[SCM] GNU gnutls branch, master, updated. gnutls-3_0_12-71-gabaa812

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

The branch, master has been updated
       via  abaa81222b37dc1e692ba161389c6f8151dd03e1 (commit)
       via  762f4e5fbab2334144621ba3d2dd4a07a8fa0f77 (commit)
      from  172edf8fe210e6c6554b95d6f0de3c849019d1a4 (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 abaa81222b37dc1e692ba161389c6f8151dd03e1
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Jan 24 21:43:51 2012 +0100

    generate libopts makefile outside the conditional.

commit 762f4e5fbab2334144621ba3d2dd4a07a8fa0f77
Author: Patrick Pelletier <address@hidden>
Date:   Tue Jan 24 10:12:49 2012 -0800

    Fix up some typos and obsolete comments
    
    Signed-off-by: Nikos Mavrogiannopoulos <address@hidden>

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

Summary of changes:
 doc/cha-internals.texi             |    2 +-
 extra/includes/gnutls/openssl.h    |    4 ++--
 lib/accelerated/x86/hmac-padlock.c |    3 ++-
 lib/crypto-backend.h               |    4 ++--
 lib/gnutls_int.h                   |    6 +++---
 lib/includes/gnutls/gnutls.h.in    |   14 ++++++++------
 lib/nettle/cipher.c                |    2 +-
 lib/nettle/init.c                  |    2 +-
 lib/nettle/mac.c                   |    2 +-
 src/libopts/m4/libopts.m4          |    3 ++-
 10 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/doc/cha-internals.texi b/doc/cha-internals.texi
index 8eebd97..bb8b420 100644
--- a/doc/cha-internals.texi
+++ b/doc/cha-internals.texi
@@ -399,7 +399,7 @@ and leave the rest of subsystem intact.
 @subsubheading Overriding the cryptographic library
 In some systems, that might contain a broad acceleration engine, it 
 might be desirable to override big parts of the cryptographic backend, 
-or even all of them. T following functions are provided for this reason.
+or even all of them. The following functions are provided for this reason.
 
 @itemize
 
diff --git a/extra/includes/gnutls/openssl.h b/extra/includes/gnutls/openssl.h
index ac6e2b1..fd59d33 100644
--- a/extra/includes/gnutls/openssl.h
+++ b/extra/includes/gnutls/openssl.h
@@ -25,7 +25,7 @@
 
 /* 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.
+ * compatibility layer only supports limited OpenSSL functionality.
  *
  * New programs should avoid using this compatibility layer, and use
  * the native GnuTLS API directly.
@@ -41,7 +41,7 @@ extern "C"
 
 #include <gnutls/gnutls.h>
 
-/* Extra definitions that do not longer exist in gnutls.
+/* Extra definitions that no longer exist in gnutls.
  */
 #define GNUTLS_X509_CN_SIZE 256
 #define GNUTLS_X509_C_SIZE 3
diff --git a/lib/accelerated/x86/hmac-padlock.c 
b/lib/accelerated/x86/hmac-padlock.c
index e74fa2c..ec68771 100644
--- a/lib/accelerated/x86/hmac-padlock.c
+++ b/lib/accelerated/x86/hmac-padlock.c
@@ -20,7 +20,8 @@
  *
  */
 
-/* This file provides is the backend hash/mac API for libgcrypt.
+/* This file provides the backend hash/mac implementation for
+ * VIA Padlock hardware acceleration.
  */
 
 #include <gnutls_int.h>
diff --git a/lib/crypto-backend.h b/lib/crypto-backend.h
index 2af78aa..a05359d 100644
--- a/lib/crypto-backend.h
+++ b/lib/crypto-backend.h
@@ -161,8 +161,8 @@
     int (*bigint_prime_check) (const bigint_t pp);
     int (*bigint_generate_group) (gnutls_group_st * gg, unsigned int bits);
 
-    /* reads an bigint from a buffer */
-    /* stores an bigint into the buffer.  returns
+    /* reads a bigint from a buffer */
+    /* stores a bigint into the buffer.  returns
      * GNUTLS_E_SHORT_MEMORY_BUFFER if buf_size is not sufficient to
      * store this integer, and updates the buf_size;
      */
diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index f68a013..edbad05 100644
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -383,7 +383,7 @@ struct gnutls_key_st
    */
   /* auth_info_t structures SHOULD NOT contain malloced 
    * elements. Check gnutls_session_pack.c, and gnutls_auth.c.
-   * Rememember that this should be calloced!
+   * Remember that this should be calloced!
    */
   void *auth_info;
   gnutls_credentials_type_t auth_info_type;
@@ -797,7 +797,7 @@ typedef struct
    */
   gnutls_openpgp_recv_key_func openpgp_recv_key_func;
 
-  /* If non zero the server will not advertize the CA's he
+  /* If non zero the server will not advertise the CA's he
    * trusts (do not send an RDN sequence).
    */
   int ignore_rdn_sequence;
@@ -880,7 +880,7 @@ struct gnutls_session_int
  */
 void _gnutls_free_auth_info (gnutls_session_t session);
 
-/* These two macros return the advertized TLS version of
+/* These two macros return the advertised TLS version of
  * the peer.
  */
 #define _gnutls_get_adv_version_major( session) \
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 6730306..2d9705b 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -21,13 +21,15 @@
  */
 
 /* This file contains the types and prototypes for all the
- * high level functionality of gnutls main library. For the
- * extra functionality (which is under the GNU GPL license) check
- * the gnutls/extra.h header. The openssl compatibility layer is
- * in gnutls/openssl.h.
+ * high level functionality of the gnutls main library.
  *
- * The low level cipher functionality is in libgcrypt. Check
- * gcrypt.h
+ * If the optional C++ binding was built, it is available in
+ * gnutls/gnutlsxx.h.
+ *
+ * The openssl compatibility layer (which is under the GNU GPL
+ * license) is in gnutls/openssl.h.
+ *
+ * The low level cipher functionality is in gnutls/crypto.h.
  */
 
 
diff --git a/lib/nettle/cipher.c b/lib/nettle/cipher.c
index ce01ed7..5beaf90 100644
--- a/lib/nettle/cipher.c
+++ b/lib/nettle/cipher.c
@@ -35,7 +35,7 @@
 #include <nettle/cbc.h>
 #include <nettle/gcm.h>
 
-/* Functions that refer to the libgcrypt library.
+/* Functions that refer to the nettle library.
  */
 
 #define MAX_BLOCK_SIZE 32
diff --git a/lib/nettle/init.c b/lib/nettle/init.c
index 72321fb..673a450 100644
--- a/lib/nettle/init.c
+++ b/lib/nettle/init.c
@@ -25,7 +25,7 @@
 #include <gnutls_num.h>
 #include <gnutls_mpi.h>
 
-/* Functions that refer to the initialization of the libgcrypt library.
+/* Functions that refer to the initialization of the nettle library.
  */
 
 int
diff --git a/lib/nettle/mac.c b/lib/nettle/mac.c
index 8564760..b86bce9 100644
--- a/lib/nettle/mac.c
+++ b/lib/nettle/mac.c
@@ -20,7 +20,7 @@
  *
  */
 
-/* This file provides is the backend hash/mac API for libgcrypt.
+/* This file provides the backend hash/mac API for nettle.
  */
 
 #include <gnutls_int.h>
diff --git a/src/libopts/m4/libopts.m4 b/src/libopts/m4/libopts.m4
index b18e86d..bb8da67 100644
--- a/src/libopts/m4/libopts.m4
+++ b/src/libopts/m4/libopts.m4
@@ -574,8 +574,9 @@ AC_DEFUN([LIBOPTS_CHECK], [
   LIBOPTS_CHECK_COMMON(AO_Libopts_Dir)
   AM_COND_IF([NEED_LIBOPTS], [
     INVOKE_LIBOPTS_MACROS
-    AC_CONFIG_FILES(AO_Libopts_Dir/Makefile)
   ])dnl
+
+  AC_CONFIG_FILES(AO_Libopts_Dir/Makefile)
   m4_popdef([AO_Libopts_Dir])dnl
 # end of AC_DEFUN of LIBOPTS_CHECK
 ])


hooks/post-receive
-- 
GNU gnutls