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

12 files changed, 20 insertions, 20 deletions

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)