aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustus Winter <[email protected]>2016-10-27 12:58:01 +0000
committerJustus Winter <[email protected]>2016-10-27 12:59:56 +0000
commit445f0c13d751f6dee9d70ef0785866ab2a7ea120 (patch)
tree55b7113c092bed4ff910a4d2c377e92775c5c1c7
parentg10: Assert preconditions. (diff)
downloadgnupg-445f0c13d751f6dee9d70ef0785866ab2a7ea120.tar.gz
gnupg-445f0c13d751f6dee9d70ef0785866ab2a7ea120.zip
Fix typos.
-- Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to '')
-rw-r--r--agent/command-ssh.c2
-rw-r--r--build-aux/speedo/w32/exdll.h2
-rw-r--r--build-aux/speedo/w32/g4wihelp.c2
-rw-r--r--common/convert.c2
-rw-r--r--common/get-passphrase.c2
-rw-r--r--common/session-env.c2
-rw-r--r--dirmngr/server.c2
-rw-r--r--g10/getkey.c2
-rw-r--r--g10/import.c2
-rw-r--r--g10/mainproc.c2
-rw-r--r--g10/pkclist.c4
-rw-r--r--g13/sh-cmd.c2
-rw-r--r--scd/apdu.c2
13 files changed, 14 insertions, 14 deletions
diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index 7bcda504c..969d89846 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -1127,7 +1127,7 @@ confirm_flag_from_sshcontrol (const char *hexgrip)
/* Open the ssh control file for reading. This is a public version of
open_control_file. The caller must use ssh_close_control_file to
- release the retruned handle. */
+ release the returned handle. */
ssh_control_file_t
ssh_open_control_file (void)
{
diff --git a/build-aux/speedo/w32/exdll.h b/build-aux/speedo/w32/exdll.h
index e5ba3bbe9..bb13ae097 100644
--- a/build-aux/speedo/w32/exdll.h
+++ b/build-aux/speedo/w32/exdll.h
@@ -23,7 +23,7 @@
* 3. This notice may not be removed or altered from any source
* distribution.
************************************************************
- * 2005-11-14 wk Applied license text to orginal exdll.h file from
+ * 2005-11-14 wk Applied license text to original exdll.h file from
* NSIS 2.0.4 and did some formatting changes.
*/
diff --git a/build-aux/speedo/w32/g4wihelp.c b/build-aux/speedo/w32/g4wihelp.c
index fe903aa57..012e4af0b 100644
--- a/build-aux/speedo/w32/g4wihelp.c
+++ b/build-aux/speedo/w32/g4wihelp.c
@@ -23,7 +23,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/convert.c b/common/convert.c
index 30e5a60f3..4611e7765 100644
--- a/common/convert.c
+++ b/common/convert.c
@@ -176,7 +176,7 @@ bin2hexcolon (const void *buffer, size_t length, char *stringbuf)
store that at BUFFER. HEXSTRING is either delimited by end of
string or a white space character. The function makes sure that
the resulting string in BUFFER is terminated by a Nul byte. Note
- that the retruned string may include embedded Nul bytes; the extra
+ that the returned string may include embedded Nul bytes; the extra
Nul byte at the end is used to make sure tha the result can always
be used as a C-string.
diff --git a/common/get-passphrase.c b/common/get-passphrase.c
index 25c1602dc..8c7496ca8 100644
--- a/common/get-passphrase.c
+++ b/common/get-passphrase.c
@@ -136,7 +136,7 @@ default_inq_cb (void *opaque, const char *line)
PROMPT is the prompt string to label the entry box, it may be NULL
for a default one. DESC_MSG is a longer description to be
displayed above the entry box, if may be NULL for a default one.
- If USE_SECMEM is true, the returned passphrase is retruned in
+ If USE_SECMEM is true, the returned passphrase is returned in
secure memory. The length of all these strings is limited; they
need to fit in their encoded form into a standard Assuan line (i.e
less then about 950 characters). All strings shall be UTF-8. */
diff --git a/common/session-env.c b/common/session-env.c
index 8c3dbb5e7..20b7c06c4 100644
--- a/common/session-env.c
+++ b/common/session-env.c
@@ -372,7 +372,7 @@ session_env_getenv_or_default (session_env_t se, const char *name,
/* List the entire environment stored in SE. The caller initially
needs to set the value of ITERATOR to 0 and then call this function
- until it returns NULL. The value is retruned at R_VALUE. If
+ until it returns NULL. The value is returned at R_VALUE. If
R_DEFAULT is not NULL, the default flag is stored on return. The
default flag indicates that the value has been taken from the
process' environment. The caller must not change the returned
diff --git a/dirmngr/server.c b/dirmngr/server.c
index 2d4f292f5..4e6f42653 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -1367,7 +1367,7 @@ lookup_cert_by_pattern (assuan_context_t ctx, char *line,
}
}
- /* First look through the internal cache. The certifcates retruned
+ /* First look through the internal cache. The certifcates returned
here are not counted towards the truncation limit. */
if (single && !cache_only)
; /* Do not read from the local cache in this case. */
diff --git a/g10/getkey.c b/g10/getkey.c
index 22842fe96..325f00bc9 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -1935,7 +1935,7 @@ getkey_byname (ctrl_t ctrl, getkey_ctx_t *retctx, PKT_public_key *pk,
* and then xfree(PK)).
*
* RET_KEYBLOCK can be given as NULL; if it is not NULL it the entire
- * found keyblock wis retruned hich must be released with
+ * found keyblock is returned which must be released with
* release_kbnode. If the function returns an error NULL is stored at
* RET_KEYBLOCK.
*
diff --git a/g10/import.c b/g10/import.c
index d65a7ae4c..88ee16254 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -82,7 +82,7 @@ struct import_stats_s
*
* FIXME: We should put this into the CTRL object but that requires a
* lot more changes right now. For now we use save and restore
- * fucntion to temporary change them.
+ * function to temporary change them.
*/
/* Definition of the import filters. */
struct import_filter_s
diff --git a/g10/mainproc.c b/g10/mainproc.c
index fbcf316ac..5dc7c3323 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -2246,7 +2246,7 @@ proc_tree (CTX c, kbnode_t node)
/* We must skip our special plaintext marker packets here because
they may be the root packet. These packets are only used in
- addtional checks and skipping them here doesn't matter. */
+ additional checks and skipping them here doesn't matter. */
while (node
&& node->pkt->pkttype == PKT_GPG_CONTROL
&& node->pkt->pkt.gpg_control->control == CTRLPKT_PLAINTEXT_MARK)
diff --git a/g10/pkclist.c b/g10/pkclist.c
index 823d67062..da4cc0647 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -451,8 +451,8 @@ do_we_trust( PKT_public_key *pk, unsigned int trustlevel )
return 1; /* yes */
case TRUST_NEVER:
- /* This is retruned can be returned by TOFU, which can return
- negative assertions. */
+ /* This can be returned by TOFU, which can return negative
+ assertions. */
log_info(_("%s: This key is bad! It has been marked as untrusted!\n"),
keystr_from_pk(pk));
return 0; /* no */
diff --git a/g13/sh-cmd.c b/g13/sh-cmd.c
index 6a4a7d85d..d9a0f6c05 100644
--- a/g13/sh-cmd.c
+++ b/g13/sh-cmd.c
@@ -162,7 +162,7 @@ static const char hlp_finddevice[] =
"\n"
"Find the device matching NAME. NAME be any identifier from\n"
"g13tab permissible for the user. The corresponding block\n"
- "device is retruned using a status line.";
+ "device is returned using a status line.";
static gpg_error_t
cmd_finddevice (assuan_context_t ctx, char *line)
{
diff --git a/scd/apdu.c b/scd/apdu.c
index c139d76c1..5b7290eab 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -692,7 +692,7 @@ ct_get_status (int slot, unsigned int *status)
}
/* Actually send the APDU of length APDULEN to SLOT and return a
- maximum of *BUFLEN data in BUFFER, the actual retruned size will be
+ maximum of *BUFLEN data in BUFFER, the actual returned size will be
set to BUFLEN. Returns: CT API error code. */
static int
ct_send_apdu (int slot, unsigned char *apdu, size_t apdulen,