Spelling cleanup.

No functional changes, just fixing minor spelling issues.

---

Most of these were identified from the command line by running:

  codespell \
    --ignore-words-list fpr,stati,keyserver,keyservers,asign,cas,iff,ifset \
    --skip '*.po,ChangeLog*,help.*.txt,*.jpg,*.eps,*.pdf,*.png,*.gpg,*.asc' \
    doc g13 g10 kbx agent artwork scd tests tools am common dirmngr sm \
    NEWS README README.maint TODO

Signed-off-by: Daniel Kahn Gillmor <[email protected]>

Author: dkg

NEWS

@@ -299,7 +299,7 @@ Noteworthy changes in version 2.3.0 (unreleased)
 
   Changes also found in 2.2.11:
 
-  * gpgsm: Fix CRL loading when intermediate certicates are not yet
+  * gpgsm: Fix CRL loading when intermediate certificates are not yet
     trusted.
 
   * gpgsm: Fix an error message about the digest algo.  [#4219]
@@ -634,7 +634,7 @@ Noteworthy changes in version 2.3.0 (unreleased)
 
   * gpgsm: Do not expect X.509 keyids to be unique.  [#1644]
 
-  * agent: Fix stucked Pinentry when using --max-passphrase-days. [#3190]
+  * agent: Fix stuck Pinentry when using --max-passphrase-days. [#3190]
 
   * agent: New option --s2k-count.  [#3276 (workaround)]
 
@@ -1910,7 +1910,7 @@ Noteworthy changes in version 2.1.0 (2014-11-06)
 
  * scdaemon: Rename option --disable-pinpad (was --disable-keypad).
 
- * scdaemon: Better support fo CCID readers.  Now, internal CCID
+ * scdaemon: Better support for CCID readers.  Now, internal CCID
    driver supports readers with no auto configuration feature.
 
  * dirmngr: Removed support for the original HKP keyserver which is

agent/agent.h

@@ -48,7 +48,7 @@
 #define MAX_DIGEST_LEN 64
 
 /* The maximum length of a passphrase (in bytes).  Note: this is
-   further contrained by the Assuan line length (and any other text on
+   further constrained by the Assuan line length (and any other text on
    the same line).  However, the Assuan line length is 1k bytes so
    this shouldn't be a problem in practice.  */
 #define MAX_PASSPHRASE_LEN 255
@@ -126,7 +126,7 @@ struct
   int enable_passphrase_history;
 
   /* If set the extended key format is used for new keys.  Note that
-   * this may vave the value 2 in which case
+   * this may have the value 2 in which case
    * --disable-extended-key-format won't have any effect and thus
    * effectivley locking it.  This is required to support existing
    * profiles which lock the use of --enable-extended-key-format. */

agent/cache.c

@@ -205,7 +205,7 @@ housekeeping (void)
   for (r=thecache; r; r = r->next)
     {
       if (r->cache_mode == CACHE_MODE_PIN)
-        ; /* Don't let it expire - scdaemon explictly flushes them.  */
+        ; /* Don't let it expire - scdaemon explicitly flushes them.  */
       else if (r->pw && r->ttl >= 0 && r->accessed + r->ttl < current)
         {
           if (DBG_CACHE)

agent/command-ssh.c

@@ -1508,7 +1508,7 @@ ssh_signature_encoder_dsa (ssh_key_type_spec_t *spec,
 
   /* DSA specific code.  */
 
-  /* FIXME: Why this complicated code?  Why collecting boths mpis in a
+  /* FIXME: Why this complicated code?  Why collecting both mpis in a
      buffer instead of writing them out one after the other?  */
   for (i = 0; i < 2; i++)
     {

agent/command.c

@@ -656,7 +656,7 @@ static const char hlp_setkeydesc[] =
   "Set a description to be used for the next PKSIGN, PKDECRYPT, IMPORT_KEY\n"
   "or EXPORT_KEY operation if this operation requires a passphrase.  If\n"
   "this command is not used a default text will be used.  Note, that\n"
-  "this description implictly selects the label used for the entry\n"
+  "this description implicitly selects the label used for the entry\n"
   "box; if the string contains the string PIN (which in general will\n"
   "not be translated), \"PIN\" is used, otherwise the translation of\n"
   "\"passphrase\" is used.  The description string should not contain\n"

agent/findkey.c

@@ -199,8 +199,8 @@ write_extended_private_key (char *fname, estream_t fp, int update,
 
 /* Write an S-expression formatted key to our key storage.  With FORCE
  * passed as true an existing key with the given GRIP will get
- * overwritten.  If SERIALNO and KEYREF are give an a Token line is added to
- * th key if the extended format ist used.  */
+ * overwritten.  If SERIALNO and KEYREF are given a Token line is added to
+ * the key if the extended format is used.  */
 int
 agent_write_private_key (const unsigned char *grip,
                          const void *buffer, size_t length, int force,

agent/gpg-agent.c

@@ -2030,7 +2030,7 @@ agent_copy_startup_env (ctrl_t ctrl)
    Fixme: Due to the way the argument parsing works, we create a
    memory leak here for all string type arguments.  There is currently
    no clean way to tell whether the memory for the argument has been
-   allocated or points into the process' original arguments.  Unless
+   allocated or points into the process's original arguments.  Unless
    we have a mechanism to tell this, we need to live on with this. */
 static void
 reread_configuration (void)

agent/pksign.c

@@ -349,7 +349,7 @@ agent_pksign_do (ctrl_t ctrl, const char *cache_nonce,
 
           if (agent_card_serialno (ctrl, &serialno, NULL))
             {
-              /* No card availabale or error reading the card.  */
+              /* No card available or error reading the card.  */
               err = gpg_error (GPG_ERR_NO_SECKEY);
               goto leave;
             }

agent/w32main.c

@@ -40,8 +40,8 @@ static HWND glob_hwnd;
    number of args to reserve before the first one.  This code is based
    on Alexandre Julliard's LGPLed wine-0.9.34/dlls/kernel32/process.c
    and modified to fit into our framework.  The function returns NULL
-   on error; on success an arry with the argiments is returned.  This
-   array has been allocaqted using a plain malloc (and not the usual
+   on error; on success an array with the arguments is returned.  This
+   array has been allocated using a plain malloc (and not the usual
    xtrymalloc). */
 static char **
 build_argv (char *cmdline_arg, int reserved)

common/argparse.c

@@ -22,7 +22,7 @@
 
 /* This file may be used as part of GnuPG or standalone.  A GnuPG
    build is detected by the presence of the macro GNUPG_MAJOR_VERSION.
-   Some feature are only availalbe in the GnuPG build mode.
+   Some feature are only available in the GnuPG build mode.
  */
 
 #ifdef HAVE_CONFIG_H

common/asshelp.c

@@ -600,7 +600,7 @@ start_new_service (assuan_context_t *r_ctx,
 }
 
 
-/* Try to connect tothe agent or start a new one.  */
+/* Try to connect to the agent or start a new one.  */
 gpg_error_t
 start_new_gpg_agent (assuan_context_t *r_ctx,
                      gpg_err_source_t errsource,

common/asshelp2.c

@@ -45,7 +45,7 @@
 static assuan_context_t (*the_assuan_ctx_func)(ctrl_t ctrl);
 
 
-/* Set FUNC to be used as a mapping fucntion from CTRL to an assuan
+/* Set FUNC to be used as a mapping function from CTRL to an assuan
  * context.  Pass NULL for FUNC to disable the use of the assuan
  * context in this module.  */
 void

common/audit.c

@@ -80,7 +80,7 @@ static void writeout_rem (audit_ctx_t ctx,
 
 
 /* Add NAME to the list of help tags.  NAME needs to be a const string
-   an this function merly stores this pointer.  */
+   an this function merely stores this pointer.  */
 static void
 add_helptag (audit_ctx_t ctx, const char *name)
 {

common/dotlock.c

@@ -124,7 +124,7 @@
    that the handle shall only be used by one thread at a time.  This
    function creates a unique file temporary file (".#lk*") in the same
    directory as FNAME and returns a handle for further operations.
-   The module keeps track of theses unique files so that they will be
+   The module keeps track of these unique files so that they will be
    unlinked using the atexit handler.  If you don't need the lock file
    anymore, you may also explicitly remove it with a call to:
 
@@ -1110,7 +1110,7 @@ dotlock_take_unix (dotlock_t h, long timeout)
     }
   else if ( same_node && kill (pid, 0) && errno == ESRCH )
     {
-      /* Note: It is unlikley that we get a race here unless a pid is
+      /* Note: It is unlikely that we get a race here unless a pid is
          reused too fast or a new process with the same pid as the one
          of the stale file tries to lock right at the same time as we.  */
       my_info_1 (_("removing stale lockfile (created by %d)\n"), pid);

common/exectool.c

@@ -305,7 +305,7 @@ copy_buffer_flush (struct copy_buffer *c, estream_t sink)
 /* Run the program PGMNAME with the command line arguments given in
  * the NULL terminates array ARGV.  If INPUT is not NULL it will be
  * fed to stdin of the process.  stderr is logged using log_info and
- * the process' stdout is written to OUTPUT.  If OUTPUT is NULL the
+ * the process's stdout is written to OUTPUT.  If OUTPUT is NULL the
  * output is discarded.  If INEXTRA is given, an additional input
  * stream will be passed to the child; to tell the child about this
  * ARGV is scanned and the first occurrence of an argument
@@ -582,7 +582,7 @@ nop_free (void *ptr)
 /* Run the program PGMNAME with the command line arguments given in
    the NULL terminates array ARGV.  If INPUT_STRING is not NULL it
    will be fed to stdin of the process.  stderr is logged using
-   log_info and the process' stdout is returned in a newly malloced
+   log_info and the process's stdout is returned in a newly malloced
    buffer RESULT with the length stored at RESULTLEN if not given as
    NULL.  A hidden Nul is appended to the output.  On error NULL is
    stored at RESULT, a diagnostic is printed, and an error code

common/exectool.h

@@ -46,7 +46,7 @@ typedef void (*exec_tool_status_cb_t) (void *opaque,
 /* Run the program PGMNAME with the command line arguments given in
    the NULL terminates array ARGV.  If INPUT_STRING is not NULL it
    will be fed to stdin of the process.  stderr is logged using
-   log_info and the process' stdout is returned in a newly malloced
+   log_info and the process's stdout is returned in a newly malloced
    buffer RESULT with the length stored at RESULTLEN if not given as
    NULL.  A hidden Nul is appended to the output.  On error NULL is
    stored at RESULT, a diagnostic is printed, and an error code
@@ -58,7 +58,7 @@ gpg_error_t gnupg_exec_tool (const char *pgmname, const char *argv[],
 /* Run the program PGMNAME with the command line arguments given in
    the NULL terminates array ARGV.  If INPUT is not NULL it will be
    fed to stdin of the process.  stderr is logged using log_info and
-   the process' stdout is written to OUTPUT.  On error a diagnostic is
+   the process's stdout is written to OUTPUT.  On error a diagnostic is
    printed, and an error code returned.  INEXTRA is reserved. */
 gpg_error_t gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
                                     estream_t input, estream_t inextra,

common/homedir.c

@@ -87,7 +87,7 @@ static byte w32_portable_app;
 #endif /*HAVE_W32_SYSTEM*/
 
 #ifdef HAVE_W32_SYSTEM
-/* This flag is true if this process' binary has been installed under
+/* This flag is true if this process's binary has been installed under
    bin and not in the root directory as often used before GnuPG 2.1. */
 static byte w32_bin_is_bin;
 #endif /*HAVE_W32_SYSTEM*/

common/percent.c

@@ -41,7 +41,7 @@
  * function returns the new string or NULL in case of a malloc
  * failure.
  *
- * Note that this fucntion also escapes the quote character to work
+ * Note that this function also escapes the quote character to work
  * around a bug in the mingw32 runtime which does not correctly handle
  * command line quoting.  We correctly double the quote mark when
  * calling a program (i.e. gpg-protect-tool), but the pre-main code

common/session-env.c

@@ -375,7 +375,7 @@ session_env_getenv_or_default (session_env_t se, const char *name,
    until it returns NULL.  The value is returned at R_VALUE.  If
    R_DEFAULT is not NULL, the default flag is stored on return.  The
    default flag indicates that the value has been taken from the
-   process' environment.  The caller must not change the returned
+   process's environment.  The caller must not change the returned
    name or value.  */
 char *
 session_env_listenv (session_env_t se, int *iterator,

common/t-name-value.c

@@ -350,7 +350,7 @@ run_modification_tests (void)
   assert (!err);
   e = nvc_lookup (pk, "Key:");
   assert (e);
-  nvc_delete_named (pk, "Kez:");  /* Delete an inexistant name.  */
+  nvc_delete_named (pk, "Kez:");  /* Delete an nonexistent name.  */
   e = nvc_lookup (pk, "Key:");
   assert (e);
   nvc_delete_named (pk, "Key:");

common/t-openpgp-oid.c

@@ -274,7 +274,7 @@ test_get_keyalgo_string (void)
   int oops = 0;
   int pass;
 
-  /* We do several passes becuase that is how the function is
+  /* We do several passes because that is how the function is
    * called.  */
   for (pass=0; pass < 3; pass++)
     for (idx=0; idx < DIM (samples); idx++)

common/t-percent.c

@@ -222,7 +222,7 @@ test_percent_data_escape (void)
         {
           /* Note extra condition above handles the one test case
            * which reverts a plus to a space due to the use of the
-           * plus-unescape fucntion also for the prefix part.  */
+           * plus-unescape function also for the prefix part.  */
           fail (i);
         }
       else if (memcmp (buf+prefixlen, tbl[i].data, tbl[i].datalen))

dirmngr/dirmngr.c

@@ -1614,7 +1614,7 @@ dirmngr_deinit_default_ctrl (ctrl_t ctrl)
 /* Create a list of LDAP servers from the file FILENAME. Returns the
    list or NULL in case of errors.
 
-   The format fo such a file is line oriented where empty lines and
+   The format of such a file is line oriented where empty lines and
    lines starting with a hash mark are ignored.  All other lines are
    assumed to be colon seprated with these fields:
 
@@ -1821,7 +1821,7 @@ parse_ocsp_signer (const char *string)
    Fixme: Due to the way the argument parsing works, we create a
    memory leak here for all string type arguments.  There is currently
    no clean way to tell whether the memory for the argument has been
-   allocated or points into the process' original arguments.  Unless
+   allocated or points into the process's original arguments.  Unless
    we have a mechanism to tell this, we need to live on with this. */
 static void
 reread_configuration (void)

dirmngr/dns.c

@@ -7646,7 +7646,7 @@ int dns_so_check(struct dns_socket *so) {
 			goto udp_connect_retry;
 		} else if (error == ECONNREFUSED)
 			/* Error for previous socket operation may
-			   be reserverd(?) asynchronously. */
+			   be reserved(?) asynchronously. */
 			goto udp_connect_retry;
 
 		if (error)
@@ -8244,7 +8244,7 @@ struct dns_resolver *dns_res_open(struct dns_resolv_conf *resconf, struct dns_ho
 	/*
 	 * Don't try to load it ourselves because a NULL object might be an
 	 * error from, say, dns_resconf_root(), and loading
-	 * dns_resconf_local() by default would create undesirable surpises.
+	 * dns_resconf_local() by default would create undesirable surprises.
 	 */
 	if (!resconf || !hosts || !hints) {
 		if (!*_error)

dirmngr/http.c

@@ -39,7 +39,7 @@
   - stpcpy is required
   - fixme: list other requirements.
 
-  - Either HTTP_USE_NTBTLS or HTTP_USE_GNUTLS must be defind to select
+  - Either HTTP_USE_NTBTLS or HTTP_USE_GNUTLS must be defined to select
     which TLS library to use.
 
   - With HTTP_NO_WSASTARTUP the socket initialization is not done

dirmngr/ldap-wrapper.c

@@ -22,9 +22,9 @@
  * We can't use LDAP directly for these reasons:
  *
  * 1. The LDAP library is linked to separate crypto library like
- *    OpenSSL and even if it is linked to the libary we use in dirmngr
+ *    OpenSSL and even if it is linked to the library we use in dirmngr
  *    (ntbtls or gnutls) it is sometimes a different version of that
- *    libary with all the surprising failures you may get due to this.
+ *    library with all the surprising failures you may get due to this.
  *
  * 2. It is huge library in particular if TLS comes into play.  So
  *    problems with unfreed memory might turn up and we don't want

dirmngr/ocsp.c

@@ -305,7 +305,7 @@ do_ocsp_request (ctrl_t ctrl, ksba_ocsp_t ocsp,
       if (opt.verbose)
         log_info (_("OCSP responder at '%s' status: %s\n"), url, t);
 
-      /* Get the signature value now because we can all this fucntion
+      /* Get the signature value now because we can all this function
        * only once.  */
       *r_sigval = ksba_ocsp_get_sig_val (ocsp, r_produced_at);
 

dirmngr/workqueue.c

@@ -38,7 +38,7 @@ struct wqitem_s
    * task is not associated with a specific session.  */
   unsigned int session_id;
 
-  /* The function to perform the backgrount task.  */
+  /* The function to perform the background task.  */
   wqtask_t func;
 
   /* A string with the string argument for that task.  */
@@ -59,7 +59,7 @@ workqueue_dump_queue (ctrl_t ctrl)
   wqitem_t item;
   unsigned int count;
 
-  /* Temporay detach the entiere workqueue so that other threads don't
+  /* Temporarily detach the entiere workqueue so that other threads don't
    * get into our way.  */
   saved_workqueue = workqueue;
   workqueue = NULL;

doc/Notes

@@ -130,7 +130,7 @@ the colon format if you want to manually debug things.
 > * How to import a CRL
 
 CRLs are managed by the dirmngr which is a separate package.  The idea
-is to eventaully turn it into a system daemon, so that on a multi-user
+is to eventually turn it into a system daemon, so that on a multi-user
 machine CRLs are handled more efficiently.  As of now the dirmngr
 needs service from gpgsm thus it is best to call it through gpgsm:
 

doc/dirmngr.texi

@@ -1085,7 +1085,7 @@ as a binary blob.
 @c
 @c If no certificate was found, the function returns with the error
 @c GPG_ERR_MISSING_CERT.  Now the signature is verified.  If this fails,
-@c the erro is returned.  On success the @code{validate_cert_chain} is
+@c the error is returned.  On success the @code{validate_cert_chain} is
 @c used to verify that the certificate is actually valid.
 @c
 @c Here we may encounter a recursive situation:

doc/examples/pwpattern.list

@@ -10,7 +10,7 @@
 
 # Reject the usual metavariables.  Usual not required because
 # gpg-agent can be used to reject all passphrases shorter than 8
-# charactes.
+# characters.
 foo
 bar
 baz

doc/gpg-card.texi

@@ -56,7 +56,7 @@ same commands as available in the interactive mode are run from the
 command line.  These commands need to be delimited with a double-dash.
 If a double-dash or a shell specific character is required as part of
 a command the entire command needs to be put in quotes.  If one of
-those commands returns an error the remaining commands are mot anymore
+those commands returns an error the remaining commands are not anymore
 run unless the command was prefixed with a single dash.
 
 A list of commands is available by using the command @code{help} and a

doc/gpg.texi

@@ -3554,7 +3554,7 @@ on the configuration file.
 @c @opindex use-only-openpgp-card
 @c Only access OpenPGP card's and no other cards.  This is a hidden
 @c option which could be used in case an old use case required the
-@c OpenPGP card while several cards are avaiable.  This option might be
+@c OpenPGP card while several cards are available.  This option might be
 @c removed if it turns out that nobody requires it.
 
 @end table
@@ -3945,7 +3945,7 @@ The program returns 0 if there are no severe errors, 1 if at least a
 signature was bad, and other error codes for fatal errors.
 
 Note that signature verification requires exact knowledge of what has
-been signed and by whom it has beensigned.  Using only the return code
+been signed and by whom it has been signed.  Using only the return code
 is thus not an appropriate way to verify a signature by a script.
 Either make proper use or the status codes or use the @command{gpgv}
 tool which has been designed to make signature verification easy for