aboutsummaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
Diffstat (limited to 'g10')
-rw-r--r--g10/getkey.c2
-rw-r--r--g10/import.c2
-rw-r--r--g10/mainproc.c2
-rw-r--r--g10/pkclist.c4
4 files changed, 5 insertions, 5 deletions
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 */