indent: Fix spelling

--

These are non-substantive corrections for minor spelling mistakes
within the GnuPG codebase.

With something like this applied to the codebase, and a judiciously
tuned spellchecker integrated as part of a standard test suite, it
should be possible to keep a uniform orthography within the project.

GnuPG-bug-id: 7116

136 files changed, 233 insertions, 233 deletions

diff --git a/agent/agent.h b/agent/agent.h
index dbb3000dd..7ffbd5cc2 100644
--- a/agent/agent.h
+++ b/agent/agent.h
@@ -121,7 +121,7 @@ struct
   /* Flag disallowing bypassing of the warning.  */
   int enforce_passphrase_constraints;
 
-  /* The require minmum length of a passphrase. */
+  /* The required minimum length of a passphrase. */
   unsigned int min_passphrase_len;
 
   /* The minimum number of non-alpha characters in a passphrase.  */
@@ -286,7 +286,7 @@ struct server_control_s
     int algo;
     unsigned char value[MAX_DIGEST_LEN];
     unsigned int raw_value: 1;
-    unsigned int is_pss: 1;    /* DATA holds PSS formated data.  */
+    unsigned int is_pss: 1;    /* DATA holds PSS formatted data.  */
   } digest;
   unsigned int have_keygrip:  1;
   unsigned int have_keygrip1: 1;
diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c
index 4a999ca9a..ba37a775e 100644
--- a/agent/call-pinentry.c
+++ b/agent/call-pinentry.c
@@ -884,7 +884,7 @@ struct inq_cb_parm_s
 };
 
 
