[git] GnuPG - branch, master, updated. gnupg-2.2.7-244-ga7c5d65

by Daniel Kahn Gillmor cvs at cvs.gnupg.org
Thu Oct 25 22:53:42 CEST 2018


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 "The GNU Privacy Guard".

The branch, master has been updated
       via  a7c5d65eb50355274c1b5b047c02c653f518900a (commit)
       via  b39ece7d35401302879062d9d4bec25b1249ae7e (commit)
      from  11e9b704b5054708b0b307013fde053701c39df4 (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 a7c5d65eb50355274c1b5b047c02c653f518900a
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Thu Oct 25 16:52:58 2018 -0400

    all: fix more spelling errors

diff --git a/Makefile.am b/Makefile.am
index 680fe1b..b59e9e3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -189,7 +189,7 @@ release:
 	 $(MAKE) -f  $(RELEASE_NAME)/build-aux/speedo.mk w32-release ;\
 	 echo "/* Build finished at $$(date -uIseconds) */" ;\
          echo "/*" ;\
-	 echo " * Please run the final step interactivly:" ;\
+	 echo " * Please run the final step interactively:" ;\
 	 echo " *   make sign-release" ;\
 	 echo " */" ;\
 	) 2>&1 | tee "$(RELEASE_NAME).buildlog"
diff --git a/NEWS b/NEWS
index 27f78b1..245cc70 100644
--- a/NEWS
+++ b/NEWS
@@ -98,7 +98,7 @@ Noteworthy changes in version 2.3.0 (unreleased)
   * dirmngr: Fallback to CRL if no default OCSP responder is configured.
 
   * dirmngr: Implement CRL fetching via https.  Here a redirection to
