Fix up some typos and obsolete comments

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>

diff --git a/doc/cha-internals.texi b/doc/cha-internals.texi
index 8eebd970c90574e34f6caf10fe22c473b60f6cde..bb8b420f3b87def530fcc9ba3dcd30b842f633a1 100644 (file)
--- 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 ac6e2b1516e44211cd30a473bf4544d07c106f5f..fd59d335b63a4cf13cb89f1c617a93f85640e49e 100644 (file)
--- 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 e74fa2c1fa1074d409553d75c4a429c6bb9524ed..ec68771fd192d7ddb2cc4e094cb337aa99690b21 100644 (file)
--- 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 2af78aa874ef86991aa8ec7db5f1badebd261e6a..a05359d821245d0d37f5d27c1b39b8e9db3d4b96 100644 (file)
--- 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 f68a01380e995560db5e2ace64b40b3010cde4f8..edbad0543d9e99343ea7713b4b79da76d648dfe9 100644 (file)
--- 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 6730306743126946da5a3879ccec55e34efde783..2d9705bd1d914b3249d02658d56998011ccf66f9 100644 (file)
--- 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 ce01ed76379d5d6a77372bbfca5828926a1efea1..5beaf904739afd638c8e449d92e12869246ea344 100644 (file)
--- 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 72321fb741a73d956e9f345679dc0d293b99ccfc..673a4504075d85834b243704b326ff67954091a5 100644 (file)
--- 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 8564760f50cb87afb3c59754f362a65a26fe8b35..b86bce9f1e6e499c4c4f4f04643180cd152b1077 100644 (file)
--- 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>