-/* Return true if PIN is indentical to the last generated pin.  */
+/* Return true if PIN is identical to the last generated pin.  */
 static int
 is_generated_pin (struct inq_cb_parm_s *parm, const char *pin)
 {
diff --git a/agent/command.c b/agent/command.c
index 417a8815f..3012680a1 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -251,7 +251,7 @@ reset_notify (assuan_context_t ctx, char *line)
 
   clear_nonce_cache (ctrl);
 
-  /* Note that a RESET does not clear the ephemeral store becuase
+  /* Note that a RESET does not clear the ephemeral store because
    * clients are used to issue a RESET on a connection.  */
 
   return 0;
diff --git a/agent/divert-scd.c b/agent/divert-scd.c
index d8c2bcca7..d390ebb06 100644
--- a/agent/divert-scd.c
+++ b/agent/divert-scd.c
@@ -90,7 +90,7 @@ has_percent0A_suffix (const char *string)
 
    INFO gets displayed as part of a generic string.  However if the
    first character of INFO is a vertical bar all up to the next
-   verical bar are considered flags and only everything after the
+   vertical bar are considered flags and only everything after the
    second vertical bar gets displayed as the full prompt.
 
    Flags:
diff --git a/agent/findkey.c b/agent/findkey.c
index 1f2938ea3..c0cbce7a2 100644
--- a/agent/findkey.c
+++ b/agent/findkey.c
@@ -1550,7 +1550,7 @@ agent_key_from_file (ctrl_t ctrl, const char *cache_nonce,
                 {
                   memcpy (*shadow_info, s, n);
                   /*
-                   * When it's a key on card (not on tpm2), maks sure
+                   * When it's a key on card (not on tpm2), make sure
                    * it's available.
                    */
                   if (strcmp (shadow_type, "t1-v1") == 0 && !grip)
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 3c71ba65d..3e1fb5d5b 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -1216,7 +1216,7 @@ main (int argc, char **argv)
    *  Now we are now working under our real uid
    */
 
-  /* The configuraton directories for use by gpgrt_argparser.  */
+  /* The configuration directories for use by gpgrt_argparser.  */
   gpgrt_set_confdir (GPGRT_CONFDIR_SYS, gnupg_sysconfdir ());
   gpgrt_set_confdir (GPGRT_CONFDIR_USER, gnupg_homedir ());
 
@@ -1225,7 +1225,7 @@ main (int argc, char **argv)
   pargs.argc = &argc;
   pargs.argv = &argv;
   /* We are re-using the struct, thus the reset flag.  We OR the
-   * flags so that the internal intialized flag won't be cleared. */
+   * flags so that the internal initialized flag won't be cleared. */
   pargs.flags |= (ARGPARSE_FLAG_RESET
                   | ARGPARSE_FLAG_KEEP
                   | ARGPARSE_FLAG_SYS
diff --git a/agent/protect.c b/agent/protect.c
index 7197cf7e6..6c9bbaebc 100644
--- a/agent/protect.c
+++ b/agent/protect.c
@@ -509,7 +509,7 @@ do_encryption (const unsigned char *hashbegin, size_t hashlen,
        ((sha1 salt no_of_iterations) 16byte_iv)
        encrypted_octet_string)
 
-     in canoncical format of course.  We use asprintf and %n modifier
+     in canonical format of course.  We use asprintf and %n modifier
      and dummy values as placeholders.  */
   {
     char countbuf[35];
diff --git a/agent/sexp-secret.c b/agent/sexp-secret.c
index ac8daa910..661681620 100644
--- a/agent/sexp-secret.c
+++ b/agent/sexp-secret.c
@@ -22,7 +22,7 @@
 #include "../common/sexp-parse.h"
 
 /*
- * When it's for ECC, fixup private key part in the cannonical SEXP
+ * When it's for ECC, fixup private key part in the canonical SEXP
  * representation in BUF.  If not ECC, do nothing.
  */
 gpg_error_t
diff --git a/agent/trustlist.c b/agent/trustlist.c
index fce23de15..a37705b8e 100644
--- a/agent/trustlist.c
+++ b/agent/trustlist.c
@@ -63,7 +63,7 @@ static const char headerblurb[] =
 "# well as empty lines are ignored.  Lines have a length limit but this\n"
 "# is not a serious limitation as the format of the entries is fixed and\n"
 "# checked by gpg-agent.  A non-comment line starts with optional white\n"
-"# space, followed by the SHA-1 fingerpint in hex, followed by a flag\n"
+"# space, followed by the SHA-1 fingerprint in hex, followed by a flag\n"
 "# which may be one of 'P', 'S' or '*' and optionally followed by a list of\n"
 "# other flags.  The fingerprint may be prefixed with a '!' to mark the\n"
 "# key as not trusted.  You should give the gpg-agent a HUP or run the\n"
@@ -736,7 +736,7 @@ agent_marktrusted (ctrl_t ctrl, const char *name, const char *fpr, int flag)
             insert a line break.  The double percent sign is actually
             needed because it is also a printf format string.  If you
             need to insert a plain % sign, you need to encode it as
-            "%%25".  The second "%s" gets replaced by a hexdecimal
+            "%%25".  The second "%s" gets replaced by a hexadecimal
             fingerprint string whereas the first one receives the name
             as stored in the certificate. */
          L_("Please verify that the certificate identified as:%%0A"
diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index e92a94231..a98d61f71 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -188,13 +188,13 @@ MAKE_J=6
 
 INST_NAME=gnupg-w32
 
-# Use this to override the installaion directory for native builds.
+# Use this to override the installation directory for native builds.
 INSTALL_PREFIX=none
 
 # Set this to the location of wixtools
 WIXPREFIX=$(shell readlink -f ~/w32root/wixtools)
 
-# If patchelf(1) is not availale disable the command.
+# If patchelf(1) is not available disable the command.
 PATCHELF := $(shell patchelf --version 2>/dev/null >/dev/null || echo "echo please run: ")patchelf
 
 # Read signing information from ~/.gnupg-autogen.rc
@@ -1401,7 +1401,7 @@ endif
 
 
 #
-# Check availibility of standard tools and prepare everything.
+# Check availability of standard tools and prepare everything.
 #
 check-tools: $(stampdir)/stamp-directories
 
diff --git a/build-aux/speedo/w32/README.txt b/build-aux/speedo/w32/README.txt
index 7c2909507..df7b3a807 100644
--- a/build-aux/speedo/w32/README.txt
+++ b/build-aux/speedo/w32/README.txt
@@ -60,7 +60,7 @@ Below is the README file as distributed with the GnuPG source.
 4. Software Versions of the Included Packages
 =============================================
 
-GnuPG for Windows depends on several independet developed packages
+GnuPG for Windows depends on several independent developed packages
 which are part of the installation.  These packages along with their
 version numbers and the SHA-1 checksums of their compressed tarballs
 are listed here:
diff --git a/build-aux/speedo/w32/g4wihelp.c b/build-aux/speedo/w32/g4wihelp.c
index bae4b837c..33d186c40 100644
--- a/build-aux/speedo/w32/g4wihelp.c
+++ b/build-aux/speedo/w32/g4wihelp.c
@@ -24,7 +24,7 @@
  ************************************************************
  * The code for the splash screen has been taken from the Splash
  * plugin of the NSIS 2.04 distribution.  That code comes without
- * explicit copyright notices in tyhe source files or author names, it
+ * explicit copyright notices in the source files or author names, it
  * seems that it has been written by Justin Frankel; not sure about
  * the year, though. [wk 2005-11-28]
  *
diff --git a/common/asshelp.c b/common/asshelp.c
index 957ca994d..f17a32e52 100644
--- a/common/asshelp.c
+++ b/common/asshelp.c
@@ -695,7 +695,7 @@ get_assuan_server_version (assuan_context_t ctx, int mode, char **r_version)
 
 /* Print a warning if the server's version number is less than our
  * version number.  Returns an error code on a connection problem.
- * CTX is the Assuan context, SERVERNAME is the name of teh server,
+ * CTX is the Assuan context, SERVERNAME is the name of the server,
  * STATUS_FUNC and STATUS_FUNC_DATA is a callback to emit status
  * messages.  If PRINT_HINTS is set additional hints are printed.  For
  * MODE see get_assuan_server_version.  */
diff --git a/common/audit.c b/common/audit.c
index 42a2cf6d6..551563c61 100644
--- a/common/audit.c
+++ b/common/audit.c
@@ -44,7 +44,7 @@ struct log_item_s
   gpg_error_t err;     /* The logged error code.  */
   int intvalue;        /* A logged integer value.  */
   char *string;        /* A malloced string or NULL.  */
-  ksba_cert_t cert;    /* A certifciate or NULL. */
+  ksba_cert_t cert;    /* A certificate or NULL. */
   unsigned int have_err:1;
   unsigned int have_intvalue:1;
 };
diff --git a/common/audit.h b/common/audit.h
index 05f39533d..9fadba1b2 100644
--- a/common/audit.h
+++ b/common/audit.h
@@ -76,7 +76,7 @@ typedef enum
     /* The signature is a detached one. */
 
     AUDIT_CERT_ONLY_SIG,
-    /* A certifciate only signature has been detected.  */
+    /* A certificate only signature has been detected.  */
 
     AUDIT_DATA_HASH_ALGO,  /* int */
     /* The hash algo given as argument is used for the data.  This
diff --git a/common/compliance.c b/common/compliance.c
index 2df10d2e2..d421b0371 100644
--- a/common/compliance.c
+++ b/common/compliance.c
@@ -42,7 +42,7 @@ static int module;
 
 /* This value is used by DSA and RSA checks in addition to the hard
  * coded length checks.  It allows one to increase the required key length
- * using a confue file.  */
+ * using a config file.  */
 static unsigned int min_compliant_rsa_length;
 
 /* Return the address of a compliance cache variable for COMPLIANCE.
diff --git a/common/dotlock.c b/common/dotlock.c
index fe6d7fe71..ae77fad8a 100644
--- a/common/dotlock.c
+++ b/common/dotlock.c
@@ -1450,7 +1450,7 @@ dotlock_take_unix (dotlock_t h, long timeout)
       int wtimereal;
 
       if (ownerchanged)
-        wtime = 0;  /* Reset because owner chnaged.  */
+        wtime = 0;  /* Reset because owner changed.  */
 
       wtimereal = next_wait_interval (&wtime, &timeout);
       if (!timeout)
diff --git a/common/gettime.c b/common/gettime.c
index 136c47ca7..180f388bb 100644
--- a/common/gettime.c
+++ b/common/gettime.c
@@ -124,7 +124,7 @@ timegm (struct tm *tm)
 
 /* Version of the GNU timegm which returns an unsigned 64 bit integer
  * instead of the usually signed time_t.  On error (uint64_t)(-1) is
- * returned.  This function is mostly here becuase on 32 bit Windows
+ * returned.  This function is mostly here because on 32 bit Windows
  * we have an internal API to get the system time even after
  * 2023-01-19.  For 32 bit Unix we need to suffer from the too short
  * time_t and no system function to construct the time from a tm.  */
diff --git a/common/homedir.c b/common/homedir.c
index deb6f3616..392910867 100644
--- a/common/homedir.c
+++ b/common/homedir.c
@@ -1089,7 +1089,7 @@ gnupg_daemon_rootdir (void)
 
       n = GetSystemDirectoryA (path, sizeof path);
       if (!n || n >= sizeof path)
-        name = xstrdup ("/"); /* Error - use the curret top dir instead.  */
+        name = xstrdup ("/"); /* Error - use the current top dir instead.  */
       else
         name = xstrdup (path);
       gpgrt_annotate_leaked_object (name);
@@ -1306,7 +1306,7 @@ _gnupg_socketdir_internal (int skip_checks, unsigned *r_info)
       strcat (prefixbuffer, gnupgname);
     }
 
-  /* Check whether the gnupg sub directory (or the specified diretory)
+  /* Check whether the gnupg sub directory (or the specified directory)
    * has proper permissions.  */
   if (stat (prefix, &sb))
     {
diff --git a/common/iobuf.c b/common/iobuf.c
index e46eeac95..7aaf3a878 100644
--- a/common/iobuf.c
+++ b/common/iobuf.c
@@ -1670,7 +1670,7 @@ iobuf_ioctl (iobuf_t a, iobuf_ioctl_t cmd, int intval, void *ptrval)
       /* Peek at a justed opened file.  Use this only directly after a
        * file has been opened for reading.  Don't use it after you did
        * a seek.  This works only if just file filter has been
-       * pushed.  Expects a buffer wit size INTVAL at PTRVAL and returns
+       * pushed.  Expects a buffer with size INTVAL at PTRVAL and returns
        * the number of bytes put into the buffer.  */
       if (DBG_IOBUF)
 	log_debug ("iobuf-%d.%d: ioctl '%s' peek\n",
diff --git a/common/iobuf.h b/common/iobuf.h
index 4354c718d..5fa064c20 100644
--- a/common/iobuf.h
+++ b/common/iobuf.h
@@ -204,7 +204,7 @@ struct iobuf_struct
     byte *buf;
   } d;
 
-  /* A external drain buffer for reading/writting data skipping internal
+  /* A external drain buffer for reading/writing data skipping internal
      draint buffer D.BUF.  This allows zerocopy operation reducing
      processing overhead across filter stack.
 
diff --git a/common/mkdir_p.h b/common/mkdir_p.h
index 1e939b32b..08f388916 100644
--- a/common/mkdir_p.h
+++ b/common/mkdir_p.h
@@ -34,7 +34,7 @@
 
 /* Create a directory as well as any missing parents.
 
-   The arguments must be NULL termianted.  If DIRECTORY_COMPONENTS...
+   The arguments must be NULL terminated.  If DIRECTORY_COMPONENTS...
    consists of two elements, "foo/bar" and "xyzzy", this function will
    first try to create the directory "foo/bar" and then the directory
    "foo/bar/xyzzy".  On success returns 0, otherwise an error code is
diff --git a/common/openpgp-fpr.c b/common/openpgp-fpr.c
index 7b110085f..7860d3872 100644
--- a/common/openpgp-fpr.c
+++ b/common/openpgp-fpr.c
@@ -136,7 +136,7 @@ compute_openpgp_fpr (int keyversion, int pgpalgo, unsigned long timestamp,
   /*   log_printhex (iov[i].data, iov[i].len, "cmpfpr i=%d: ", i); */
 
   err = gcry_md_hash_buffers (hashalgo, 0, result, iov, iovcnt);
-  /* log_printhex (result, 20, "fingerpint: "); */
+  /* log_printhex (result, 20, "fingerprint: "); */
 
   /* Better clear the first element because it was set by us.  */
   iov[0].size = 0;
diff --git a/common/openpgp-oid.c b/common/openpgp-oid.c
index 92f0dfbcd..0a7aae000 100644
--- a/common/openpgp-oid.c
+++ b/common/openpgp-oid.c
@@ -129,7 +129,7 @@ make_flagged_int (unsigned long value, char *buf, size_t buflen)
 
   /* fixme: figure out the number of bits in an ulong and start with
      that value as shift (after making it a multiple of 7) a more
-     straigtforward implementation is to do it in reverse order using
+     straightforward implementation is to do it in reverse order using
      a temporary buffer - saves a lot of compares */
   for (more=0, shift=28; shift > 0; shift -= 7)
     {
diff --git a/common/session-env.c b/common/session-env.c
index e774c1d9b..3ffe3f0f5 100644
--- a/common/session-env.c
+++ b/common/session-env.c
@@ -315,7 +315,7 @@ session_env_putenv (session_env_t se, const char *string)
 }
 
 
-/* Same as session_env_putenv but with name and value given as distict
+/* Same as session_env_putenv but with name and value given as distinct
    values.  */
 gpg_error_t
 session_env_setenv (session_env_t se, const char *name, const char *value)
@@ -355,7 +355,7 @@ session_env_getenv (session_env_t se, const char *name)
    object.  The returned value is valid as long as SE is valid and as
    long it has not been removed or updated by a call to
    session_env_putenv.  If the variable does not exist, the function
-   tries to return the value trough a call to getenv; if that returns
+   tries to return the value through a call to getenv; if that returns
    a value, this value is recorded and used.  If no value could be
    found, returns NULL.  The caller must not change the returned
    value. */
diff --git a/common/sexp-parse.h b/common/sexp-parse.h
index 0403d65f5..86372e028 100644
--- a/common/sexp-parse.h
+++ b/common/sexp-parse.h
@@ -104,7 +104,7 @@ smatch (unsigned char const **buf, size_t buflen, const char *token)
   return 1;
 }
 
-/* Format VALUE for use as the length indicatior of an S-expression.
+/* Format VALUE for use as the length indicator of an S-expression.
    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
diff --git a/common/sexputil.c b/common/sexputil.c
index 15fd7cf1d..f9842391e 100644
--- a/common/sexputil.c
+++ b/common/sexputil.c
@@ -199,7 +199,7 @@ make_canon_sexp_pad (gcry_sexp_t sexp, int secure,
 }
 
 /* Return the so called "keygrip" which is the SHA-1 hash of the
-   public key parameters expressed in a way dependend on the algorithm.
+   public key parameters expressed in a way dependent on the algorithm.
 
    KEY is expected to be an canonical encoded S-expression with a
    public or private key. KEYLEN is the length of that buffer.
@@ -1195,7 +1195,7 @@ cipher_mode_to_string (int mode)
     }
 }
 
-/* Return the cannonical name of the ECC curve in KEY.  */
+/* Return the canonical name of the ECC curve in KEY.  */
 const char *
 get_ecc_curve_from_key (gcry_sexp_t key)
 {
diff --git a/common/sysutils.c b/common/sysutils.c
index 780af58bd..2bacae2ea 100644
--- a/common/sysutils.c
+++ b/common/sysutils.c
@@ -588,7 +588,7 @@ translate_sys2libc_fd_int (int fd, int for_write)
 /*
  * Parse the string representation of a file reference (file handle on
  * Windows or file descriptor on POSIX) in FDSTR.  The string
- * representation may be either of folllowing:
+ * representation may be either of following:
 
  *  (1) 0, 1, or 2 which means stdin, stdout, and stderr, respectively.
  *  (2) Integer representation (by %d of printf).
@@ -1106,7 +1106,7 @@ modestr_to_mode (const char *modestr, mode_t oldmode)
 int
 gnupg_mkdir (const char *name, const char *modestr)
 {
-  /* Note that gpgrt_mkdir also sets ERRNO in addition to returing an
+  /* Note that gpgrt_mkdir also sets ERRNO in addition to returning an
    * gpg-error style error code.  */
   return gpgrt_mkdir (name, modestr);
 }
diff --git a/common/t-iobuf.c b/common/t-iobuf.c
index aacf27a8b..9aa0720f6 100644
--- a/common/t-iobuf.c
+++ b/common/t-iobuf.c
@@ -29,7 +29,7 @@
  */
 
 /* The whole code here does not very fill into our general test frame
- * work patter.  But let's keep it as it is.  */
+ * work pattern.  But let's keep it as it is.  */
 
 #include <config.h>
 #include <stdio.h>
diff --git a/common/tlv-builder.c b/common/tlv-builder.c
index 59e2691e0..0fa5fc2cc 100644
--- a/common/tlv-builder.c
+++ b/common/tlv-builder.c
@@ -95,7 +95,7 @@ ensure_space (tlv_builder_t tb)
  * element is described by CLASS, TAG, VALUE, and VALUEEN.  CLASS and
  * TAG must describe a primitive element and (VALUE,VALUELEN) specify
  * its value.  The value is a pointer and its object must not be
- * changed as long as the instance TB exists.  For a TAG_NULL no vlaue
+ * changed as long as the instance TB exists.  For a TAG_NULL no value
  * is expected.  Errors are not returned but recorded for later
  * retrieval.  */
 void
diff --git a/common/tlv-parser.c b/common/tlv-parser.c
index c9b33d4b6..2cafac3e9 100644
--- a/common/tlv-parser.c
+++ b/common/tlv-parser.c
@@ -42,7 +42,7 @@ struct bufferlist_s
 /* An object to control the ASN.1 parsing.  */
 struct tlv_parser_s
 {
-  /* The orginal buffer with the entire pkcs#12 object and its length.  */
+  /* The original buffer with the entire pkcs#12 object and its length.  */
   const unsigned char *origbuffer;
   size_t origbufsize;
 
diff --git a/common/tlv.h b/common/tlv.h
index afaa649d9..3136195a5 100644
--- a/common/tlv.h
+++ b/common/tlv.h
@@ -141,7 +141,7 @@ void tlv_builder_add_end (tlv_builder_t tb);
 gpg_error_t tlv_builder_finalize (tlv_builder_t tb,
                                   void **r_obj, size_t *r_objlen);
 
-/* Wite a TLV header to MEMBUF.  */
+/* Write a TLV header to MEMBUF.  */
 void put_tlv_to_membuf (membuf_t *membuf, int class, int tag,
                         int constructed, size_t length);
 
diff --git a/common/util.h b/common/util.h
index f8447aea7..671ffbcb7 100644
--- a/common/util.h
+++ b/common/util.h
@@ -323,7 +323,7 @@ void setup_libgcrypt_logging (void);
 /* Print an out of core message and die.  */
 void xoutofcore (void);
 
-/* Wrapper aroung gpgrt_reallocarray.  Uses the gpgrt alloc function
+/* Wrapper around gpgrt_reallocarray.  Uses the gpgrt alloc function
  * which redirects to the Libgcrypt versions via
  * init_common_subsystems.  Thus this can be used interchangeable with
  * the other alloc functions. */
diff --git a/configure.ac b/configure.ac
index 1f0142140..71c061481 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1601,7 +1601,7 @@ if test "$build_tpm2d" = "yes"; then
     # until version 2.4.0.
     #
     # Note: the missing API is fairly serious and is also easily backportable
-    # so keep the check below as is intead of going by library version number.
+    # so keep the check below as is instead of going by library version number.
     ##
     AC_CHECK_LIB(tss2-esys, Esys_TR_GetTpmHandle, [], [
 	AC_MSG_WARN([Need Esys_TR_GetTpmHandle API (usually requires Intel TSS 2.4.0 or later, disabling TPM support)])
@@ -1638,7 +1638,7 @@ if test "$GCC" = yes; then
     mycflags=
     mycflags_save=$CFLAGS
 
-    # Check whether gcc does not emit a diagnositc for unknown -Wno-*
+    # Check whether gcc does not emit a diagnostic for unknown -Wno-*
     # options.  This is the case for gcc >= 4.6
     AC_MSG_CHECKING([if gcc ignores unknown -Wno-* options])
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
diff --git a/dirmngr/ONEWS b/dirmngr/ONEWS
index cb2050748..154d8e0bf 100644
--- a/dirmngr/ONEWS
+++ b/dirmngr/ONEWS
@@ -55,7 +55,7 @@ Noteworthy changes in version 1.0.1 (2007-08-16)
 Noteworthy changes in version 1.0.0 (2006-11-29)
 ------------------------------------------------
 
- * Bumbed the version number.
+ * Bumped the version number.
 
  * Removed included gettext.  We now require the system to provide a
    suitable installation.
@@ -174,7 +174,7 @@ Noteworthy changes in version 0.5.4 (2004-04-29)
 ------------------------------------------------
 
  * New commands --ocsp-responder and --ocsp-signer to define a default
-   OCSP reponder if a certificate does not contain an assigned OCSP
+   OCSP responder if a certificate does not contain an assigned OCSP
    responder.
 
 
diff --git a/dirmngr/certcache.c b/dirmngr/certcache.c
index b7b5b3d15..07a47a525 100644
--- a/dirmngr/certcache.c
+++ b/dirmngr/certcache.c
@@ -225,7 +225,7 @@ cert_compute_fpr (ksba_cert_t cert, unsigned char *digest)
 
 
 
-/* Cleanup one slot.  This releases all resourses but keeps the actual
+/* Cleanup one slot.  This releases all resources but keeps the actual
    slot in the cache marked for reuse. */
 static void
 clean_cache_slot (cert_item_t ci)
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index d58a27372..5a2a45bc1 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -1104,12 +1104,12 @@ main (int argc, char **argv)
 
   socket_name = dirmngr_socket_name ();
 
-  /* The configuraton directories for use by gpgrt_argparser.  */
+  /* The configuration directories for use by gpgrt_argparser.  */
   gpgrt_set_confdir (GPGRT_CONFDIR_SYS, gnupg_sysconfdir ());
   gpgrt_set_confdir (GPGRT_CONFDIR_USER, gnupg_homedir ());
 
   /* We are re-using the struct, thus the reset flag.  We OR the
-   * flags so that the internal intialized flag won't be cleared. */
+   * flags so that the internal initialized flag won't be cleared. */
   argc = orig_argc;
   argv = orig_argv;
   pargs.argc = &argc;
@@ -1748,7 +1748,7 @@ dirmngr_deinit_default_ctrl (ctrl_t ctrl)
 
    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:
+   assumed to be colon separated with these fields:
 
    1. field: Hostname
    2. field: Portnumber
diff --git a/dirmngr/dirmngr.h b/dirmngr/dirmngr.h
index 50c97f140..ace40e6d5 100644
--- a/dirmngr/dirmngr.h
+++ b/dirmngr/dirmngr.h
@@ -241,7 +241,7 @@ struct server_control_s
   int audit_events;  /* Send audit events to client.  */
   char *http_proxy;  /* The used http_proxy or NULL.  */
 
-  nvc_t rootdse;     /* Container wit the rootDSE properties.  */
+  nvc_t rootdse;     /* Container with the rootDSE properties.  */
 
   unsigned int timeout; /* Timeout for connect calls in ms.  */
 
diff --git a/dirmngr/dns.c b/dirmngr/dns.c
index e0eb33244..f023e7395 100644
--- a/dirmngr/dns.c
+++ b/dirmngr/dns.c
@@ -9761,7 +9761,7 @@ struct dns_addrinfo *dns_ai_open(const char *host, const char *serv, enum dns_ty
 	/*
 	 * FIXME: If an explicit A or AAAA record type conflicts with
 	 * .ai_family or with resconf.family (i.e. AAAA specified but
-	 * AF_INET6 not in interection of .ai_family and resconf.family),
+	 * AF_INET6 not in intersection of .ai_family and resconf.family),
 	 * then what?
 	 */
 	switch (ai->qtype) {
diff --git a/dirmngr/http-ntbtls.c b/dirmngr/http-ntbtls.c
index 2191acb60..c251f57ef 100644
--- a/dirmngr/http-ntbtls.c
+++ b/dirmngr/http-ntbtls.c
@@ -78,7 +78,7 @@ gnupg_http_tls_verify_cb (void *opaque,
   validate_flags = VALIDATE_FLAG_TLS;
 
   /* If we are using the standard hkps:// pool use the dedicated root
-   * certificate.  Note that this differes from the GnuTLS
+   * certificate.  Note that this differs from the GnuTLS
    * implementation which uses this special certificate only if no
    * other certificates are configured. */
   /* Disabled for 2.3.2 to due problems with the standard hkps pool.  */
diff --git a/dirmngr/http.c b/dirmngr/http.c
index 6ae9029be..5723a13f2 100644
--- a/dirmngr/http.c
+++ b/dirmngr/http.c
@@ -295,7 +295,7 @@ struct http_session_s
   } verify;
   char *servername; /* Malloced server name.  */
 
-  /* A callback function to log details of TLS certifciates.  */
+  /* A callback function to log details of TLS certificates.  */
   void (*cert_log_cb) (http_session_t, gpg_error_t, const char *,
                        const void **, size_t *);
 
@@ -2018,7 +2018,7 @@ w32_get_proxy (const char *url)
  * If OVERRIDE_PROXY is not NULL and not empty, this proxy will be
  * used instead of any configured or dynamically determined proxy.  If
  * the function runs into an error an error code is returned and NULL
- * is stored at R_PROXY.  If the fucntion was successful and a proxy
+ * is stored at R_PROXY.  If the function was successful and a proxy
  * is to be used, information on the procy is stored at R_PROXY; if no
  * proxy shall be used R_PROXY is set to NULL.  Caller should always
  * use release_proxy_info on the value stored at R_PROXY.  */
@@ -2358,8 +2358,8 @@ run_gnutls_handshake (http_t hd, const char *server)
 #endif /*HTTP_USE_GNUTLS*/
 
 
-/* It INPUTSTRING is NULL get the intial token.  If INPUTSTRING is not
- * NULL, decode the string and use this as input from teh server.  On
+/* It INPUTSTRING is NULL get the initial token.  If INPUTSTRING is not
+ * NULL, decode the string and use this as input from the server.  On
  * success the final output token is stored at PROXY->OUTTOKEN and
  * OUTTOKLEN.  IF the authentication succeeded OUTTOKLEN is zero. */
 static gpg_error_t
@@ -2379,7 +2379,7 @@ proxy_get_token (proxy_info_t proxy, const char *inputstring)
 
   if (inputstring)
     {
-      /* The input is expected in the token parameter but the paremter
+      /* The input is expected in the token parameter but the parameter
        * name is often forgotten.  Thus we simply detect the parameter
        * name and skip it, assuming no other parameters are given.  */
       if (!strncmp (inputstring, "token=", 6))
@@ -4424,8 +4424,8 @@ same_host_p (parsed_uri_t a, parsed_uri_t b)
 
 /* Prepare a new URL for a HTTP redirect.  INFO has flags controlling
  * the operation, STATUS_CODE is used for diagnostics, LOCATION is the
- * value of the "Location" header, and R_URL reveives the new URL on
- * success or NULL or error.  Note that INFO->ORIG_URL is
+ * value of the "Location" header, and R_URL receives the new URL on
+ * success or NULL on error.  Note that INFO->ORIG_URL is
  * required.  */
 gpg_error_t
 http_prepare_redirect (http_redir_info_t *info, unsigned int status_code,
@@ -4596,7 +4596,7 @@ http_status2string (unsigned int status)
 }
 
 
-/* Fucntion called on SIGHUP to flush internal variables.  */
+/* Function called on SIGHUP to flush internal variables.  */
 void
 http_reinitialize (void)
 {
diff --git a/dirmngr/ks-engine-ldap.c b/dirmngr/ks-engine-ldap.c
index 688972a89..c2c57d819 100644
--- a/dirmngr/ks-engine-ldap.c
+++ b/dirmngr/ks-engine-ldap.c
@@ -53,7 +53,7 @@
 #define SERVERINFO_PGPKEYV2 2 /* Needs "pgpKeyV2" instead of "pgpKey"*/
 #define SERVERINFO_SCHEMAV2 4 /* Version 2 of the Schema.            */
 #define SERVERINFO_NTDS     8 /* Server is an Active Directory.      */
-#define SERVERINFO_GENERIC 16 /* Connected in genric mode.           */
+#define SERVERINFO_GENERIC 16 /* Connected in generic mode.          */
 
 
 /* The page size requested from the server.  */
@@ -1257,7 +1257,7 @@ return_all_attributes (LDAP *ld, LDAPMessage *msg, estream_t *fp)
     }
 
   /* Always print the DN - note that by using only unbkown attributes
-   * it is pissible to list just the DNs with out addiional
+   * it is possible to list just the DNs with out additional
    * linefeeds.  */
   es_fprintf (*fp, "Dn: %s\n", mydn? mydn : "[oops DN missing]");
 
@@ -1307,7 +1307,7 @@ return_all_attributes (LDAP *ld, LDAPMessage *msg, estream_t *fp)
           len = values[idx]->bv_len;
           while (len && (s = memchr (val, '\n', len)))
             {
-              s++; /* We als want to print the LF.  */
+              s++; /* We also want to print the LF.  */
               if (es_fwrite (val, s - val, 1, *fp) != 1)
                 goto fwrite_failed;
               len -= (s-val);
@@ -2361,7 +2361,7 @@ modlist_free (LDAPMod **modlist)
       LDAPMod *mod = *ml;
       char **ptr;
 
-      /* The list of values is a NULL termianted array of pointers.
+      /* The list of values is a NULL terminated array of pointers.
 	 If the list is NULL, there are no values.  */
 
       if (mod->mod_values)
@@ -2460,7 +2460,7 @@ uncescape (char *str)
 /* Given one line from an info block (`gpg --list-{keys,sigs}
    --with-colons KEYID'), pull it apart and fill in the modlist with
    the relevant (for the LDAP schema) attributes.  EXTRACT_STATE
-   should initally be set to 0 by the caller.  SCHEMAV2 is set if the
+   should initially be set to 0 by the caller.  SCHEMAV2 is set if the
    server supports the version 2 schema.  */
 static void
 extract_attributes (LDAPMod ***modlist, int *extract_state,
@@ -2620,7 +2620,7 @@ extract_attributes (LDAPMod ***modlist, int *extract_state,
 
 	  memset (&tm, 0, sizeof (tm));
 
-	  /* parse_timestamp handles both seconds fromt he epoch and
+	  /* parse_timestamp handles both seconds from the epoch and
 	     ISO 8601 format.  We also need to handle YYYY-MM-DD
 	     format (as generated by gpg1 --with-colons --list-key).
 	     Check that first and then if it fails, then try
@@ -2668,7 +2668,7 @@ extract_attributes (LDAPMod ***modlist, int *extract_state,
 
 	  memset (&tm, 0, sizeof (tm));
 
-	  /* parse_timestamp handles both seconds fromt he epoch and
+	  /* parse_timestamp handles both seconds from the epoch and
 	     ISO 8601 format.  We also need to handle YYYY-MM-DD
 	     format (as generated by gpg1 --with-colons --list-key).
 	     Check that first and then if it fails, then try
diff --git a/dirmngr/ldap-misc.c b/dirmngr/ldap-misc.c
index c3a659d5c..a3aef0e62 100644
--- a/dirmngr/ldap-misc.c
+++ b/dirmngr/ldap-misc.c
@@ -220,7 +220,7 @@ ldap_to_gpg_err (LDAP *ld)
  *  ^&SCOPE&(objectClasses=*)
  *
  * Give a scope and a filter.  Note that R_SCOPE is only changed if a
- * STRING has scope parameter.  Setting this initally to -1 allows to
+ * STRING has scope parameter.  Setting this initially to -1 allows to
  * detect this case.
  */
 gpg_error_t
diff --git a/dirmngr/ldap.c b/dirmngr/ldap.c
index b80012d03..c1ea04979 100644
--- a/dirmngr/ldap.c
+++ b/dirmngr/ldap.c
@@ -256,7 +256,7 @@ url_fetch_ldap (ctrl_t ctrl, const char *url, ksba_reader_t *reader)
     }
 
   if (ludp->lud_scheme && !strcmp (ludp->lud_scheme, "ldaps"))
-    tls_mode = 2; /* LDAP-over-TLS here becuase we get it from certs. */
+    tls_mode = 2; /* LDAP-over-TLS here because we get it from certs. */
   else
     tls_mode = 0;
 
@@ -524,7 +524,7 @@ make_one_filter (const char *pattern, char **r_result)
       if (*pattern)
         {
           /* We need just the BaseDN.  This assumes that the Subject
-           * is correcly stored in the DT.  This is however not always
+           * is correctly stored in the DT.  This is however not always
            * the case and the actual DN is different from the
            * subject.  In this case we won't find anything.  */
           if (extfilt_need_escape (pattern)
@@ -606,7 +606,7 @@ make_one_filter (const char *pattern, char **r_result)
 /* Prepare an LDAP query to return the cACertificate attribute for DN.
  * All configured default servers are queried until one responds.
  * This function returns an error code or 0 and stored a newly
- * allocated contect object at CONTEXT on success. */
+ * allocated context object at CONTEXT on success. */
 gpg_error_t
 start_cacert_fetch_ldap (ctrl_t ctrl, cert_fetch_context_t *r_context,
                          const char *dn)
@@ -778,7 +778,7 @@ start_cert_fetch_ldap (ctrl_t ctrl, cert_fetch_context_t *r_context,
       if (argc >= DIM (argv) - 1)
         {
           /* Too many patterns.  It does not make sense to allow an
-             arbitrary number of patters because the length of the
+             arbitrary number of patterns because the length of the
              command line is limited anyway.  */
           err = gpg_error (GPG_ERR_RESOURCE_LIMIT);
           goto leave;
diff --git a/dirmngr/ldapserver.c b/dirmngr/ldapserver.c
index ed38c7101..8cd193f86 100644
--- a/dirmngr/ldapserver.c
+++ b/dirmngr/ldapserver.c
@@ -60,7 +60,7 @@ ldapserver_list_free (ldap_server_t servers)
  * Flags are:
  *
  *   starttls  := Use STARTTLS with a default port of 389
- *   ldaptls   := Tunnel LDAP trough a TLS tunnel with default port 636
+ *   ldaptls   := Tunnel LDAP through a TLS tunnel with default port 636
  *   plain     := Switch to plain unsecured LDAP.
  *   (The last of these 3 flags is the effective one)
  *   ntds      := Use Active Directory authentication
diff --git a/dirmngr/ocsp.c b/dirmngr/ocsp.c
index ad7ed962a..7de8b10e4 100644
--- a/dirmngr/ocsp.c
+++ b/dirmngr/ocsp.c
@@ -31,7 +31,7 @@
 #include "certcache.h"
 #include "ocsp.h"
 
-/* The maximum size we allow as a response from an OCSP reponder. */
+/* The maximum size we allow as a response from an OCSP responder. */
 #define MAX_RESPONSE_SIZE 65536
 
 
@@ -526,7 +526,7 @@ check_signature_core (ctrl_t ctrl, ksba_cert_t cert, gcry_sexp_t s_sig,
 /* Check the signature of an OCSP response.  OCSP is the context,
    S_SIG the signature value and MD the handle of the hash we used for
    the response.  This function automagically finds the correct public
-   key.  If SIGNER_FPR_LIST is not NULL, the default OCSP reponder has been
+   key.  If SIGNER_FPR_LIST is not NULL, the default OCSP responder has been
    used and thus the certificate is one of those identified by
    the fingerprints. */
 static gpg_error_t
@@ -651,7 +651,7 @@ check_signature (ctrl_t ctrl,
    or directly through the CERT object is valid by running an OCSP
    transaction.  With FORCE_DEFAULT_RESPONDER set only the configured
    default responder is used.  If R_REVOKED_AT or R_REASON are not
-   NULL and the certificat has been revoked the revocation time and
+   NULL and the certificate has been revoked the revocation time and
    the reasons are stored there. */
 gpg_error_t
 ocsp_isvalid (ctrl_t ctrl, ksba_cert_t cert, const char *cert_fpr,
@@ -723,7 +723,7 @@ ocsp_isvalid (ctrl_t ctrl, ksba_cert_t cert, const char *cert_fpr,
     }
 
   /* Figure out the OCSP responder to use.
-     1. Try to get the reponder from the certificate.
+     1. Try to get the responder from the certificate.
         We do only take http and https style URIs into account.
      2. If this fails use the default responder, if any.
    */
diff --git a/dirmngr/server.c b/dirmngr/server.c
index 32c85d07b..710317e5e 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -932,7 +932,7 @@ proc_wkd_get (ctrl_t ctrl, assuan_context_t ctx, char *line)
       err = get_dns_srv (ctrl, domain, "openpgpkey", NULL, &srvs, &srvscount);
       if (err)
         {
-          /* Ignore server failed becuase there are too many resolvers
+          /* Ignore server failed because there are too many resolvers
            * which do not work as expected.  */
           if (gpg_err_code (err) == GPG_ERR_SERVER_FAILED)
             err = 0; /*(srvcount is guaranteed to be 0)*/
diff --git a/dirmngr/t-ldap-parse-uri.c b/dirmngr/t-ldap-parse-uri.c
index 984e1412f..e46bbee83 100644
--- a/dirmngr/t-ldap-parse-uri.c
+++ b/dirmngr/t-ldap-parse-uri.c
@@ -291,7 +291,7 @@ main (int argc, char **argv)
     }
   if (argc)
     {
-      fprintf (stderr, PGM ": no argumenst are expected\n");
+      fprintf (stderr, PGM ": no arguments are expected\n");
       exit (1);
     }
 
diff --git a/dirmngr/validate.c b/dirmngr/validate.c
index 02db3c270..94a468b38 100644
--- a/dirmngr/validate.c
+++ b/dirmngr/validate.c
@@ -42,7 +42,7 @@ enum cert_usage_modes
     CERT_USAGE_MODE_VRFY,  /* Usable for verification.          */
     CERT_USAGE_MODE_DECR,  /* Usable for decryption.            */
     CERT_USAGE_MODE_CERT,  /* Usable for cert signing.          */
-    CERT_USAGE_MODE_OCSP,  /* Usable for OCSP respone signing.  */
+    CERT_USAGE_MODE_OCSP,  /* Usable for OCSP response signing. */
     CERT_USAGE_MODE_CRL    /* Usable for CRL signing.           */
   };
 
@@ -56,7 +56,7 @@ struct chain_item_s
   ksba_cert_t cert;      /* The certificate.  */
   unsigned char fpr[20]; /* Fingerprint of the certificate.  */
   int is_self_signed;    /* This certificate is self-signed.  */
-  int is_valid;          /* The certifiate is valid except for revocations.  */
+  int is_valid;          /* The certificate is valid except for revocations.  */
 };
 typedef struct chain_item_s *chain_item_t;
 
@@ -173,7 +173,7 @@ check_cert_policy (ksba_cert_t cert)
   if (err)
     return err;
 
-  /* STRING is a line delimited list of certifiate policies as stored
+  /* STRING is a line delimited list of certificate policies as stored
      in the certificate.  The line itself is colon delimited where the
      first field is the OID of the policy and the second field either
      N or C for normal or critical extension */
diff --git a/doc/DETAILS b/doc/DETAILS
index a278d045f..c689046be 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -132,7 +132,7 @@ described here.
 *** Field 5 - KeyID
 
     This is the 64 bit keyid as specified by OpenPGP and the last 64
-    bit of the SHA-1 fingerprint of an X.509 certifciate.
+    bit of the SHA-1 fingerprint of an X.509 certificate.
 
 *** Field 6 - Creation date
 
@@ -1101,7 +1101,7 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB:
                         gpg-agent.
     - keyedit.passwd :: Changing the password failed.
     - nomdc_with_legacy_cipher :: The message was not MDC protected.
-         Use the command line to lern about a workaround.
+         Use the command line to learn about a workaround.
     - random-compliance :: The random number generator or the used
          version of Libgcrypt do not fulfill the requirements of the
          current compliance setting.  The error code is often
@@ -1179,7 +1179,7 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB:
     <total>.  For example "B", "KiB", or "MiB".
 
 *** BACKUP_KEY_CREATED <fingerprint> <fname>
-    A backup of a key identified by <fingerprint> has been writte to
+    A backup of a key identified by <fingerprint> has been written to
     the file <fname>; <fname> is percent-escaped.
 
 *** MOUNTPOINT <name>
@@ -1263,7 +1263,7 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB:
 
 *** CERTINFO <certtype> <certref> [<label>]
 
-    This status is emitted for X.509 certifcates.
+    This status is emitted for X.509 certificates.
     CERTTYPE is a number indicating the type of the certificate:
      0   := Unknown
      100 := Regular X.509 cert
@@ -1274,7 +1274,7 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB:
 
     CERTREF identifies the certificate uniquely on the card and may be
     used to match it with a key's KEYREF.  LABEL is an optional human
-    readable decription of the certificate; it won't have any space in
+    readable description of the certificate; it won't have any space in
     it and is percent encoded.
 
 *** MANUFACTURER <n> [<string>]
@@ -1297,7 +1297,7 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB:
 *** KEY-ATTR-INFO <keyref> <string>
     This is the response from scdaemon on GETATTR KEY-ATTR-INFO for
     OpenPGP cards.  <keyref> is the usual keyref (e.g. OPENPGP.1 or
-    OPENPGP.129) and <string> is the algoritm or curve name, which
+    OPENPGP.129) and <string> is the algorithm or curve name, which
     is available for the key.
 
 *** KEY-TIME <n> <timestamp>
@@ -1310,7 +1310,7 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB:
 *** KEY-LABEL <keyref> <label>
     This returns the human readbable label for the keys given by
     KEYREF.  LABEL won't have any space in it and is percent encoded.
-    This info shall only be used for dispaly purposes.
+    This info shall only be used for display purposes.
 
 * Format of the --attribute-fd output
 
diff --git a/doc/HACKING b/doc/HACKING
index ec04a2e37..cb7e400fc 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -152,7 +152,7 @@ Note that such a comment will be removed if the git commit option
       if ( 42 == foo )
 #+end_src
     this is harder to read and modern compilers are pretty good in
-    detecing accidental assignments.  It is also suggested not to
+    detecting accidental assignments.  It is also suggested not to
     compare to 0 or NULL but to test the value direct or with a '!';
     this makes it easier to see that a boolean test is done.
   - We use our own printf style functions like =es_printf=, and
@@ -244,7 +244,7 @@ subject line; the list is used for several different projects.
 
 In general you should send patches only for the master branch; we may
 later decide to backport to another branch.  Please ask first before
-sending pacthes for another branch.
+sending patches for another branch.
 
 If you're working from the Git repo, here's a suggested workflow:
 
diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
index 420340ee3..16d4cd4ab 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -1278,7 +1278,7 @@ as a binary blob.
 @c
 @c For historical reasons the Assuan command ISVALID is a bit different
 @c to CHECKCRL but this is mainly due to different calling conventions.
-@c In the end the same fucntionality is used, albeit hidden by a couple
+@c In the end the same functionality 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
 @c called.  GPGSM still uses this command but might eventually switch over
diff --git a/doc/examples/common.conf b/doc/examples/common.conf
index d58c43c3b..365fc4e8f 100644
--- a/doc/examples/common.conf
+++ b/doc/examples/common.conf
@@ -10,8 +10,8 @@
 # and gpgsm.
 #use-keyboxd
 
-# For testing ist is somethimes useful to use a different binary
-# of keybox.  This option can be used to speicify this.
+# For testing it is sometimes useful to use a different binary
+# of keybox.  This option can be used to specify this.
 #keyboxd-program /foo/bar/keyboxd
 
 # For the daemons (gpg-agent, scdaemon, dirmngr, keyboxd) it is often
diff --git a/doc/examples/trustlist.txt b/doc/examples/trustlist.txt
index 4d5724275..59fb729d7 100644
--- a/doc/examples/trustlist.txt
+++ b/doc/examples/trustlist.txt
@@ -2,7 +2,7 @@
 # one, as well as empty lines are ignored.  Lines have a length limit
 # but this is not serious limitation as the format of the entries is
 # fixed and checked by gpg-agent.  A non-comment line starts with
-# optional white space, followed by the SHA-1 fingerpint in hex,
+# optional white space, followed by the SHA-1 fingerprint in hex,
 # optionally followed by a flag character which my either be 'P', 'S'
 # or '*'.  This file will be read by gpg-agent if no local trustlist
 # is available or if the statement "include-default" is used in the
diff --git a/doc/gnupg.texi b/doc/gnupg.texi
index 78d4669da..11883ae98 100644
--- a/doc/gnupg.texi
+++ b/doc/gnupg.texi
@@ -19,7 +19,7 @@
 
 @c Create a separate index for command line options.
 @defcodeindex op
-@c Create an index vor environment variables and files.
+@c Create an index for environment variables and files.
 @defcodeindex ef
 
 @c Merge the function index into the concept index.
diff --git a/doc/gpg-card.texi b/doc/gpg-card.texi
index 6458598bd..612a202c5 100644
--- a/doc/gpg-card.texi
+++ b/doc/gpg-card.texi
@@ -281,7 +281,7 @@ removes this data object.  GnuPG does not use this info.
 Change the User Interaction Flag.  That flags tells whether the
 confirmation button of a token shall be used.  @var{n} must in the
 range 1 to 3.  "permanent" is the same as "on" but the flag can't be
-changed anmore.
+changed anymore.
 
 @item UNBLOCK
 @opindex unblock
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 446189b4b..02131da75 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1611,7 +1611,7 @@ maintained by the keyboxd process in its own database.
 
 @item --primary-keyring @var{file}
 @opindex primary-keyring
-This is a varian of @option{--keyring} and designates @var{file} as
+This is a variant of @option{--keyring} and designates @var{file} as
 the primary public keyring. This means that newly imported keys (via
 @option{--import} or keyserver @option{--recv-from}) will go to this
 keyring.
@@ -1808,7 +1808,7 @@ this option at all (e.g. due to the @option{--no-options} option).
 @opindex add-desig-revoker
 Add the key specified by @var{fingerprint} as a designated revoker to
 newly created keys.  If the fingerprint is prefixed with the keyword
-``sensitive:'' that info is normally not exported wit the key.  This
+``sensitive:'' that info is normally not exported with the key.  This
 option may be given several time to add more than one designated
 revoker.  If the keyword ``clear'' is used instead of a fingerprint,
 all designated options previously encountered are discarded.
@@ -2794,7 +2794,7 @@ The available properties are:
   Key Directory.
 
   @item url
-  A string with the the URL associated wit the last key lookup.
+  A string with the the URL associated with the last key lookup.
 
 @end table
 
diff --git a/doc/help.txt b/doc/help.txt
index 917175004..3528aa778 100644
--- a/doc/help.txt
+++ b/doc/help.txt
@@ -117,7 +117,7 @@ disable CRL checking in gpgsm's configuration.
 
 
 .gpg.edit_ownertrust.value
-# The help identies prefixed with "gpg." used to be hard coded in gpg
+# The help entries prefixed with "gpg." used to be hard coded in gpg
 # but may now be overridden by help texts from this file.
 It's up to you to assign a value here; this value will never be exported
 to any 3rd party.  We need it to implement the web-of-trust; it has nothing
diff --git a/doc/ldap/README.ldap b/doc/ldap/README.ldap
index 7095d6d10..33ffe3702 100644
--- a/doc/ldap/README.ldap
+++ b/doc/ldap/README.ldap
@@ -291,7 +291,7 @@ olcAccess: {0} to dn.subtree="dc=example,dc=com"
 
 As usual replace all "dc=example,dc=com" accordingly.  Take care not
 to insert a blank line anywhere.  The first line needs to give the DN
-of the database as determined above.  Excute the rules from that file
+of the database as determined above.  Execute the rules from that file
 using the command:
 
 : ldapmodify -Q -Y EXTERNAL -H ldapi:/// -f grantaccess.ldif
@@ -384,7 +384,7 @@ This lists just the DNs.  If you need the entire content of the DIT
 leave out the "dn" argument.  The option "-LLL" selects useful
 formatting options for the output.
 
-** Insert X.509 Certficate
+** Insert X.509 Certificate
 
 If you don't have a handy tool to insert a certificate via LDAP you
 can do it manually.  First put the certificate in binary (DER) format
@@ -505,7 +505,7 @@ to revert replace "ACL" by "none".
 ** Extending the AD Schema
 The Active Directory on Windows is actually an LDAP server but
 configuration differs from OpenLDAP.  The used schema is the same but
-the data objects are slighly different.  To extend the schema the
+the data objects are slightly different.  To extend the schema the
 LDIF format is used but with variants of the files used for OpenLDAP.
 Thus please download these two files:
 
@@ -517,7 +517,7 @@ schema.  There are *no ways to revert changes* made to a schema.  You
 should also first try this all on a test system and not on a
 production system.
 
-To extend the schema become Adminstrator on your Primary Domain
+To extend the schema become Administrator on your Primary Domain
 Controller and open a shell (Command Prompt).  Copy the above
 mentioned ldif files to your working directory and run the following
 command:
diff --git a/doc/ldap/gnupg-ldap-ad-schema.ldif b/doc/ldap/gnupg-ldap-ad-schema.ldif
index cf07744d7..5ee5ccb13 100644
--- a/doc/ldap/gnupg-ldap-ad-schema.ldif
+++ b/doc/ldap/gnupg-ldap-ad-schema.ldif
@@ -1,6 +1,6 @@
 # gnupg-ldap-ad-scheme.ldif                               -*- conf -*-
 #
-# Schema for an OpenPGP LDAP keyserver.  This is a slighly enhanced
+# Schema for an OpenPGP LDAP keyserver.  This is a slightly enhanced
 # version of the original LDAP schema used for PGP keyservers as
 # installed at quite some sites.
 # Revision: 2021-09-01  v1
@@ -12,7 +12,7 @@
 #      ldifde -i -v -f gnupg-ldap-ad-schema.ldif
 #             -c "DC=EXAMPLEDC" "#configurationNamingContext"
 #   (the above command is given as one line)
-# - The schema does not get its own distingished name as done with OpenLDAP.
+# - The schema does not get its own distinguished name as done with OpenLDAP.
 # - The first GUID we use is f406e7a5-a5ea-411e-9ddd-2e4e66899800
 #   and incremented for each attribute.
 #
diff --git a/doc/ldap/gnupg-ldap-schema.ldif b/doc/ldap/gnupg-ldap-schema.ldif
index be6a4646a..cec7ad084 100644
--- a/doc/ldap/gnupg-ldap-schema.ldif
+++ b/doc/ldap/gnupg-ldap-schema.ldif
@@ -1,6 +1,6 @@
 # gnupg-ldap-scheme.ldif                                 -*- conf -*-
 #
-# Schema for an OpenPGP LDAP keyserver.  This is a slighly enhanced
+# Schema for an OpenPGP LDAP keyserver.  This is a slightly enhanced
 # version of the original LDAP schema used for PGP keyservers as
 # installed at quite some sites.
 # Revision: 2020-10-07
@@ -58,7 +58,7 @@ olcAttributeTypes: {5}(
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
     SINGLE-VALUE )
 # The short key id.  This is actually not required and should thus not
-# be used by cleint software.
+# be used by client software.
 olcAttributeTypes: {6}(
     1.3.6.1.4.1.3401.8.2.14
     NAME 'pgpKeyID'
diff --git a/doc/tools.texi b/doc/tools.texi
index 9ce0e6bb8..efd1c4902 100644
--- a/doc/tools.texi
+++ b/doc/tools.texi
@@ -1826,7 +1826,7 @@ Do the check using the OCSP protocol and ignore any CRLs.
 @item --force-default-responder
 @opindex force-default-responder
 When checking using the OCSP protocol, force the use of the default OCSP
-responder.  That is not to use the Reponder as given by the certificate.
+responder.  That is not to use the Responder as given by the certificate.
 
 @item --ping
 @opindex ping
diff --git a/g10/armor.c b/g10/armor.c
index 81af15339..ed5ef5d2e 100644
--- a/g10/armor.c
+++ b/g10/armor.c
@@ -1319,7 +1319,7 @@ armor_filter( void *opaque, int control,
 	*ret_len = n;
     }
     else if( control == IOBUFCTRL_UNDERFLOW ) {
-        /* We need some space for the faked packet.  The minmum
+        /* We need some space for the faked packet.  The minimum
          * required size is the PARTIAL_CHUNK size plus a byte for the
          * length itself */
 	if( size < PARTIAL_CHUNK+1 )
@@ -1495,7 +1495,7 @@ armor_filter( void *opaque, int control,
     else if( control == IOBUFCTRL_FREE ) {
 	if( afx->cancel )
 	    ;
-	else if( afx->status ) { /* pad, write cecksum, and bottom line */
+	else if( afx->status ) { /* pad, write checksum, and bottom line */
 	    gcry_md_final (afx->crc_md);
 	    crc = get_afx_crc (afx);
 	    idx = afx->idx;
diff --git a/g10/call-agent.c b/g10/call-agent.c
index cfd4c086a..3a4d35b07 100644
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@@ -791,7 +791,7 @@ learn_status_cb (void *opaque, const char *line)
  * Used by:
  *  card-util.c
  *  keyedit_menu
- *  card_store_key_with_backup  (Woth force to remove secret key data)
+ *  card_store_key_with_backup  (With force to remove secret key data)
  */
 int
 agent_scd_learn (struct agent_card_info_s *info, int force)
@@ -2316,7 +2316,7 @@ agent_probe_secret_key (ctrl_t ctrl, PKT_public_key *pk)
   else if (!result && result2)
     return 0;       /* Only first key available - return no key.  */
   else if (result && !result2)
-    return 0;       /* Only second key not availabale - return no key.  */
+    return 0;       /* Only second key not available - return no key.  */
   else if (result == 4 || result == 2)
     return result;  /* First key on card - don't care where the second is.  */
   else
@@ -2345,7 +2345,7 @@ agent_probe_any_secret_key (ctrl_t ctrl, kbnode_t keyblock)
     return err;
 
   /* If we have not yet issued a "HAVEKEY --list" do that now.  We use
-   * a more or less arbitray limit of 1000 keys.  */
+   * a more or less arbitrary limit of 1000 keys.  */
   if (ctrl && !ctrl->secret_keygrips && !ctrl->no_more_secret_keygrips)
     {
       membuf_t data;
diff --git a/g10/call-dirmngr.c b/g10/call-dirmngr.c
index d00f61450..ed2cf9dc2 100644
--- a/g10/call-dirmngr.c
+++ b/g10/call-dirmngr.c
@@ -390,7 +390,7 @@ ks_status_cb (void *opaque, const char *line)
                 {
                   /* This is an LDAP config entry like
                    * "foo:389:user:pass:base:flags"
-                   * we strip off everything beyound the port.  */
+                   * we strip off everything beyond the port.  */
                   if ((p = strchr (p+1, ':')))
                     {
                       if (p[-1] == ':')
diff --git a/g10/call-keyboxd.c b/g10/call-keyboxd.c
index bc3806f0b..378c3d7ef 100644
--- a/g10/call-keyboxd.c
+++ b/g10/call-keyboxd.c
@@ -47,7 +47,7 @@
 
 
 /* Data used to keep track of keybox daemon sessions.  This allows us
- * to use several sessions with the keyboxd and also to re-use already
+ * to use several sessions with the keyboxd and also to reuse already
  * established sessions.  Note that gpg.h defines the type
  * keyboxd_local_t for this structure. */
 struct keyboxd_local_s
@@ -631,7 +631,7 @@ keydb_search_reset (KEYDB_HANDLE hd)
 
 
 
-/* Status callback for SEARCH and NEXT operaions.  */
+/* Status callback for SEARCH and NEXT operations.  */
 static gpg_error_t
 search_status_cb (void *opaque, const char *line)
 {
diff --git a/g10/card-util.c b/g10/card-util.c
index 7df505f62..e8a5c1935 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -1778,7 +1778,7 @@ card_generate_subkey (ctrl_t ctrl, kbnode_t pub_keyblock)
 /* Store the key at NODE into the smartcard and modify NODE to carry
    the serialno stuff instead of the actual secret key parameters.
    USE is the usage for that key; 0 means any usage.  If
-   PROCESSED_KEYS is not NULL it is a poiter to an strlist which will
+   PROCESSED_KEYS is not NULL it is a pointer to an strlist which will
    be filled with the keygrips of successfully stored keys.  */
 int
 card_store_subkey (KBNODE node, int use, strlist_t *processed_keys)
diff --git a/g10/encrypt.c b/g10/encrypt.c
index 8ce6164ce..3fc10a7b8 100644
--- a/g10/encrypt.c
+++ b/g10/encrypt.c
@@ -68,7 +68,7 @@ encrypt_store (const char *filename)
 }
 
 
-/* Create and setup a DEK structure and print approriate warnings.
+/* Create and setup a DEK structure and print appropriate warnings.
  * PK_LIST gives the list of public keys.  Always returns a DEK.  The
  * actual session needs to be added later.  */
 static DEK *
@@ -94,7 +94,7 @@ create_dek_with_warnings (pk_list_t pk_list)
 
       /* In case 3DES has been selected, print a warning if any key
        * does not have a preference for AES.  This should help to
-       * indentify why encrypting to several recipients falls back to
+       * identify why encrypting to several recipients falls back to
        * 3DES. */
       if (opt.verbose && dek->algo == CIPHER_ALGO_3DES)
         warn_missing_aes_from_pklist (pk_list);
@@ -1128,7 +1128,7 @@ write_pubkey_enc (ctrl_t ctrl,
    * the structure DEK and want to encode this session key in an
    * integer value of n bits. pubkey_nbits gives us the number of
    * bits we have to use.  We then encode the session key in some
-   * way and we get it back in the big intger value FRAME.  Then
+   * way and we get it back in the big integer value FRAME.  Then
    * we use FRAME, the public key PK->PKEY and the algorithm
    * number PK->PUBKEY_ALGO and pass it to pubkey_encrypt which
    * returns the encrypted value in the array ENC->DATA.  This
diff --git a/g10/export.c b/g10/export.c
index 2417edef1..5865ae23a 100644
--- a/g10/export.c
+++ b/g10/export.c
@@ -2134,7 +2134,7 @@ do_export_revocs (ctrl_t ctrl, kbnode_t keyblock, u32 *keyid,
         continue;
       sig = node->pkt->pkt.signature;
 
-      /* We are only interested in revocation certifcates.  */
+      /* We are only interested in revocation certificates.  */
       if (!(IS_KEY_REV (sig) || IS_UID_REV (sig) || IS_SUBKEY_REV (sig)))
         continue;
 
diff --git a/g10/getkey.c b/g10/getkey.c
index f2d1e7d7b..015420173 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -446,7 +446,7 @@ leave:
 
 
 /* Same as get_pubkey but if the key was not found the function tries
- * to import it from LDAP.  FIXME: We should not need this but swicth
+ * to import it from LDAP.  FIXME: We should not need this but switch
  * to a fingerprint lookup.  */
 gpg_error_t
 get_pubkey_with_ldap_fallback (ctrl_t ctrl, PKT_public_key *pk, u32 *keyid)
@@ -992,7 +992,7 @@ get_pubkey_byname (ctrl_t ctrl, enum get_pubkey_modes mode,
   /* If we are called due to --locate-external-key Check whether NAME
    * is a fingerprint and then try to lookup that key by configured
    * method which support lookup by fingerprint.  FPRBUF carries the
-   * parsed fingerpint iff IS_FPR is true.  */
+   * parsed fingerprint iff IS_FPR is true.  */
   is_fpr = 0;
   if (!is_mbox && mode == GET_PUBKEY_NO_LOCAL)
     {
@@ -2525,7 +2525,7 @@ parse_key_usage (PKT_signature * sig)
 
 /* Apply information from SIGNODE (which is the valid self-signature
  * associated with that UID) to the UIDNODE:
- * - wether the UID has been revoked
+ * - whether the UID has been revoked
  * - assumed creation date of the UID
  * - temporary store the keyflags here
  * - temporary store the key expiration time here
diff --git a/g10/gpg.c b/g10/gpg.c
index 82745fa18..c2165dafc 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -2003,7 +2003,7 @@ gpgconf_list (void)
    * compliance mode.  This does not test all parameters but the basic
    * conditions like a proper RNG and Libgcrypt.  AS of now we always
    * return 0 because this version of gnupg has not yet received an
-   * appoval. */
+   * approval. */
   es_printf ("compliance_de_vs:%lu:%d:\n", GC_OPT_FLAG_DEFAULT,
              0 /*gnupg_rng_is_compliant (CO_DE_VS)*/);
 
@@ -2609,7 +2609,7 @@ main (int argc, char **argv)
     pargs.argc = &argc;
     pargs.argv = &argv;
     /* We are re-using the struct, thus the reset flag.  We OR the
-     * flags so that the internal intialized flag won't be cleared. */
+     * flags so that the internal initialized flag won't be cleared. */
     pargs.flags |= (ARGPARSE_FLAG_RESET
                     | ARGPARSE_FLAG_KEEP
                     | ARGPARSE_FLAG_SYS
@@ -2619,7 +2619,7 @@ main (int argc, char **argv)
     /* By this point we have a homedir, and cannot change it. */
     check_permissions (gnupg_homedir (), 0);
 
-    /* The configuraton directories for use by gpgrt_argparser.  */
+    /* The configuration directories for use by gpgrt_argparser.  */
     gpgrt_set_confdir (GPGRT_CONFDIR_SYS, gnupg_sysconfdir ());
     gpgrt_set_confdir (GPGRT_CONFDIR_USER, gnupg_homedir ());
 
diff --git a/g10/import.c b/g10/import.c
index bbeeebdfe..bd13c6302 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -231,7 +231,7 @@ parse_import_options(char *str,unsigned int *options,int noisy)
   int rc;
   int saved_self_sigs_only, saved_import_clean;
 
-  /* We need to set flags indicating wether the user has set certain
+  /* We need to set flags indicating whether the user has set certain
    * options or if they came from the default.  */
   saved_self_sigs_only = (*options & IMPORT_SELF_SIGS_ONLY);
   saved_self_sigs_only &= ~IMPORT_SELF_SIGS_ONLY;
diff --git a/g10/key-clean.c b/g10/key-clean.c
index ca8ca40d9..16d725079 100644
--- a/g10/key-clean.c
+++ b/g10/key-clean.c
@@ -612,7 +612,7 @@ clean_all_subkeys (ctrl_t ctrl, kbnode_t keyblock, int noisy, int clean_level,
   /* Do the selected cleaning.  */
   if (clean_level > KEY_CLEAN_NONE)
     {
-      /* Clean enitre subkeys.  */
+      /* Clean entire subkeys.  */
       for (node = first_subkey; node; node = node->next)
         {
           if (is_deleted_kbnode (node))
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 81ea06c24..f41e53f6d 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -1445,7 +1445,7 @@ keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr,
      inhibits that and flushing the cache right before the stale
      check is not easy to implement.  Thus we take the easy way out
      and run the stale check as early as possible.  Note, that for
-     non- W32 platforms it is run indirectly trough a call to
+     non- W32 platforms it is run indirectly through a call to
      get_validity ().  */
   check_trustdb_stale (ctrl);
 #endif
@@ -2894,7 +2894,7 @@ find_by_primary_fpr (ctrl_t ctrl, const char *fpr,
 }
 
 
-/* Unattended key signing function.  If the key specifified by FPR is
+/* Unattended key signing function.  If the key specified by FPR is
    available and FPR is the primary fingerprint all user ids of the
    key are signed using the default signing key.  If UIDS is an empty
    list all usable UIDs are signed, if it is not empty, only those
@@ -3153,7 +3153,7 @@ keyedit_quick_revsig (ctrl_t ctrl, const char *username, const char *sigtorev,
           unsigned int sigcount = 0;
           kbnode_t *sigarray;
 
-          /* Allocate an array large enogh for all signatures.  */
+          /* Allocate an array large enough for all signatures.  */
           for (n=node; n && n->pkt->pkttype == PKT_SIGNATURE; n = n->next)
             sigcount++;
           sigarray = xtrycalloc (sigcount, sizeof *sigarray);
diff --git a/g10/keygen.c b/g10/keygen.c
index 0c37f27f8..f6498e9fc 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -4470,7 +4470,7 @@ parse_parameter_usage (const char *fname,
 
 /* Parse the revocation key specified by NAME, check that the public
  * key exists (so that we can get the required public key algorithm),
- * and return a parameter wit the revocation key information.  On
+ * and return a parameter with the revocation key information.  On
  * error print a diagnostic and return NULL.  */
 static struct para_data_s *
 prepare_desig_revoker (ctrl_t ctrl, const char *name)
@@ -4790,7 +4790,7 @@ proc_parameter_file (ctrl_t ctrl, struct para_data_s *para, const char *fname,
   if (parse_revocation_key (fname, para, pREVOKER))
     return -1;
 
-  /* Check and appened revokers from the config file.  */
+  /* Check and append revokers from the config file.  */
   for (sl = opt.desig_revokers; sl; sl = sl->next)
     {
       r = prepare_desig_revoker (ctrl, sl->d);
diff --git a/g10/keyid.c b/g10/keyid.c
index 08f684829..d0317105d 100644
--- a/g10/keyid.c
+++ b/g10/keyid.c
@@ -336,7 +336,7 @@ do_hash_public_key (gcry_md_hd_t md, PKT_public_key *pk, int use_v5)
             {
               /* Ugly: We need to re-construct the wire format of the
                * key parameter.  It would be easier to use a second
-               * index for pp and nn which we could bump independet of
+               * index for pp and nn which we could bump independent of
                * i.  */
               const char *p;
 
@@ -870,7 +870,7 @@ nbits_from_pk (PKT_public_key *pk)
         case 800:  nbits =  512; break;
         case 1184: nbits =  768; break;
         case 1568: nbits = 1024; break;
-        default:   nbits = 0;    break;  /* Unkown version.  */
+        default:   nbits = 0;    break;  /* Unknown version.  */
         }
       return nbits;
     }
@@ -1093,7 +1093,7 @@ fingerprint_from_pk (PKT_public_key *pk, byte *array, size_t *ret_len)
  * Return a byte array with the fingerprint for the given PK/SK The
  * length of the array is returned in ret_len. Caller must free the
  * array or provide an array of length MAX_FINGERPRINT_LEN.  This
- * version creates a v5 fingerprint even vor v4 keys.
+ * version creates a v5 fingerprint even for v4 keys.
  */
 byte *
 v5_fingerprint_from_pk (PKT_public_key *pk, byte *array, size_t *ret_len)
diff --git a/g10/options.h b/g10/options.h
index ae429fcc1..644eff359 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -383,7 +383,7 @@ EXTERN_UNLESS_MAIN_MODULE int memory_stat_debug_mode;
 #define COMPAT_T7014_OLD      2  /* Use initial T7014 test data.  */
 
 
-/* Compliance test macors.  */
+/* Compliance test macros.  */
 #define GNUPG   (opt.compliance==CO_GNUPG || opt.compliance==CO_DE_VS)
 #define RFC2440 (opt.compliance==CO_RFC2440)
 #define RFC4880 (opt.compliance==CO_RFC4880)
diff --git a/g10/packet.h b/g10/packet.h
index 459e38dda..e10baba4d 100644
--- a/g10/packet.h
+++ b/g10/packet.h
@@ -251,7 +251,7 @@ typedef struct
   const byte *trust_regexp;
   struct revocation_key *revkey;
   int numrevkeys;
-  int help_counter;          /* Used internally bu some functions.  */
+  int help_counter;          /* Used internally by some functions.  */
   char *signers_uid;         /* Malloced value of the SIGNERS_UID
                               * subpacket or NULL.  This string has
                               * already been sanitized.  */
diff --git a/g10/pkclist.c b/g10/pkclist.c
index 42e124e9e..afc8f56bc 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -618,7 +618,7 @@ check_signatures_trust (ctrl_t ctrl, kbnode_t keyblock, PKT_public_key *pk,
   targetuid = NULL;
   if (uidbased)
     {
-      u32 tmpcreated = 0; /* Helper to find the lates user ID.  */
+      u32 tmpcreated = 0; /* Helper to find the latest user ID.  */
       PKT_user_id *tmpuid;
 
       for (n=keyblock; n; n = n->next)
diff --git a/g10/pkglue.c b/g10/pkglue.c
index f4efa8fc5..9db8f46de 100644
--- a/g10/pkglue.c
+++ b/g10/pkglue.c
@@ -486,7 +486,7 @@ do_encrypt_kem (PKT_public_key *pk, gcry_mpi_t data, int seskey_algo,
     {
       if (!strcmp (ecc_oid, "1.3.6.1.4.1.3029.1.5.1"))
         log_info ("Warning: "
-                  "legacy OID for cv25519 accepted during develpment\n");
+                  "legacy OID for cv25519 accepted during development\n");
       ecc_pubkey = gcry_mpi_get_opaque (pk->pkey[1], &nbits);
       ecc_pubkey_len = (nbits+7)/8;
       if (ecc_pubkey_len == 33 && *ecc_pubkey == 0x40)
diff --git a/g10/sig-check.c b/g10/sig-check.c
index 06329f659..e85e9914f 100644
--- a/g10/sig-check.c
+++ b/g10/sig-check.c
@@ -992,7 +992,7 @@ check_signature_over_key_or_uid (ctrl_t ctrl, PKT_public_key *signer,
               if (ret_pk)
                 {
                   signer = ret_pk;
-                  /* FIXME: Using memset here is probematic because it
+                  /* FIXME: Using memset here is problematic because it
                    * assumes that there are no allocated fields in
                    * SIGNER.  */
                   memset (signer, 0, sizeof (*signer));
diff --git a/g10/sign.c b/g10/sign.c
index 67ea5a038..399d5d76d 100644
--- a/g10/sign.c
+++ b/g10/sign.c
@@ -684,7 +684,7 @@ hash_for (PKT_public_key *pk)
 	 like a new DSA key that just happens to have a 160-bit q
 	 (i.e. allow truncation).  If q is not 160, by definition it
 	 must be a new DSA key.  We ignore the personal_digest_prefs
-	 for ECDSA because they should always macth the curve and
+	 for ECDSA because they should always match the curve and
 	 truncated hashes are not useful either.  Even worse,
 	 smartcards may reject non matching hash lengths for curves
 	 (e.g. using SHA-512 with brainpooolP385r1 on a Yubikey).  */
@@ -1322,7 +1322,7 @@ sign_file (ctrl_t ctrl, strlist_t filenames, int detached, strlist_t locusr,
 
           if (opt.verbose)
             log_info (_("signing:") );
-          /* Must walk reverse trough this list.  */
+          /* Must walk reverse through this list.  */
           for (sl = strlist_last(filenames);
                sl;
                sl = strlist_prev( filenames, sl))
diff --git a/g10/tofu.c b/g10/tofu.c
index 83786a08d..fff911293 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -3655,7 +3655,7 @@ tofu_wot_trust_combine (int tofu_base, int wot_base)
               || wot == TRUST_FULLY
               || wot == TRUST_ULTIMATE);
 
-  /* We first consider negative trust policys.  These trump positive
+  /* We first consider negative trust policies.  These trump positive
      trust policies.  */
   if (tofu == TRUST_NEVER || wot == TRUST_NEVER)
     /* TRUST_NEVER trumps everything else.  */
diff --git a/g10/trustdb.c b/g10/trustdb.c
index 6de9f6b66..88b94389f 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -1505,7 +1505,7 @@ list_trust_path( const char *username )
 /****************
  * Enumerate all keys, which are needed to build all trust paths for
  * the given key.  This function does not return the key itself or
- * the ultimate key (the last point in cerificate chain).  Only
+ * the ultimate key (the last point in certificate chain).  Only
  * certificate chains which ends up at an ultimately trusted key
  * are listed.	If ownertrust or validity is not NULL, the corresponding
  * value for the returned LID is also returned in these variable(s).
diff --git a/g13/g13-syshelp.c b/g13/g13-syshelp.c
index 08b67377c..622ca2ac3 100644
--- a/g13/g13-syshelp.c
+++ b/g13/g13-syshelp.c
@@ -314,7 +314,7 @@ main (int argc, char **argv)
   ctrl.no_server = 1;
   ctrl.status_fd = -1; /* No status output. */
 
-  /* The configuraton directories for use by gpgrt_argparser.  */
+  /* The configuration directories for use by gpgrt_argparser.  */
   gpgrt_set_confdir (GPGRT_CONFDIR_SYS, gnupg_sysconfdir ());
   gpgrt_set_confdir (GPGRT_CONFDIR_USER, gnupg_homedir ());
 
diff --git a/g13/g13.c b/g13/g13.c
index dc2dca109..9d9e2e2b0 100644
--- a/g13/g13.c
+++ b/g13/g13.c
@@ -443,12 +443,12 @@ main (int argc, char **argv)
   ctrl.no_server = 1;
   ctrl.status_fd = -1; /* No status output. */
 
-  /* The configuraton directories for use by gpgrt_argparser.  */
+  /* The configuration directories for use by gpgrt_argparser.  */
   gpgrt_set_confdir (GPGRT_CONFDIR_SYS, gnupg_sysconfdir ());
   gpgrt_set_confdir (GPGRT_CONFDIR_USER, gnupg_homedir ());
 
   /* We are re-using the struct, thus the reset flag.  We OR the
-   * flags so that the internal intialized flag won't be cleared. */
+   * flags so that the internal initialized flag won't be cleared. */
   argc        = orig_argc;
   argv        = orig_argv;
   pargs.argc  = &argc;
diff --git a/g13/sh-dmcrypt.c b/g13/sh-dmcrypt.c
index c3b5a6d77..19884f37b 100644
--- a/g13/sh-dmcrypt.c
+++ b/g13/sh-dmcrypt.c
@@ -66,7 +66,7 @@
 #define HEADER_SECTORS (SETUP_AREA_SECTORS * HEADER_SETUP_AREA_COPIES)
 #define FOOTER_SECTORS (SETUP_AREA_SECTORS * FOOTER_SETUP_AREA_COPIES)
 
-/* Minimim size of the encrypted space in blocks.  This is more or
+/* Minimum size of the encrypted space in blocks.  This is more or
    less an arbitrary value.  */
 #define MIN_ENCRYPTED_SPACE 32
 
diff --git a/kbx/backend-sqlite.c b/kbx/backend-sqlite.c
index ec891da6d..2398aa77f 100644
--- a/kbx/backend-sqlite.c
+++ b/kbx/backend-sqlite.c
@@ -884,7 +884,7 @@ run_select_statement (ctrl_t ctrl, be_sqlite_local_t ctx,
       goto leave;
     }
 
-  /* Check whether we can re-use the current select statement.  */
+  /* Check whether we can reuse the current select statement.  */
   if (!ctx->select_stmt)
     ;
   else if (ctx->select_mode != desc[descidx].mode)
diff --git a/kbx/backend-support.c b/kbx/backend-support.c
index 4d3738064..2f0c7168a 100644
--- a/kbx/backend-support.c
+++ b/kbx/backend-support.c
@@ -207,7 +207,7 @@ be_is_x509_blob (const unsigned char *blob, size_t bloblen)
    *  SEQUENCE    SEQUENCE    [0]   INTEGER  INTEGER
    *              (tbs)            (version) (s/n)
    *
-   *  Note that v0 certificates don't have an explict version number.
+   *  Note that v0 certificates don't have an explicit version number.
    */
 
   p = blob;
@@ -229,7 +229,7 @@ be_is_x509_blob (const unsigned char *blob, size_t bloblen)
   if (!(class == CLASS_CONTEXT && tag == 0 && cons))
     {
       if (class == CLASS_UNIVERSAL && tag == TAG_INTEGER && !cons)
-        return 1; /* Might be a X.509 v0 cert with implict version.  */
+        return 1; /* Might be a X.509 v0 cert with implicit version.  */
       return 0; /* No context tag.  */
     }
 
diff --git a/kbx/frontend.c b/kbx/frontend.c
index 9cb9f145f..f0f2af960 100644
--- a/kbx/frontend.c
+++ b/kbx/frontend.c
@@ -1,4 +1,4 @@
-/* frontend.c - Database fronend code for keyboxd
+/* frontend.c - Database frontend code for keyboxd
  * Copyright (C) 2019 g10 Code GmbH
  *
  * This file is part of GnuPG.
diff --git a/kbx/kbxserver.c b/kbx/kbxserver.c
index d09a8f8eb..3e68bfc26 100644
--- a/kbx/kbxserver.c
+++ b/kbx/kbxserver.c
@@ -93,7 +93,7 @@ struct server_local_s
    * multi_search_desc_len.  If a search description has ever been
    * allocated the allocated size is stored at multi_search_desc_size.
    * multi_search_store is allocated at the same size as
-   * multi_search_desc and used to provde backing store for the SN and
+   * multi_search_desc and used to provide backing store for the SN and
    * NAME elements of KEYBOX_SEARCH_DESC.  */
   KEYBOX_SEARCH_DESC search_desc;
   KEYBOX_SEARCH_DESC *multi_search_desc;
diff --git a/kbx/keybox-init.c b/kbx/keybox-init.c
index 439d1c477..7bd206383 100644
--- a/kbx/keybox-init.c
+++ b/kbx/keybox-init.c
@@ -103,7 +103,7 @@ keybox_is_writable (void *token)
 }
 
 
-/* Change the default buffering to KBYTES KiB; using 0 uses the syste
+/* Change the default buffering to KBYTES KiB; using 0 uses the system
  * buffers.  This function must be called early.  */
 void
 keybox_set_buffersize (unsigned int kbytes, int reserved)
diff --git a/kbx/keybox-search-desc.h b/kbx/keybox-search-desc.h
index f312da99b..eda299beb 100644
--- a/kbx/keybox-search-desc.h
+++ b/kbx/keybox-search-desc.h
@@ -1,4 +1,4 @@
-/* keybox-search-desc.h - Keybox serch description
+/* keybox-search-desc.h - Keybox search description
  *	Copyright (C) 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
diff --git a/kbx/keyboxd.c b/kbx/keyboxd.c
index 73905eb7d..ad14d8681 100644
--- a/kbx/keyboxd.c
+++ b/kbx/keyboxd.c
@@ -529,7 +529,7 @@ main (int argc, char **argv )
   /* Reset the flags.  */
   pargs.flags &= ~(ARGPARSE_FLAG_KEEP | ARGPARSE_FLAG_NOVERSION);
 
-  /* The configuraton directories for use by gpgrt_argparser.  */
+  /* The configuration directories for use by gpgrt_argparser.  */
   gpgrt_set_confdir (GPGRT_CONFDIR_SYS, gnupg_sysconfdir ());
   gpgrt_set_confdir (GPGRT_CONFDIR_USER, gnupg_homedir ());
 
diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4
index 7fa52b127..27e770c97 100644
--- a/m4/gpg-error.m4
+++ b/m4/gpg-error.m4
@@ -145,7 +145,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 c9dab35de..348e5f92e 100644
--- a/m4/ksba.m4
+++ b/m4/ksba.m4
@@ -100,9 +100,9 @@ AC_DEFUN([_AM_PATH_GPGRT_CONFIG],[dnl
 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 MINIMUN-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 MINIMUN-VERSION of 1:1.0.7 won't pass the test unless the installed
+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
 dnl this features allows to prevent build against newer versions of libksba
 dnl with a changed API.
diff --git a/m4/ntbtls.m4 b/m4/ntbtls.m4
index fff425600..e512340e7 100644
--- a/m4/ntbtls.m4
+++ b/m4/ntbtls.m4
@@ -16,9 +16,9 @@ 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 MINIMUN-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 MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed
+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
 dnl this features allows to prevent build against newer versions of libgcrypt
 dnl with a changed API.
diff --git a/regexp/jimregexp.c b/regexp/jimregexp.c
index d80eabd8e..15985d1c5 100644
--- a/regexp/jimregexp.c
+++ b/regexp/jimregexp.c
@@ -1278,7 +1278,7 @@ static int prefix_cmp(const int *prog, int proglen, const char *string, int noca
 }
 
 /**
- * Searchs for 'c' in the range 'range'.
+ * Searches for 'c' in the range 'range'.
  *
  * Returns 1 if found, or 0 if not.
  */
diff --git a/scd/apdu.c b/scd/apdu.c
index 2e38a273a..35b845b40 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -2310,7 +2310,7 @@ apdu_open_reader (struct dev_list *dl)
 /* Open an remote reader and return an internal slot number or -1 on
    error. This function is an alternative to apdu_open_reader and used
    with remote readers only.  Note that the supplied CLOSEFNC will
-   only be called once and the slot will not be valid afther this.
+   only be called once and the slot will not be valid after this.
 
    If PORTSTR is NULL we default to the first available port.
 */
diff --git a/scd/app-nks.c b/scd/app-nks.c
index c207fd500..7c0eedfd0 100644
--- a/scd/app-nks.c
+++ b/scd/app-nks.c
@@ -528,7 +528,7 @@ find_fid_by_keyref (app_t app, const char *keyref, int *r_idx, int *r_algo)
               break;
           if (!filelist[idx].fid)
             {
-              log_debug ("nks: Ooops: Unkown FID cached!\n");
+              log_debug ("nks: Ooops: Unknown FID cached!\n");
               err = gpg_error (GPG_ERR_BUG);
               goto leave;
             }
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 5882153eb..4af4f880e 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -190,7 +190,7 @@ struct app_local_s {
   struct
   {
     unsigned int is_v2:1;              /* Compatible to v2 or later.        */
-    unsigned int is_v3:1;              /* Comatible to v3 or later.         */
+    unsigned int is_v3:1;              /* Compatible to v3 or later.        */
     unsigned int has_button:1;         /* Has confirmation button or not.   */
 
     unsigned int sm_supported:1;       /* Secure Messaging is supported.    */
diff --git a/scd/app-p15.c b/scd/app-p15.c
index 6af10b46b..377cd5024 100644
--- a/scd/app-p15.c
+++ b/scd/app-p15.c
@@ -295,7 +295,7 @@ struct prkdf_object_s
 
   /* PKCS#15 info whether this is an EC key.  Default is RSA.  Note
    * that there is also a KEYALGO field which is derived from the
-   * publick key via Libgcrypt.  */
+   * public key via Libgcrypt.  */
   unsigned int is_ecc:1;
 
   /* The key's usage flags. */
@@ -1571,7 +1571,7 @@ parse_common_obj_attr (unsigned char const **buffer, size_t *size,
 
 /* Parse the commonKeyAttributes.  On success store the objid at
  * (R_OBJID/R_OBJIDLEN), sets the key usage flags at USAGEFLAGS and
- * the optiona key refrence at R_KEY_REFERENCE.  The latter is only
+ * the optional key reference at R_KEY_REFERENCE.  The latter is only
  * valid if true is also stored at R_KEY_REFERENCE_VALID.
  *
  * Example data:
@@ -3751,7 +3751,7 @@ read_p15_info (app_t app)
   /* See whether we can extend the private key information using
    * information from certificates.  We use only the first matching
    * certificate; if we want to change this strategy we should walk
-   * over the certificates and then find the corresponsing private key
+   * over the certificates and then find the corresponding private key
    * objects.  */
   app->app_local->any_gpgusage = 0;
   for (prkdf = app->app_local->private_key_info; prkdf; prkdf = prkdf->next)
@@ -4840,7 +4840,7 @@ do_getattr (app_t app, ctrl_t ctrl, const char *name)
       int i;
 
       /* Put the AODFs into an array for easier sorting.  Note that we
-       * handle onl the first 16 encountrer which should be more than
+       * handle only the first 16 encountrer which should be more than
        * enough.  */
       for (aodf = app->app_local->auth_object_info;
            aodf && naodf < DIM(aodfarray); aodf = aodf->next)
@@ -6226,7 +6226,7 @@ do_check_pin (app_t app, ctrl_t ctrl, const char *keyidstr,
         if (aodf->label && !ascii_strcasecmp (aodf->label, keyidstr))
           break;
       if (!aodf)
-        return err;  /* Re-use the original error code.  */
+        return err;  /* Reuse the original error code.  */
     }
   else /* Find the authentication object to this private key object. */
     {
diff --git a/scd/app-piv.c b/scd/app-piv.c
index d7f9acca3..8b9c9a608 100644
--- a/scd/app-piv.c
+++ b/scd/app-piv.c
@@ -354,7 +354,7 @@ get_cached_data (app_t app, int tag,
 
 
 /* Remove data object described by TAG from the cache.  If TAG is 0
- * all cache iterms are flushed.  */
+ * all cache items are flushed.  */
 static void
 flush_cached_data (app_t app, int tag)
 {
@@ -2983,7 +2983,7 @@ writekey_ecc (app_t app, data_object_t dobj, int keyref,
 
 
 /* Write a key to a slot.  This command requires proprietary
- * extensions of the PIV specification and is thus only implemnted for
+ * extensions of the PIV specification and is thus only implemented for
  * supported card types.  The input is a canonical encoded
  * S-expression with the secret key in KEYDATA and its length (for
  * assertion) in KEYDATALEN.  KEYREFSTR needs to be the usual 2
diff --git a/scd/app.c b/scd/app.c
index 09a148416..9a5150fd1 100644
--- a/scd/app.c
+++ b/scd/app.c
@@ -1399,7 +1399,7 @@ app_munge_serialno (card_t card)
        *   !     !----------- Form factor
        *   !----------------- Our prefix
        * Yubico seems to use the decimalized version of their S/N
-       * as the OpenPGP card S/N.  Thus in theory we can contruct the
+       * as the OpenPGP card S/N.  Thus in theory we can construct the
        * number from this information so that we do not rely on having
        * the OpenPGP app enabled.
        */
diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index 0fcd5a3d8..92387a1a8 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -1812,7 +1812,7 @@ ccid_open_usb_reader (const char *spec_reader_name,
 
   my_npth_protect ();
 
-  /* Perform any vendor specific intialization.  */
+  /* Perform any vendor specific initialization.  */
   rc = ccid_vendor_specific_init (*handle);
 
  leave:
diff --git a/scd/command.c b/scd/command.c
index a2274f15a..97e6accff 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -151,7 +151,7 @@ hex_to_buffer (const char *string, size_t *r_length)
 /* Reset the card and free the application context.  With SEND_RESET
    set to true actually send a RESET to the reader; this is the normal
    way of calling the function.  If KEEP_LOCK is set and the session
-   is locked that lock wil not be released.  */
+   is locked that lock will not be released.  */
 static void
 do_reset (ctrl_t ctrl, int send_reset, int keep_lock)
 {
@@ -1356,7 +1356,7 @@ static const char hlp_writecert[] =
   "\n"
   "This command is used to store a certificate on a smartcard.  The\n"
   "allowed certids depend on the currently selected smartcard\n"
-  "application. The actual certifciate is requested using the inquiry\n"
+  "application. The actual certificate is requested using the inquiry\n"
   "\"CERTDATA\" and needs to be provided in its raw (e.g. DER) form.\n"
   "\n"
   "In almost all cases a PIN will be requested.  See the related\n"
diff --git a/scd/iso7816.c b/scd/iso7816.c
index 703f1fdab..6634cd4a7 100644
--- a/scd/iso7816.c
+++ b/scd/iso7816.c
@@ -471,7 +471,7 @@ iso7816_reset_retry_counter (int slot, int chvno,
 }
 
 
-/* Perform a SELECT DATA command to OCCURANCE of TAG.  */
+/* Perform a SELECT DATA command to OCCURRENCE of TAG.  */
 gpg_error_t
 iso7816_select_data (int slot, int occurrence, int tag)
 {
@@ -660,7 +660,7 @@ iso7816_manage_security_env (int slot, int p1, int p2,
 }
 
 
-/* Perform the security operation COMPUTE DIGITAL SIGANTURE.  On
+/* Perform the security operation COMPUTE DIGITAL SIGNATURE.  On
    success 0 is returned and the data is available in a newly
    allocated buffer stored at RESULT with its length stored at
    RESULTLEN.  For LE see do_generate_keypair. */
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index 2a9b0923c..0127c8dda 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -535,12 +535,12 @@ main (int argc, char **argv )
      Now we are working under our real uid
   */
 
-  /* The configuraton directories for use by gpgrt_argparser.  */
+  /* The configuration directories for use by gpgrt_argparser.  */
   gpgrt_set_confdir (GPGRT_CONFDIR_SYS, gnupg_sysconfdir ());
   gpgrt_set_confdir (GPGRT_CONFDIR_USER, gnupg_homedir ());
 
   /* We are re-using the struct, thus the reset flag.  We OR the
-   * flags so that the internal intialized flag won't be cleared. */
+   * flags so that the internal initialized flag won't be cleared. */
   argc = orig_argc;
   argv = orig_argv;
   pargs.argc = &argc;
diff --git a/sm/call-agent.c b/sm/call-agent.c
index acce19058..cdd596280 100644
--- a/sm/call-agent.c
+++ b/sm/call-agent.c
@@ -1106,7 +1106,7 @@ learn_cb (void *opaque, const void *buffer, size_t length)
   string = NULL;
 
 
-  /* We do not store a certifciate with missing issuers as ephemeral
+  /* We do not store a certificate with missing issuers as ephemeral
      because we can assume that the --learn-card command has been used
      on purpose.  */
   rc = gpgsm_basic_cert_check (parm->ctrl, cert);
diff --git a/sm/certchain.c b/sm/certchain.c
index 9d0fe684b..539280ed1 100644
--- a/sm/certchain.c
+++ b/sm/certchain.c
@@ -758,7 +758,7 @@ find_up_via_auth_info_access (ctrl_t ctrl, KEYDB_HANDLE kh, ksba_cert_t cert)
                               &find_up_store_certs_parm);
 
   /* Although we might receive several certificates we use only the
-   * first one.  Or more exacty the first one for which we retrieved
+   * first one.  Or more exactly the first one for which we retrieved
    * the fingerprint.  */
   if (opt.verbose)
     log_info ("number of caIssuers found: %d\n",
diff --git a/sm/certreqgen.c b/sm/certreqgen.c
index 435333298..eb084f594 100644
--- a/sm/certreqgen.c
+++ b/sm/certreqgen.c
@@ -477,7 +477,7 @@ proc_parameters (ctrl_t ctrl, struct para_data_s *para,
     }
 
   /* Check the keylength.  NOTE: If you change this make sure that it
-     macthes the gpgconflist item in gpgsm.c  */
+     matches the gpgconflist item in gpgsm.c  */
   if (!get_parameter (para, pKEYLENGTH, 0))
     nbits = 3072;
   else
@@ -1270,7 +1270,7 @@ create_request (ctrl_t ctrl,
             }
           der[0] = 0x30; /* Sequence */
           der[1] = qlen + 2;
-          der[2] = 0x80; /* Context tag for an implict Octet String. */
+          der[2] = 0x80; /* Context tag for an implicit Octet String. */
           der[3] = qlen;
           memcpy (der+4, q, qlen);
           err = ksba_certreq_add_extension (cr, oidstr_authorityKeyIdentifier,
diff --git a/sm/decrypt.c b/sm/decrypt.c
index 5a947779f..42267e0de 100644
--- a/sm/decrypt.c
+++ b/sm/decrypt.c
@@ -251,7 +251,7 @@ ecdh_decrypt (unsigned char *secret, size_t secretlen,
     log_printhex (secret, secretlen, "ECDH X ..:");
 
   /* We have now the shared secret bytes in (SECRET,SECRETLEN).  Now
-   * we will compute the KEK using a value dervied from the secret
+   * we will compute the KEK using a value derived from the secret
    * bytes. */
   err = gcry_sexp_extract_param (enc_val, "enc-val",
                                  "&'encr-algo''wrap-algo''ukm'?s",
@@ -555,7 +555,7 @@ pwri_decrypt (ctrl_t ctrl, gcry_sexp_t enc_val,
                                  ioarray+2, ioarray+3, ioarray+4, NULL);
   if (err)
     {
-      /* If this is not pwri element, it is likly a kekri element
+      /* If this is not pwri element, it is likely a kekri element
        * which we do not yet support.  Change the error back to the
        * original as returned by ksba_cms_get_issuer.  */
       if (gpg_err_code (err) == GPG_ERR_NOT_FOUND)
diff --git a/sm/export.c b/sm/export.c
index a6ba40f5d..7b188c2fe 100644
--- a/sm/export.c
+++ b/sm/export.c
@@ -318,7 +318,7 @@ gpgsm_export (ctrl_t ctrl, strlist_t names, estream_t stream)
 
 /* Export a certificate and its private key.  RAWMODE controls the
    actual output:
-       0 - Private key and certifciate in PKCS#12 format
+       0 - Private key and certificate in PKCS#12 format
        1 - Only unencrypted private key in PKCS#8 format
        2 - Only unencrypted private key in PKCS#1 format
     */
@@ -485,7 +485,7 @@ gpgsm_p12_export (ctrl_t ctrl, const char *name, estream_t stream, int rawmode)
 }
 
 
-/* Print some info about the certifciate CERT to FP or STREAM */
+/* Print some info about the certificate CERT to FP or STREAM */
 static void
 print_short_info (ksba_cert_t cert, estream_t stream)
 {
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index b1a5f09b5..70463e734 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -1026,12 +1026,12 @@ main ( int argc, char **argv)
   /* Set the default policy file */
   opt.policy_file = make_filename (gnupg_homedir (), "policies.txt", NULL);
 
-  /* The configuraton directories for use by gpgrt_argparser.  */
+  /* The configuration directories for use by gpgrt_argparser.  */
   gpgrt_set_confdir (GPGRT_CONFDIR_SYS, gnupg_sysconfdir ());
   gpgrt_set_confdir (GPGRT_CONFDIR_USER, gnupg_homedir ());
 
   /* We are re-using the struct, thus the reset flag.  We OR the
-   * flags so that the internal intialized flag won't be cleared. */
+   * flags so that the internal initialized flag won't be cleared. */
   argc        = orig_argc;
   argv        = orig_argv;
   pargs.argc  = &argc;
@@ -1873,7 +1873,7 @@ main ( int argc, char **argv)
       /* We do not require a recipient for decryption but because
        * recipients and signers are always checked and log_error is
        * sometimes used (for failed signing keys or due to a failed
-       * CRL checking) that would have bumbed up the error counter.
+       * CRL checking) that would have bumped up the error counter.
        * We clear the counter in the decryption case because there is
        * no reason to force decryption to fail. */
       if (cmd == aDecrypt && !errcount)
diff --git a/sm/gpgsm.h b/sm/gpgsm.h
index 673ea1687..e9f74be8c 100644
--- a/sm/gpgsm.h
+++ b/sm/gpgsm.h
@@ -304,7 +304,7 @@ struct rootca_flags_s
                             information.  */
   unsigned int relax:1;  /* Relax checking of root certificates.  */
   unsigned int chain_model:1; /* Root requires the use of the chain model.  */
-  unsigned int qualified:1;   /* Root CA used for qualfied signatures.   */
+  unsigned int qualified:1;   /* Root CA used for qualified signatures.   */
   unsigned int de_vs:1;       /* Root CA is de-vs compliant.             */
 };
 
diff --git a/sm/import.c b/sm/import.c
index 4f993ef30..2efa24230 100644
--- a/sm/import.c
+++ b/sm/import.c
@@ -388,7 +388,7 @@ import_one (ctrl_t ctrl, struct stats_s *stats, estream_t fp)
 
 
 
-/* Re-import certifciates.  IN_FD is a list of linefeed delimited
+/* Re-import certificates.  IN_FD is a list of linefeed delimited
    fingerprints t re-import.  The actual re-import is done by clearing
    the ephemeral flag.  */
 static int
diff --git a/sm/keydb.c b/sm/keydb.c
index 9d704a110..1f93268a8 100644
--- a/sm/keydb.c
+++ b/sm/keydb.c
@@ -53,7 +53,7 @@ struct resource_item {
 
 
 /* Data used to keep track of keybox daemon sessions.  This allows us
- * to use several sessions with the keyboxd and also to re-use already
+ * to use several sessions with the keyboxd and also to reuse already
  * established sessions.  Note that gpgdm.h defines the type
  * keydb_local_t for this structure.  */
 struct keydb_local_s
@@ -1552,7 +1552,7 @@ keydb_search_desc_dump (struct keydb_search_desc *desc)
 
 
 
-/* Status callback for SEARCH and NEXT operaions.  */
+/* Status callback for SEARCH and NEXT operations.  */
 static gpg_error_t
 search_status_cb (void *opaque, const char *line)
 {
@@ -1601,7 +1601,7 @@ search_status_cb (void *opaque, const char *line)
  * keydb_search_reset().
  *
  * If no key matches the search description, the error code
- * GPG_ERR_NOT_FOUND is retruned.  If there was a match, 0 is
+ * GPG_ERR_NOT_FOUND is returned.  If there was a match, 0 is
  * returned.  If an error occurred, that error code is returned.
  *
  * The returned key is considered to be selected and the certificate
diff --git a/sm/keylist.c b/sm/keylist.c
index 47fe69f30..65902480d 100644
--- a/sm/keylist.c
+++ b/sm/keylist.c
@@ -56,7 +56,7 @@ struct list_external_parm_s
 #define OID_FLAG_UTF8 2
 /* The extension can be printed as a hex string.  */
 #define OID_FLAG_HEX  4
-/* Define if this specififies a key purpose.  */
+/* Define if this specifies a key purpose.  */
 #define OID_FLAG_KP   8
 
 /* A table mapping OIDs to a descriptive string. */
diff --git a/sm/minip12.c b/sm/minip12.c
index 4a1fab050..c95240b23 100644
--- a/sm/minip12.c
+++ b/sm/minip12.c
@@ -939,7 +939,7 @@ parse_bag_encrypted_data (struct p12_parse_ctx_s *ctx, tlv_parser_t tlv)
   if (!datalen)
     {
       err = gpg_error (GPG_ERR_DECRYPT_FAILED);
-      ctx->badpass = 1;  /* This is the most likley reason.  */
+      ctx->badpass = 1;  /* This is the most likely reason.  */
       goto bailout;
     }
 
@@ -2546,7 +2546,7 @@ build_ecc_key_sequence (gcry_mpi_t *kparms, int mode, size_t *r_length)
     }
 
   /* Unfortunately the private key D may come with a single leading
-   * zero byte.  This is becuase at some point it was treated as
+   * zero byte.  This is because at some point it was treated as
    * signed MPI and the code made sure that it is always interpreted
    * as unsigned.  Fortunately we got the size of the curve and can
    * detect such a case reliable.  */
diff --git a/sm/misc.c b/sm/misc.c
index 3fdfd769d..ec6aeb751 100644
--- a/sm/misc.c
+++ b/sm/misc.c
@@ -308,7 +308,7 @@ transform_sigval (const unsigned char *sigval, size_t sigvallen, int mdalgo,
 
 
 /* Wrapper around ksba_cms_get_sig_val to return a gcrypt object
- * instaed of ksba's canonical s-expression.  On errror NULL is return
+ * instead of ksba's canonical s-expression.  On error NULL is return
  * and in some cases an error message is printed.  */
 gcry_sexp_t
 gpgsm_ksba_cms_get_sig_val (ksba_cms_t cms, int idx)
diff --git a/tests/asschk.c b/tests/asschk.c
index e278069bf..b32f9361c 100644
--- a/tests/asschk.c
+++ b/tests/asschk.c
@@ -25,7 +25,7 @@
    only white spaces are ignored, line with a hash sign as first non
    white space character are treated as comments.
 
-   A simple macro mechanism is implemnted.  Macros are expanded before
+   A simple macro mechanism is implemented.  Macros are expanded before
    a line is processed but after comment processing.  Macros are only
    expanded once and non existing macros expand to the empty string.
    A macro is dereferenced by prefixing its name with a dollar sign;
@@ -36,7 +36,7 @@
    and an equal sign.  The value is assigned verbatim if it does not
    resemble a command, otherwise the return value of the command will
    get assigned.  The command "let" may be used to assign values
-   unambigiously and it should be used if the value starts with a
+   unambiguously and it should be used if the value starts with a
    letter.
 
    Conditions are not yes implemented except for a simple evaluation
diff --git a/tests/openpgp/all-tests.scm b/tests/openpgp/all-tests.scm
index e40e02dc3..3c6ae5eab 100644
--- a/tests/openpgp/all-tests.scm
+++ b/tests/openpgp/all-tests.scm
@@ -80,7 +80,7 @@
 				    (path-join "tests" "openpgp" name)
 				    (in-srcdir "tests" "openpgp" name)
 				    "--use-keyboxd")) all-tests))
-	      ;; The third pass uses the legact pubring.gpg
+	      ;; The third pass uses the legacy pubring.gpg
 	      (map (lambda (name)
 		     (test::scm setup-use-keyring
 				"keyring"
diff --git a/tests/openpgp/defs.scm b/tests/openpgp/defs.scm
index 1ac25bf65..686439a36 100644
--- a/tests/openpgp/defs.scm
+++ b/tests/openpgp/defs.scm
@@ -113,7 +113,7 @@
 
 ;; Note that the entry for pinentry relies on the fact that
 ;; GNUPG_BUILD_ROOT is the top of the build root.  The second element
-;; in each list is an envvar which can be used to specifiy a different
+;; in each list is an envvar which can be used to specify a different
 ;; tool than the installed one.
 (define tools
   '((gpgv "GPGV" "g10/gpgv")
diff --git a/tests/openpgp/fake-pinentry.c b/tests/openpgp/fake-pinentry.c
index 18b60574b..b460a1da3 100644
--- a/tests/openpgp/fake-pinentry.c
+++ b/tests/openpgp/fake-pinentry.c
@@ -289,7 +289,7 @@ main (int argc, char **argv)
           if (passphrase)
             reply ("D %s\n", passphrase);
           else
-            reply ("D deafult\n");
+            reply ("D default\n");
         }
       else if (strncmp (buffer, "BYE", 3) == 0)
 	{
diff --git a/tests/tpm2dtests/all-tests.scm b/tests/tpm2dtests/all-tests.scm
index 8934f01f2..0dcb129b7 100644
--- a/tests/tpm2dtests/all-tests.scm
+++ b/tests/tpm2dtests/all-tests.scm
@@ -72,7 +72,7 @@
 				(path-join "tests" "tpm2dtests" name)
 				(in-srcdir "tests" "tpm2dtests" name)
 				"--use-keyboxd")) all-tests)
-              ;; The third pass uses the legact pubring.gpg
+              ;; The third pass uses the legacy pubring.gpg
 	      (map (lambda (name)
 		     (test::scm setup-use-keyring
                                 "keyring"
diff --git a/tools/call-dirmngr.c b/tools/call-dirmngr.c
index d85801530..0401af201 100644
--- a/tools/call-dirmngr.c
+++ b/tools/call-dirmngr.c
@@ -359,7 +359,7 @@ wkd_get_key (const char *addrspec, estream_t *r_key)
 
 
 /* Send the KS_GET command to the dirmngr.  The caller provides CB
- * which is called for each key.  The callback is called wit a stream
+ * which is called for each key.  The callback is called with a stream
  * conveying a single key and several other informational parameters.
  * DOMAIN restricts the returned keys to this domain.  */
 gpg_error_t
diff --git a/tools/card-yubikey.c b/tools/card-yubikey.c
index 63d49c762..9700f2813 100644
--- a/tools/card-yubikey.c
+++ b/tools/card-yubikey.c
@@ -305,7 +305,7 @@ yk_enable_disable (struct ykapps_s *yk, struct iface_s *iface,
 
 
 /* Implementation part of cmd_yubikey.  ARGV is an array of size ARGc
- * with the argumets given to the yubikey command.  Note that ARGV has
+ * with the arguments given to the yubikey command.  Note that ARGV has
  * no terminating NULL so that ARGC must be considered.  FP is the
  * stream to output information.  This function must only be called on
  * Yubikeys. */
diff --git a/tools/gpg-authcode-sign.sh b/tools/gpg-authcode-sign.sh
index 56b743b94..cdf8975e4 100644
--- a/tools/gpg-authcode-sign.sh
+++ b/tools/gpg-authcode-sign.sh
@@ -73,7 +73,7 @@ AUTHENTICODE_TOOL="C:\Program Files (x86)\Windows Kits\10\bin\signtool.exe"
 # The URL for the timestamping service
 AUTHENTICODE_TSURL=http://rfc3161timestamp.globalsign.com/advanced
 
-# To use osslsigncode the follwing entries are required and
+# To use osslsigncode the following entries are required and
 # an empty string must be given for AUTHENTICODE_SIGNHOST.
 # They are greped by the Makefile.  For example:
 #AUTHENTICODE_KEY=/home/foo/.gnupg/my-authenticode-key.p12
@@ -99,7 +99,7 @@ autogenrc="$HOME/.gnupg-autogen.rc"
 dryrun=
 stamp=
 buildtype=
-# Set defaults  accrding to our build system.
+# Set defaults according to our build system.
 if [ -n "$abs_top_srcdir" -a -f "$abs_top_srcdir/packages/BUILDTYPE" ]; then
     buildtype=$(cat "$abs_top_srcdir/packages/BUILDTYPE")
 elif [ -f "../packages/BUILDTYPE" ]; then
diff --git a/tools/gpg-card.c b/tools/gpg-card.c
index 3d66033bf..f117330f8 100644
--- a/tools/gpg-card.c
+++ b/tools/gpg-card.c
@@ -3224,7 +3224,7 @@ cmd_factoryreset (card_info_t info)
    *   /echo Card has been reset to factory defaults
    *
    * For a PIV application on a Yubikey it merely issues the Yubikey
-   * specific resset command.
+   * specific reset command.
    */
 
   err = scd_learn (info, 0);
diff --git a/tools/gpg-check-pattern.c b/tools/gpg-check-pattern.c
index 2698431c9..9859074e3 100644
--- a/tools/gpg-check-pattern.c
+++ b/tools/gpg-check-pattern.c
@@ -327,7 +327,7 @@ parse_pattern_file (char *data, size_t datalen)
   unsigned int lineno = 0;
   unsigned int icase_mode = 1;
   unsigned int accept_mode = 0;
-  unsigned int newblock = 1;  /* The first implict block.  */
+  unsigned int newblock = 1;  /* The first implicit block.  */
 
   /* Estimate the number of entries by counting the non-comment lines.  */
   arraysize = 0;
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index b54b52c69..adfadf7d7 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -103,7 +103,7 @@ static void keyboxd_runtime_change (int killflag);
 
 /* STRING_ARRAY is a malloced array with malloced strings.  It is used
  * a space to store strings so that other objects may point to these
- * strings. It shall never be shrinked or any items changes.
+ * strings. It shall never be shrunk or any items changed.
  * STRING_ARRAY itself may be reallocated to increase the size of the
  * table.  STRING_ARRAY_USED is the number of items currently used,
  * STRING_ARRAY_SIZE is the number of calloced slots. */
@@ -298,7 +298,7 @@ static const struct
 
 
 /* Each option we want to support in gpgconf has the needed
- * information in a static list per componenet.  This struct describes
+ * information in a static list per component.  This struct describes
  * the info for a single option.  */
 struct known_option_s
 {
@@ -443,7 +443,7 @@ static const char *known_pseudo_options_gpg[] =
     *                  v-- ARGPARSE_TYPE_INT */
    "compliance_de_vs:0:1:@:",
    /* True is use_keyboxd is enabled.  That option can be set in
-    * common.conf but is not direcly supported by gpgconf.  Thus we
+    * common.conf but is not directly supported by gpgconf.  Thus we
     * only allow to read it out.
     *                  v-- ARGPARSE_TYPE_INT */
    "use_keyboxd:0:1:@:",
@@ -564,7 +564,7 @@ struct gc_option_s
   unsigned int gpgconf_list:1; /* Mentioned by --gpgconf-list.  */
 
   unsigned int has_default:1;  /* The option has a default value.  */
-  unsigned int def_in_desc:1;  /* The default is in the descrition.  */
+  unsigned int def_in_desc:1;  /* The default is in the description.  */
   unsigned int no_arg_desc:1;  /* The argument has a default  ???.  */
   unsigned int no_change:1;    /* User shall not change the option.   */
 
@@ -1867,7 +1867,7 @@ retrieve_options_from_program (gc_component_id_t component, int only_installed)
        * gpgrt_parser.  Unfortunately there is no private pointer in
        * the public option table struct so that we can't add extra
        * data we need here.  Thus we need to build up another table
-       * for such info and for ease of use we also copy the tehre the
+       * for such info and for ease of use we also copy there the
        * data from the option table.  It is not possible to use the
        * known_option_s for this because that one does not carry
        * header lines and it might also be problematic to use such
@@ -1882,7 +1882,7 @@ retrieve_options_from_program (gc_component_id_t component, int only_installed)
         }
 
       /* Note that as per argparser specs the opt_table uses "@" to
-       * specifify an empty description.  In the DESC script of
+       * specify an empty description.  In the DESC script of
        * options (opt_info_t) we want to have a real empty string.  */
       opt_info[opt_info_used].name = optname;
       if (*optdesc == '@' && !optdesc[1])
diff --git a/tools/gpgconf.c b/tools/gpgconf.c
index 301c1838f..a2113aee0 100644
--- a/tools/gpgconf.c
+++ b/tools/gpgconf.c
@@ -770,7 +770,7 @@ main (int argc, char **argv)
   if (changeuser && (err = gnupg_chuid (changeuser, 0)))
     gpgconf_failure (err);
 
-  /* Set the configuraton directories for use by gpgrt_argparser.  We
+  /* Set the configuration directories for use by gpgrt_argparser.  We
    * don't have a configuration file for this program but we have code
    * which reads the component's config files.  */
   gpgrt_set_confdir (GPGRT_CONFDIR_SYS, gnupg_sysconfdir ());
diff --git a/tools/gpgtar-list.c b/tools/gpgtar-list.c
index 55d9246af..74706cddd 100644
--- a/tools/gpgtar-list.c
+++ b/tools/gpgtar-list.c
@@ -189,7 +189,7 @@ parse_header (const void *record, const char *filename, tarinfo_t info)
   return header;
 }
 
-/* Parse the extended header.  This funcion may modify BUFFER.  */
+/* Parse the extended header.  This function may modify BUFFER.  */
 static gpg_error_t
 parse_extended_header (const char *fname,
                        char *buffer, size_t buflen, strlist_t *r_exthdr)
@@ -317,14 +317,14 @@ read_header (estream_t stream, tarinfo_t info,
   /* Read the extended header.  */
   if (!hdr->nrecords)
     {
-      /* More than 64k for an extedned header is surely too large.  */
+      /* More than 64k for an extended header is surely too large.  */
       log_info ("%s: warning: empty extended header\n",
                  es_fname_get (stream));
       return 0;
     }
   if (hdr->nrecords > 65536 / RECORDSIZE)
     {
-      /* More than 64k for an extedned header is surely too large.  */
+      /* More than 64k for an extended header is surely too large.  */
       log_error ("%s: extended header too large - skipping\n",
                  es_fname_get (stream));
       return 0;
@@ -365,7 +365,7 @@ read_header (estream_t stream, tarinfo_t info,
     }
 
   xfree (buffer);
-  /* Now tha the extedned header has been read, we read the next
+  /* Now that the extended header has been read, we read the next
    * header without allowing an extended header.  */
   return read_header (stream, info, r_header, NULL);
 }
diff --git a/tools/gpgtar.c b/tools/gpgtar.c
index f93ba2e65..3e4d135f0 100644
--- a/tools/gpgtar.c
+++ b/tools/gpgtar.c
@@ -482,7 +482,7 @@ main (int argc, char **argv)
   /* Set default options */
   opt.status_fd = NULL;
 
-  /* The configuraton directories for use by gpgrt_argparser.  */
+  /* The configuration directories for use by gpgrt_argparser.  */
   gpgrt_set_confdir (GPGRT_CONFDIR_SYS, gnupg_sysconfdir ());
   gpgrt_set_confdir (GPGRT_CONFDIR_USER, gnupg_homedir ());
 
diff --git a/tpm2d/Makefile.am b/tpm2d/Makefile.am
index ef9487139..4394b102f 100644
--- a/tpm2d/Makefile.am
+++ b/tpm2d/Makefile.am
@@ -1,4 +1,4 @@
-# Makfile.am - Makefile for tpm2d
+# Makefile.am - Makefile for tpm2d
 # Copyright (C) 2021 James Bottomley <James.Bottomley@HansenPartnership.com>
 #
 # This file is part of GnuPG.
diff --git a/tpm2d/tpm2daemon.c b/tpm2d/tpm2daemon.c
index 8e16e931a..46d20388a 100644
--- a/tpm2d/tpm2daemon.c
+++ b/tpm2d/tpm2daemon.c
@@ -411,12 +411,12 @@ main (int argc, char **argv )
   */
 
 
-  /* The configuraton directories for use by gpgrt_argparser.  */
+  /* The configuration directories for use by gpgrt_argparser.  */
   gpgrt_set_confdir (GPGRT_CONFDIR_SYS, gnupg_sysconfdir ());
   gpgrt_set_confdir (GPGRT_CONFDIR_USER, gnupg_homedir ());
 
   /* We are re-using the struct, thus the reset flag.  We OR the
-   * flags so that the internal intialized flag won't be cleared. */
+   * flags so that the internal initialized flag won't be cleared. */
   argc = orig_argc;
   argv = orig_argv;
   pargs.argc = &argc;
@@ -895,7 +895,7 @@ handle_signal (int signo)
 /* Create a name for the socket.  We check for valid characters as
    well as against a maximum allowed length for a unix domain socket
    is done.  The function terminates the process in case of an error.
-   Retunrs: Pointer to an allcoated string with the absolute name of
+   Returns: Pointer to an allocated string with the absolute name of
    the socket used.  */
 static char *
 create_socket_name (char *standard_name)