-    http is explictly allowed.
+    http is explicitly allowed.
 
   * dirmngr: Make LDAP searching and CRL fetching work under Windows.
     This stopped working with 2.1.  [#3937]
@@ -959,7 +959,7 @@ Noteworthy changes in version 2.1.11 (2016-01-26)
 
  * gpg: Emit PROGRESS status lines during key generation.
 
- * gpg: Don't check for ambigious or non-matching key specification in
+ * gpg: Don't check for ambiguous or non-matching key specification in
    the config file or given to --encrypt-to.  This feature will return
    in 2.3.x.
 
@@ -986,7 +986,7 @@ Noteworthy changes in version 2.1.11 (2016-01-26)
  * dirmmgr: All configured keyservers are now searched.
 
  * dirmngr: Install CA certificate for hkps.pool.sks-keyservers.net.
-   Use this certiticate even if --hkp-cacert is not used.
+   Use this certificate even if --hkp-cacert is not used.
 
  * gpgtar: Add actual encryption code.  gpgtar does now fully replace
    gpg-zip.
@@ -1020,7 +1020,7 @@ Noteworthy changes in version 2.1.10 (2015-12-04)
  * gpg: New option --only-sign-text-ids to exclude photo IDs from key
    signing.
 
- * gpg: Check for ambigious or non-matching key specification in the
+ * gpg: Check for ambiguous or non-matching key specification in the
    config file or given to --encrypt-to.
 
  * gpg: Show the used card reader with --card-status.
@@ -1310,7 +1310,7 @@ Noteworthy changes in version 2.1.1 (2014-12-16)
 
  * gpg: Fixed regression in --refresh-keys.
 
- * gpg: Fixed regresion in %g and %p codes for --sig-notation.
+ * gpg: Fixed regression in %g and %p codes for --sig-notation.
 
  * gpg: Fixed best matching hash algo detection for ECDSA and EdDSA.
 
@@ -1390,7 +1390,7 @@ Noteworthy changes in version 2.1.0 (2014-11-06)
 
  * gpg: Default keyring is now created with a .kbx suffix.
 
- * gpg: Add a shortcut to the key capabilies menu (e.g. "=e" sets the
+ * gpg: Add a shortcut to the key capabilities menu (e.g. "=e" sets the
    encryption capabilities).
 
  * gpg: Fixed obsolete options parsing.
@@ -1582,7 +1582,7 @@ Noteworthy changes in version 2.1.0 (2014-11-06)
  * scdaemon: Does not anymore block after changing a card (regression
    fix).
 
- * tools: gpg-connect-agent does now proberly display the help output
+ * tools: gpg-connect-agent does now properly display the help output
    for "SCD HELP" commands.
 
 
@@ -1707,7 +1707,7 @@ Noteworthy changes in version 2.0.13 (2009-09-04)
  * Add hack to the internal CCID driver to allow the use of some
    Omnikey based card readers with 2048 bit keys.
 
- * GPG now repeatly asks the user to insert the requested OpenPGP
+ * GPG now repeatedly asks the user to insert the requested OpenPGP
    card.  This can be disabled with --limit-card-insert-tries=1.
 
  * Minor bug fixes.
@@ -1833,7 +1833,7 @@ Noteworthy changes in version 2.0.9 (2008-03-26)
 
  * Extended the PKITS framework.
 
- * Fixed a bug in the ambigious name detection.
+ * Fixed a bug in the ambiguous name detection.
 
  * Fixed possible memory corruption while importing OpenPGP keys (bug
    introduced with 2.0.8). [CVE-2008-1530]
@@ -2383,7 +2383,7 @@ Noteworthy changes in version 1.9.2 (2003-11-17)
    command but from the menu provided by the new --card-edit command.
 
  * PINs are now properly cached and there are only 2 PINs visible.
-   The 3rd PIN (CHV2) is internally syncronized with the regular PIN.
+   The 3rd PIN (CHV2) is internally synchronized with the regular PIN.
 
  * All kind of other internal stuff.
 
@@ -3087,7 +3087,7 @@ Noteworthy changes in version 1.0.1 (1999-12-16)
     * Fixed some minor bugs and the problem with conventional encrypted
       packets which did use the gpg v3 partial length headers.
 
-    * Add Indonesian and Portugese translations.
+    * Add Indonesian and Portuguese translations.
 
     * Fixed a bug with symmetric-only encryption using the non-default 3DES.
       The option --emulate-3des-s2k-bug may be used to decrypt documents
@@ -3190,7 +3190,7 @@ Noteworthy changes in version 0.9.8 (1999-06-26)
 
     * New option --with-key-data to list the public key parameters.
       New option -N to insert notations and a --set-policy-url.
-      A couple of other options to allow reseting of options.
+      A couple of other options to allow resetting of options.
 
     * Better support for HPUX.
 
@@ -3669,7 +3669,7 @@ Noteworthy changes in version 0.2.19 (1998-05-29)
 Noteworthy changes in version 0.2.18 (1998-05-15)
 ------------------------------------
 
-    * Splitted cipher/random.c, add new option "--disable-dev-random"
+    * Split cipher/random.c, add new option "--disable-dev-random"
       to configure to support the development of a random source for
       other systems. Prepared sourcefiles rand-unix.c, rand-w32.c
       and rand-dummy.c (which is used to allow compilation on systems
diff --git a/agent/keyformat.txt b/agent/keyformat.txt
index 2e48b34..c7426db 100644
--- a/agent/keyformat.txt
+++ b/agent/keyformat.txt
@@ -234,7 +234,7 @@ The currently defined protection modes are:
      (csum n)
      (protection PROTTYPE PROTALGO IV S2KMODE S2KHASH S2KSALT S2KCOUNT)))
 
-  Note that the public key paramaters in SKEY are duplicated and
+  Note that the public key parameters in SKEY are duplicated and
   should be identical to their copies in the standard parameter
   elements.  Here is an example of an entire protected private key
   using this format:
@@ -359,8 +359,8 @@ KEY_1 to KEY_N are unique identifiers for the shared secret, for
 example an URI.  In case this information should be kept confidential
 as well, they may not appear in the unprotected part; however they are
 mandatory in the encrypted_octet_string.  The list of keywords is
-optional.  The oder of the "key" lists and the order of the "value"
-lists mut match, that is the first "key"-list is associated with the
+optional.  The order of the "key" lists and the order of the "value"
+lists must match, that is the first "key"-list is associated with the
 first "value" list in the encrypted_octet_string.
 
 The protection mode etc. is identical to the protection mode as
diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index 1a96e3b..5ec5823 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -971,7 +971,7 @@ else
 endif
 	@touch $(stampdir)/stamp-$(1)-01-configure
 
-# Note that unpack has no 64 bit version becuase it is just the source.
+# Note that unpack has no 64 bit version because it is just the source.
 # Fixme: We should use templates to create the standard and w64
 # version of these rules.
 $(stampdir)/stamp-w64-$(1)-01-configure: $(stampdir)/stamp-$(1)-00-unpack
@@ -1143,7 +1143,7 @@ all-speedo: $(stampdir)/stamp-final
 
 report-speedo: $(addprefix report-,$(speedo_build_list))
 
-# Just to check if we catched all stamps.
+# Just to check if we caught all stamps.
 clean-stamps:
 	$(RM) -fR $(stampdir)
 
@@ -1287,7 +1287,7 @@ endif
 
 
 #
-# Check availibility of standard tools
+# Check availability of standard tools
 #
 check-tools:
 
diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex
index 5a17f97..9e11848 100644
--- a/build-aux/texinfo.tex
+++ b/build-aux/texinfo.tex
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2007-05-03.09}
+\def\texinfoversion{2018-10-25.16}
 %
 % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -4598,7 +4598,7 @@ end
 \chardef\maxseclevel = 3
 %
 % A numbered section within an unnumbered changes to unnumbered too.
