summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2020-02-18 15:34:42 +0100
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2020-02-19 00:07:46 +0100
commit0904b8ef348a52335c378bee6dc90a978885d66f (patch)
treeaff1ea1d709d45724af04b7e985bca1284bdb2a0 /tools
parentdoc: Correction of typo in documentation of KEY_CONSIDERED (diff)
downloadgnupg2-0904b8ef348a52335c378bee6dc90a978885d66f.tar.xz
gnupg2-0904b8ef348a52335c378bee6dc90a978885d66f.zip
Spelling cleanup.
No functional changes, just fixing minor spelling issues. --- Most of these were identified from the command line by running: codespell \ --ignore-words-list fpr,stati,keyserver,keyservers,asign,cas,iff,ifset \ --skip '*.po,ChangeLog*,help.*.txt,*.jpg,*.eps,*.pdf,*.png,*.gpg,*.asc' \ doc g13 g10 kbx agent artwork scd tests tools am common dirmngr sm \ NEWS README README.maint TODO Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Diffstat (limited to 'tools')
-rw-r--r--tools/card-call-scd.c4
-rw-r--r--tools/card-yubikey.c2
-rw-r--r--tools/gpg-card.c8
-rw-r--r--tools/gpg-check-pattern.c2
-rw-r--r--tools/gpg-connect-agent.c2
-rw-r--r--tools/gpg-pair-tool.c6
-rw-r--r--tools/gpgconf-comp.c6
-rw-r--r--tools/gpgconf.c2
-rw-r--r--tools/mime-parser.c4
-rw-r--r--tools/watchgnupg.c2
10 files changed, 19 insertions, 19 deletions
diff --git a/tools/card-call-scd.c b/tools/card-call-scd.c
index 1737630a2..62c1d1b2f 100644
--- a/tools/card-call-scd.c
+++ b/tools/card-call-scd.c
@@ -804,7 +804,7 @@ learn_status_cb (void *opaque, const char *line)
/* Note that KEY-ATTR returns OpenPGP algorithm numbers but
* we want to use the Gcrypt numbers here. A compatible
- * change would be to add another paramater along with a
+ * change would be to add another parameter along with a
* magic algo number to indicate that. */
algo = PUBKEY_ALGO_RSA;
keyno = n = 0;
@@ -1215,7 +1215,7 @@ scd_writecert (const char *certidstr,
/* Send a WRITEKEY command to the agent (so that the agent can fetch
* the key to write). KEYGRIP is the hexified keygrip of the source
- * key which will be written to tye slot KEYREF. FORCE must be true
+ * key which will be written to the slot KEYREF. FORCE must be true
* to overwrite an existing key. */
gpg_error_t
scd_writekey (const char *keyref, int force, const char *keygrip)
diff --git a/tools/card-yubikey.c b/tools/card-yubikey.c
index fff669cc0..a723739f1 100644
--- a/tools/card-yubikey.c
+++ b/tools/card-yubikey.c
@@ -306,7 +306,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
- * no terminating NULL so that ARGC must be considred. FP is the
+ * no terminating NULL so that ARGC must be considered. FP is the
* stream to output information. This function must only be called on
* Yubikeys. */
gpg_error_t
diff --git a/tools/gpg-card.c b/tools/gpg-card.c
index 4af6d01ff..626579882 100644
--- a/tools/gpg-card.c
+++ b/tools/gpg-card.c
@@ -458,10 +458,10 @@ get_selection (const char *prompt)
/* Simply prints TEXT to the output. Returns 0 as a convenience.
- * This is a separate fucntion so that it can be extended to run
+ * This is a separate function so that it can be extended to run
* less(1) or so. The extra arguments are int values terminated by a
* 0 to indicate card application types supported with this command.
- * If none are given (just teh final 0), this is a general
+ * If none are given (just the final 0), this is a general
* command. */
static gpg_error_t
print_help (const char *text, ...)
@@ -1206,7 +1206,7 @@ cmd_authenticate (card_info_t info, char *argstr)
if (!info)
return print_help
("AUTHENTICATE [--setkey] [--raw] [< FILE]|KEY\n\n"
- "Perform a mutual autentication either by reading the key\n"
+ "Perform a mutual authentication either by reading the key\n"
"from FILE or by taking it from the command line. Without\n"
"the option --raw the key is expected to be hex encoded.\n"
"To install a new administration key --setkey is used; this\n"
@@ -2015,7 +2015,7 @@ cmd_forcesig (card_info_t info)
-/* Helper for cmd_generate_openpgp. Nore that either 0 or 1 is stored at
+/* Helper for cmd_generate_openpgp. Note that either 0 or 1 is stored at
* FORCED_CHV1. */
static gpg_error_t
check_pin_for_key_operation (card_info_t info, int *forced_chv1)
diff --git a/tools/gpg-check-pattern.c b/tools/gpg-check-pattern.c
index dee5d5d47..43cea1dd1 100644
--- a/tools/gpg-check-pattern.c
+++ b/tools/gpg-check-pattern.c
@@ -223,7 +223,7 @@ main (int argc, char **argv )
/* Read a file FNAME into a buffer and return that malloced buffer.
Caller must free the buffer. On error NULL is returned, on success
the valid length of the buffer is stored at R_LENGTH. The returned
- buffer is guarnteed to be nul terminated. */
+ buffer is guaranteed to be nul terminated. */
static char *
read_file (const char *fname, size_t *r_length)
{
diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c
index 0a128b31a..564b3007f 100644
--- a/tools/gpg-connect-agent.c
+++ b/tools/gpg-connect-agent.c
@@ -492,7 +492,7 @@ arithmetic_op (int operator, const char *operands)
unescape ARGS
Remove C-style escapes from string. Note that "\0" and
- "\x00" terminate the string implictly. Use "\x7d" to
+ "\x00" terminate the string implicitly. Use "\x7d" to
represent the closing brace. The args start right after
the first space after the function name.
diff --git a/tools/gpg-pair-tool.c b/tools/gpg-pair-tool.c
index 4a18b97bd..61877b171 100644
--- a/tools/gpg-pair-tool.c
+++ b/tools/gpg-pair-tool.c
@@ -87,7 +87,7 @@
* The Responder receives the DHPART2 message and checks that the hash
* of the received PKi matches the Hash(PKi) value as received earlier
* with the COMMIT message. The Responder now also computes the
- * shared master secret from its SKr and the recived PKi and derives
+ * shared master secret from its SKr and the received PKi and derives
* the keys:
*
* - HMACi-key using the label "GPG-pa1-HMACi-key".
@@ -324,7 +324,7 @@ set_status_fd (int fd)
}
-/* Write a status line with code NO followed by the outout of the
+/* Write a status line with code NO followed by the output of the
* printf style FORMAT. The caller needs to make sure that LFs and
* CRs are not printed. */
static void
@@ -876,7 +876,7 @@ send_message (const unsigned char *msg, size_t msglen)
* error NULL is stored at R_MSG, a diagnostic printed and an error
* code returned. The returned message has a proper message type and
* an appropriate length. The message type is stored at R_MSGTYPE and
- * if a state is availabale it is stored at R_STATE. */
+ * if a state is available it is stored at R_STATE. */
static gpg_error_t
read_message (unsigned char **r_msg, size_t *r_msglen, int *r_msgtype,
nvc_t *r_state)
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index e6dc91d21..da3b49a2b 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -1393,9 +1393,9 @@ gc_component_reload (int component)
/* More or less Robust version of dgettext. It has the side effect of
switching the codeset to utf-8 because this is what we want to
output. In theory it is possible to keep the original code set and
- switch back for regular disgnostic output (redefine "_(" for that)
- but given the natur of this tool, being something invoked from
- other pograms, it does not make much sense. */
+ switch back for regular diagnostic output (redefine "_(" for that)
+ but given the nature of this tool, being something invoked from
+ other programs, it does not make much sense. */
static const char *
my_dgettext (const char *domain, const char *msgid)
{
diff --git a/tools/gpgconf.c b/tools/gpgconf.c
index 6dd3c0c9c..44d916bc2 100644
--- a/tools/gpgconf.c
+++ b/tools/gpgconf.c
@@ -331,7 +331,7 @@ valid_swdb_name_p (const char *name)
* Common codes seen:
* GPG_ERR_TOO_OLD :: The SWDB file is to old to be used.
* GPG_ERR_ENOENT :: The SWDB file is not available.
- * GPG_ERR_BAD_SIGNATURE :: Currupted SWDB file.
+ * GPG_ERR_BAD_SIGNATURE :: Corrupted SWDB file.
* filedate:: Date of the swdb file (yyyymmddThhmmss)
* verified:: Date we checked the validity of the file (yyyyymmddThhmmss)
* version :: The version string from the swdb.
diff --git a/tools/mime-parser.c b/tools/mime-parser.c
index 98f27105c..0db1a9c23 100644
--- a/tools/mime-parser.c
+++ b/tools/mime-parser.c
@@ -130,7 +130,7 @@ show_message_parser_event (rfc822parse_event_t event)
/* Do in-place decoding of quoted-printable data of LENGTH in BUFFER.
Returns the new length of the buffer and stores true at R_SLBRK if
the line ended with a soft line break; false is stored if not.
- This function asssumes that a complete line is passed in
+ This function assumes that a complete line is passed in
buffer. */
static size_t
qp_decode (char *buffer, size_t length, int *r_slbrk)
@@ -196,7 +196,7 @@ parse_message_cb (void *opaque, rfc822parse_event_t event, rfc822parse_t msg)
const char *s;
int rc = 0;
- /* Make the RFC822 parser context availabale for callbacks. */
+ /* Make the RFC822 parser context available for callbacks. */
ctx->msg = msg;
if (ctx->debug)
diff --git a/tools/watchgnupg.c b/tools/watchgnupg.c
index 38ee11bd4..8cdc257f8 100644
--- a/tools/watchgnupg.c
+++ b/tools/watchgnupg.c
@@ -439,7 +439,7 @@ main (int argc, char **argv)
{
/* No args given - figure out the socket using gpgconf. We also
* force overwriting the socket because the constructed name
- * can't be some accidently given name. */
+ * can't be some accidentally given name. */
logname = get_logname (homedir);
force = 1;
}