aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/call-dirmngr.c2
-rw-r--r--tools/card-yubikey.c2
-rw-r--r--tools/gpg-authcode-sign.sh4
-rw-r--r--tools/gpg-card.c2
-rw-r--r--tools/gpg-check-pattern.c2
-rw-r--r--tools/gpgconf-comp.c12
-rw-r--r--tools/gpgconf.c2
-rw-r--r--tools/gpgtar-list.c8
-rw-r--r--tools/gpgtar.c2
9 files changed, 18 insertions, 18 deletions
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 ());