-% To achive this, remember the "biggest" unnum. sec. we are currently in:
+% To achieve this, remember the "biggest" unnum. sec. we are currently in:
 \chardef\unmlevel = \maxseclevel
 %
 % Trace whether the current chapter is an appendix or not:
diff --git a/common/mkerrors b/common/mkerrors
index 138d3c1..2a6960a 100755
--- a/common/mkerrors
+++ b/common/mkerrors
@@ -30,7 +30,7 @@ cat <<EOF
  * gnupg_strerror:
  * @err:  Error code
  *
- * This function returns a textual representaion of the given
+ * This function returns a textual representation of the given
  * errorcode. If this is an unknown value, a string with the value
  * is returned (Beware: it is hold in a static buffer).
  *
diff --git a/common/mkerrtok b/common/mkerrtok
index e631072..49c10e5 100755
--- a/common/mkerrtok
+++ b/common/mkerrtok
@@ -26,7 +26,7 @@ cat <<EOF
  * gnupg_error_token:
  * @err:  Error code
  *
- * This function returns a textual representaion of the given
+ * This function returns a textual representation of the given
  * errorcode. If this is an unknown value, a static string is returned.
  * This function differs from gnupg_strerror that it yields the string
  * representation of the macro which is never subject to i18n.
diff --git a/configure.ac b/configure.ac
index 78a03c4..f0e6966 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1481,7 +1481,7 @@ if test "$use_regex" = yes ; then
     use_regex=no
   else
     if test x"$cross_compiling" = xyes; then
-      AC_MSG_WARN([cross compiling; assuming regexp libray is not broken])
+      AC_MSG_WARN([cross compiling; assuming regexp library is not broken])
     else
       AC_CACHE_CHECK([whether your system's regexp library is broken],
        [gnupg_cv_regex_broken],
diff --git a/doc/Notes b/doc/Notes
index 19241b7..33ef292 100644
--- a/doc/Notes
+++ b/doc/Notes
@@ -1,5 +1,5 @@
 
-Add an infor page for watchgnupg.
+Add an info page for watchgnupg.
 
 > * How to mark a CA certificate as trusted.
 
@@ -57,7 +57,7 @@ or
 
 In general you should first import the root certificates and then down
 to the end user certificate.  You may put all into one file and gpgsm
-will do the right thing in this case independend of the order.  
+will do the right thing in this case independent of the order.
 
 While verifying a signature, all included certificates are
 automagically imported.
@@ -82,7 +82,7 @@ you get an output like:
   uid:::::::::CN=Werner Koch,OU=test,O=g10 Code,C=de::
   uid:::::::::<wk at g10code.de>::
 
-This should be familar to advanced gpg-users; see doc/DETAILS in gpg
+This should be familiar to advanced gpg-users; see doc/DETAILS in gpg
 1.3 (CVS HEAD) for a description of the records.  The value in the
 "grp" tagged record is the so called keygrip and you should find a
 file ~/.gnupg/private-keys-v1.d/C92DB9CFD588ADE846BE3AC4E7A2E1B11A4A2ADB.key
diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
index 76be528..f5910a8 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -1096,7 +1096,7 @@ as a binary blob.
 @c In the end the same fucntionality is used, albeit hidden by a couple
 @c of indirection and argument and result code mangling.  It furthere
 @c ingetrages OCSP checking depending on options are the way it is
- at c called.  GPGSM still uses this command but might eventuall switch over
+ at c called.  GPGSM still uses this command but might eventually switch over
 @c to CHECKCRL and CHECKOCSP so that ISVALID can be retired.
 @c
 @c
diff --git a/doc/gpg.texi b/doc/gpg.texi
index ba1df4b..dedb8cc 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -624,9 +624,9 @@ fingerprint (preferred) or their keyid.
 @end table
 
 
- at c *******************************************
- at c *******  KEY MANGEMENT COMMANDS  **********
- at c *******************************************
+ at c ********************************************
+ at c *******  KEY MANAGEMENT COMMANDS  **********
+ at c ********************************************
 @node OpenPGP Key Management
 @subsection How to manage your keys
 
@@ -2623,7 +2623,7 @@ These options are obsolete and have no effect since GnuPG 2.1.
 @item --force-aead
 @opindex force-aead
 Force the use of AEAD encryption over MDC encryption.  AEAD is a
-modern and faster way to do authenticated encrytion than the old MDC
+modern and faster way to do authenticated encryption than the old MDC
 method.  See also options @option{--aead-algo} and
 @option{--chunk-size}.
 
@@ -2779,7 +2779,7 @@ This option is obsolete; it is handled as an alias for @option{--pgp7}
 
 @item --pgp7
 @opindex pgp7
-Set up all options to be as PGP 7 compliant as possible. This allowd
+Set up all options to be as PGP 7 compliant as possible. This allowed
 the ciphers IDEA, 3DES, CAST5,AES128, AES192, AES256, and TWOFISH.,
 the hashes MD5, SHA1 and RIPEMD160, and the compression algorithms
 none and ZIP.  This option implies @option{--escape-from-lines} and
@@ -3051,7 +3051,7 @@ same thing.
 @opindex aead-algo
 Specify that the AEAD algorithm @var{name} is to be used.  This is
 useful for symmetric encryption where no key preference are available
-to select the AEAD algorithm.  Runing @command{@gpgname} with option
+to select the AEAD algorithm.  Running @command{@gpgname} with option
 @option{--version} shows the available AEAD algorithms.  In general,
 you do not want to use this option as it allows you to violate the
 OpenPGP standard.  The option @option{--personal-aead-preferences} is
diff --git a/g10/import.c b/g10/import.c
index 6fdd53e..23258a0 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -3073,7 +3073,7 @@ chk_self_sigs (ctrl_t ctrl, kbnode_t keyblock, u32 *keyid, int *non_self)
   kbnode_t bsnode = NULL;  /* Subkey binding signature node.  */
   u32 bsdate = 0;          /* Timestamp of that node.   */
   kbnode_t rsnode = NULL;  /* Subkey recocation signature node.  */
-  u32 rsdate = 0;          /* Timestamp of tha node.  */
+  u32 rsdate = 0;          /* Timestamp of that node.  */
   PKT_signature *sig;
   int rc;
   kbnode_t n;
diff --git a/kbx/mkerrors b/kbx/mkerrors
index 629485a..c0bca10 100755
--- a/kbx/mkerrors
+++ b/kbx/mkerrors
@@ -29,7 +29,7 @@ cat <<EOF
  * keybox_strerror:
  * @err:  Error code
  *
- * This function returns a textual representaion of the given
+ * This function returns a textual representation of the given
  * errorcode. If this is an unknown value, a string with the value
  * is returned (Beware: it is hold in a static buffer).
  *
diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4
index 1661204..8ba24b7 100644
--- a/m4/gpg-error.m4
+++ b/m4/gpg-error.m4
@@ -17,7 +17,7 @@ dnl                   [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl
 dnl Test for libgpg-error and define GPG_ERROR_CFLAGS, GPG_ERROR_LIBS,
 dnl GPG_ERROR_MT_CFLAGS, and GPG_ERROR_MT_LIBS.  The _MT_ variants are
-dnl used for programs requireing real multi thread support.
+dnl used for programs requiring real multi thread support.
 dnl
 dnl If a prefix option is not used, the config script is first
 dnl searched in $SYSROOT/bin and then along $PATH.  If the used
diff --git a/m4/ksba.m4 b/m4/ksba.m4
index 3e14e67..8cb49a3 100644
--- a/m4/ksba.m4
+++ b/m4/ksba.m4
@@ -13,7 +13,7 @@
 dnl AM_PATH_KSBA([MINIMUM-VERSION,
 dnl              [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl Test for libksba and define KSBA_CFLAGS and KSBA_LIBS
-dnl MINIMUM-VERSION is a string with the version number optionalliy prefixed
+dnl MINIMUM-VERSION is a string with the version number optionally prefixed
 dnl with the API version to also check the API compatibility. Example:
 dnl a MINIMUM-VERSION of 1:1.0.7 won't pass the test unless the installed
 dnl version of libksba is at least 1.0.7 *and* the API number is 1.  Using
diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
index d89fe11..dd167f8 100644
--- a/m4/libgcrypt.m4
+++ b/m4/libgcrypt.m4
@@ -15,7 +15,7 @@
 dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
 dnl                   [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.
-dnl MINIMUM-VERSION is a string with the version number optionalliy prefixed
+dnl MINIMUM-VERSION is a string with the version number optionally prefixed
 dnl with the API version to also check the API compatibility. Example:
 dnl a MINIMUM-VERSION of 1:1.2.5 won't pass the test unless the installed
 dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1.  Using
diff --git a/m4/ntbtls.m4 b/m4/ntbtls.m4
index 0a30d92..4a4b5da 100644
--- a/m4/ntbtls.m4
+++ b/m4/ntbtls.m4
@@ -14,7 +14,7 @@ dnl AM_PATH_NTBTLS([MINIMUM-VERSION,
 dnl                   [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl
 dnl Test for NTBTLS and define NTBTLS_CFLAGS and NTBTLS_LIBS.
-dnl MINIMUM-VERSION is a string with the version number optionalliy prefixed
+dnl MINIMUM-VERSION is a string with the version number optionally prefixed
 dnl with the API version to also check the API compatibility. Example:
 dnl a MINIMUM-VERSION of 1:1.2.5 won't pass the test unless the installed
 dnl version of ntbtls is at least 1.2.5 *and* the API number is 1.  Using
diff --git a/sm/certchain.c b/sm/certchain.c
index 708e937..79d98c7 100644
--- a/sm/certchain.c
+++ b/sm/certchain.c
@@ -1171,7 +1171,7 @@ check_validity_period_cm (ksba_isotime_t current_time,
           || strcmp (check_time, not_after) > 0))
     {
       /* Note that we don't need a case for the root certificate
-         because its own consitency has already been checked.  */
+         because its own consistency has already been checked.  */
       do_list(opt.ignore_expiration?0:1, listmode, listfp,
               depth == 0 ?
               _("signature not created during lifetime of certificate") :
diff --git a/tools/gpg-check-pattern.c b/tools/gpg-check-pattern.c
index 1f015e9..dee5d5d 100644
--- a/tools/gpg-check-pattern.c
+++ b/tools/gpg-check-pattern.c
@@ -91,7 +91,7 @@ static struct
 enum {
   PAT_NULL,    /* Indicates end of the array.  */
   PAT_STRING,  /* The pattern is a simple string.  */
-  PAT_REGEX    /* The pattern is an extended regualar expression. */
+  PAT_REGEX    /* The pattern is an extended regular expression. */
 };
 
 

commit b39ece7d35401302879062d9d4bec25b1249ae7e
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Thu Oct 25 09:46:23 2018 -0400

    headers: fix spelling
    
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/common/audit.h b/common/audit.h
index 4ef2645..05f3953 100644
--- a/common/audit.h
+++ b/common/audit.h
@@ -185,7 +185,7 @@ typedef enum
        if no real recipient has been given.  */
 
     AUDIT_SESSION_KEY,     /* string */
-    /* Mark the creation or availibility of the session key.  The
+    /* Mark the creation or availability of the session key.  The
        parameter is the algorithm ID.  */
 
     AUDIT_ENCRYPTED_TO,   /* cert, err */
diff --git a/common/sexp-parse.h b/common/sexp-parse.h
index 4f77f14..0403d65 100644
--- a/common/sexp-parse.h
+++ b/common/sexp-parse.h
@@ -105,7 +105,7 @@ smatch (unsigned char const **buf, size_t buflen, const char *token)
 }
 
 /* Format VALUE for use as the length indicatior of an S-expression.
-   The caller needs to provide a buffer HELP_BUFFER wth a length of
+   The caller needs to provide a buffer HELP_BUFFER with a length of
    HELP_BUFLEN.  The return value is a pointer into HELP_BUFFER with
    the formatted length string.  The colon and a trailing nul are
    appended.  HELP_BUFLEN must be at least 3 - a more useful value is
diff --git a/dirmngr/cdb.h b/dirmngr/cdb.h
index 0c0d270..5d46f69 100644
--- a/dirmngr/cdb.h
+++ b/dirmngr/cdb.h
@@ -85,7 +85,7 @@ int cdb_make_put(struct cdb_make *cdbmp,
 		 const void *key, cdbi_t klen,
 		 const void *val, cdbi_t vlen,
 		 int flag);
-#define CDB_PUT_ADD	0	/* add unconditionnaly, like cdb_make_add() */
+#define CDB_PUT_ADD	0	/* add unconditionally, like cdb_make_add() */
 #define CDB_PUT_REPLACE	1	/* replace: do not place to index OLD record */
 #define CDB_PUT_INSERT	2	/* add only if not already exists */
 #define CDB_PUT_WARN	3	/* add unconditionally but ret. 1 if exists */
diff --git a/g10/key-clean.h b/g10/key-clean.h
index a0fb769..c4f1649 100644
--- a/g10/key-clean.h
+++ b/g10/key-clean.h
@@ -23,7 +23,7 @@
 
 #include "gpg.h"
 
-/* No explict cleaning.  */
+/* No explicit cleaning.  */
 #define KEY_CLEAN_NONE      0
 /* Remove only invalid subkeys (ie. missing key-bindings) */
 #define KEY_CLEAN_INVALID   1
diff --git a/g10/packet.h b/g10/packet.h
index 6e1438b..d088bf4 100644
--- a/g10/packet.h
+++ b/g10/packet.h
@@ -244,7 +244,7 @@ typedef struct
   const byte *trust_regexp;
   struct revocation_key *revkey;
   int numrevkeys;
-  int help_counter;          /* Used internally bu some fucntions.  */
+  int help_counter;          /* Used internally bu some functions.  */
   pka_info_t *pka_info;      /* Malloced PKA data or NULL if not
                                 available.  See also flags.pka_tried. */
   char *signers_uid;         /* Malloced value of the SIGNERS_UID
diff --git a/sm/gpgsm.h b/sm/gpgsm.h
index d3fbde5..7a5e491 100644
--- a/sm/gpgsm.h
+++ b/sm/gpgsm.h
@@ -76,7 +76,7 @@ struct
   const char *protect_tool_program;
   char *outfile;    /* name of output file */
 
-  int with_key_data;/* include raw key in the column delimted output */
+  int with_key_data;/* include raw key in the column delimited output */
 
   int fingerprint;  /* list fingerprints in all key listings */
 
diff --git a/tools/gpgtar.h b/tools/gpgtar.h
index 8cbe80b..28d3d88 100644
--- a/tools/gpgtar.h
+++ b/tools/gpgtar.h
@@ -88,7 +88,7 @@ typedef enum
   } typeflag_t;
 
 
-/* The internal represenation of a TAR header.  */
+/* The internal representation of a TAR header.  */
 struct tar_header_s;
 typedef struct tar_header_s *tar_header_t;
 struct tar_header_s

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

Summary of changes:
 Makefile.am               |  2 +-
 NEWS                      | 26 +++++++++++++-------------
 agent/keyformat.txt       |  6 +++---
 build-aux/speedo.mk       |  6 +++---
 build-aux/texinfo.tex     |  4 ++--
 common/audit.h            |  2 +-
 common/mkerrors           |  2 +-
 common/mkerrtok           |  2 +-
 common/sexp-parse.h       |  2 +-
 configure.ac              |  2 +-
 dirmngr/cdb.h             |  2 +-
 doc/Notes                 |  6 +++---
 doc/dirmngr.texi          |  2 +-
 doc/gpg.texi              | 12 ++++++------
 g10/import.c              |  2 +-
 g10/key-clean.h           |  2 +-
 g10/packet.h              |  2 +-
 kbx/mkerrors              |  2 +-
 m4/gpg-error.m4           |  2 +-
 m4/ksba.m4                |  2 +-
 m4/libgcrypt.m4           |  2 +-
 m4/ntbtls.m4              |  2 +-
 sm/certchain.c            |  2 +-
 sm/gpgsm.h                |  2 +-
 tools/gpg-check-pattern.c |  2 +-
 tools/gpgtar.h            |  2 +-
 26 files changed, 50 insertions(+), 50 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org




More information about the Gnupg-commits mailing list