aboutsummaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
Diffstat (limited to 'g10')
-rw-r--r--g10/call-agent.c4
-rw-r--r--g10/call-agent.h2
-rw-r--r--g10/call-keyboxd.c2
-rw-r--r--g10/export.c2
-rw-r--r--g10/getkey.c4
-rw-r--r--g10/import.c4
-rw-r--r--g10/keydb.c2
-rw-r--r--g10/keyedit.c2
-rw-r--r--g10/keygen.c2
-rw-r--r--g10/keyid.c4
-rw-r--r--g10/keyring.c4
-rw-r--r--g10/objcache.c4
-rw-r--r--g10/tdbio.c2
13 files changed, 19 insertions, 19 deletions
diff --git a/g10/call-agent.c b/g10/call-agent.c
index 7e56d8d14..e638b83eb 100644
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@@ -1091,7 +1091,7 @@ getattr_one_status_cb (void *opaque, const char *line)
/* Simplified version of agent_scd_getattr. This function returns
- * only the first occurance of the attribute NAME and stores it at
+ * only the first occurrence of the attribute NAME and stores it at
* R_VALUE. A nul in the result is silennly replaced by 0xff. On
* error NULL is stored at R_VALUE. */
gpg_error_t
@@ -1444,7 +1444,7 @@ agent_scd_readcert (const char *certidstr,
}
-/* Callback for the agent_scd_readkey fucntion. */
+/* Callback for the agent_scd_readkey function. */
static gpg_error_t
readkey_status_cb (void *opaque, const char *line)
{
diff --git a/g10/call-agent.h b/g10/call-agent.h
index b8199db15..8df5ff5a3 100644
--- a/g10/call-agent.h
+++ b/g10/call-agent.h
@@ -174,7 +174,7 @@ unsigned long agent_get_s2k_count (void);
0 if not available, positive value if the secret key is available. */
int agent_probe_secret_key (ctrl_t ctrl, PKT_public_key *pk);
-/* Ask the agent whether a secret key is availabale for any of the
+/* Ask the agent whether a secret key is available for any of the
keys (primary or sub) in KEYBLOCK. Returns 0 if available. */
gpg_error_t agent_probe_any_secret_key (ctrl_t ctrl, kbnode_t keyblock);
diff --git a/g10/call-keyboxd.c b/g10/call-keyboxd.c
index abcc82500..d7d9e2da4 100644
--- a/g10/call-keyboxd.c
+++ b/g10/call-keyboxd.c
@@ -876,7 +876,7 @@ keydb_insert_keyblock (KEYDB_HANDLE hd, kbnode_t kb)
* search yet on this database handle (or called keydb_search_reset),
* then this function returns an error.
*
- * Returns 0 on success or an error code, if an error occured. */
+ * Returns 0 on success or an error code, if an error occurred. */
gpg_error_t
keydb_delete_keyblock (KEYDB_HANDLE hd)
{
diff --git a/g10/export.c b/g10/export.c
index 9160680d7..052e16717 100644
--- a/g10/export.c
+++ b/g10/export.c
@@ -556,7 +556,7 @@ match_curve_skey_pk (gcry_sexp_t s_key, PKT_public_key *pk)
}
-/* Return a canonicalized public key algoithms. This is used to
+/* Return a canonicalized public key algorithms. This is used to
compare different flavors of algorithms (e.g. ELG and ELG_E are
considered the same). */
static enum gcry_pk_algos
diff --git a/g10/getkey.c b/g10/getkey.c
index abd44d983..bc49782d3 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -868,7 +868,7 @@ key_byname (ctrl_t ctrl, GETKEY_CTX *retctx, strlist_t namelist,
* considered. Note: the local key ring is
* consulted even if local is not in the
* auto-key-locate option list!
- * GET_PUBKEY_NO_LOCAL - Only the auto key locate functionaly is
+ * GET_PUBKEY_NO_LOCAL - Only the auto key locate functionality is
* used and no local search is done.
*
* If RETCTX is not NULL, then the constructed context is returned in
@@ -1762,7 +1762,7 @@ get_keyblock_byfprint_fast (ctrl_t ctrl,
keydb_disable_caching (hd);
}
- /* Fo all other errors we return the handle. */
+ /* For all other errors we return the handle. */
if (r_hd)
*r_hd = hd;
diff --git a/g10/import.c b/g10/import.c
index 5b50b722b..ab825085e 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -1886,7 +1886,7 @@ import_one_real (ctrl_t ctrl,
return 0;
}
- /* Remove all non-self-sigs if requested. Noe that this is a NOP if
+ /* Remove all non-self-sigs if requested. Note that this is a NOP if
* that option has been globally set but we may also be called
* latter with the already parsed keyblock and a locally changed
* option. This is why we need to remove them here as well. */
@@ -3129,7 +3129,7 @@ import_secret_one (ctrl_t ctrl, kbnode_t keyblock,
/* Return the recocation reason from signature SIG. If no revocation
- * reason is availabale 0 is returned, in other cases the reason
+ * reason is available 0 is returned, in other cases the reason
* (0..255). If R_REASON is not NULL a malloced textual
* representation of the code is stored there. If R_COMMENT is not
* NULL the comment from the reason is stored there and its length at
diff --git a/g10/keydb.c b/g10/keydb.c
index 0068d6829..15291f307 100644
--- a/g10/keydb.c
+++ b/g10/keydb.c
@@ -814,7 +814,7 @@ keydb_dump_stats (void)
/* keydb_new diverts to here in non-keyboxd mode. HD is just the
- * calloced structure with the handle type intialized. */
+ * calloced structure with the handle type initialized. */
gpg_error_t
internal_keydb_init (KEYDB_HANDLE hd)
{
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 1391b6b7a..ac9f4688c 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -3686,7 +3686,7 @@ show_key_with_all_names (ctrl_t ctrl, estream_t fp,
* a secret key. This function may be called with KEYBLOCK containing
* secret keys and thus the printing of "pub" vs. "sec" does only
* depend on the packet type and not by checking with gpg-agent. If
- * PRINT_SEC ist set "sec" is printed instead of "pub". */
+ * PRINT_SEC is set "sec" is printed instead of "pub". */
void
show_basic_key_info (ctrl_t ctrl, kbnode_t keyblock, int print_sec)
{
diff --git a/g10/keygen.c b/g10/keygen.c
index 2aed71d5b..4917a36a9 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -3247,7 +3247,7 @@ generate_user_id (KBNODE keyblock, const char *uidstr)
* subkey. If R_KEYVERSION is not NULL it will receive the version of
* the key; this is currently 4 but can be changed with the flag "v5"
* to create a v5 key. If R_KEYTIME is not NULL and the key has been
- * taken fron active OpenPGP card, its creation time is stored
+ * taken from active OpenPGP card, its creation time is stored
* there. */
static gpg_error_t
parse_key_parameter_part (ctrl_t ctrl,
diff --git a/g10/keyid.c b/g10/keyid.c
index 573958e39..0fdb18d88 100644
--- a/g10/keyid.c
+++ b/g10/keyid.c
@@ -558,7 +558,7 @@ keyid_from_pk (PKT_public_key *pk, u32 *keyid)
keyid[0] = pk->keyid[0];
keyid[1] = pk->keyid[1];
- return keyid[1]; /*FIXME:shortkeyid ist different for v5*/
+ return keyid[1]; /*FIXME:shortkeyid is different for v5*/
}
@@ -965,7 +965,7 @@ format_hexfingerprint (const char *fingerprint, char *buffer, size_t buflen)
/* Return the so called KEYGRIP which is the SHA-1 hash of the public
- key parameters expressed as an canoncial encoded S-Exp. ARRAY must
+ key parameters expressed as an canonical encoded S-Exp. ARRAY must
be 20 bytes long. Returns 0 on success or an error code. */
gpg_error_t
keygrip_from_pk (PKT_public_key *pk, unsigned char *array)
diff --git a/g10/keyring.c b/g10/keyring.c
index 5fa499759..992c280d2 100644
--- a/g10/keyring.c
+++ b/g10/keyring.c
@@ -598,7 +598,7 @@ keyring_insert_keyblock (KEYRING_HANDLE hd, KBNODE kb)
/* Close this one otherwise we will lose the position for
* a next search. Fixme: it would be better to adjust the position
- * after the write opertions.
+ * after the write operations.
*/
iobuf_close (hd->current.iobuf);
hd->current.iobuf = NULL;
@@ -638,7 +638,7 @@ keyring_delete_keyblock (KEYRING_HANDLE hd)
/* close this one otherwise we will lose the position for
* a next search. Fixme: it would be better to adjust the position
- * after the write opertions.
+ * after the write operations.
*/
iobuf_close (hd->current.iobuf);
hd->current.iobuf = NULL;
diff --git a/g10/objcache.c b/g10/objcache.c
index a90b4d9d8..8d9ccefca 100644
--- a/g10/objcache.c
+++ b/g10/objcache.c
@@ -369,7 +369,7 @@ key_table_get (PKT_public_key *pk, u32 *keyid)
/* Found. We need to check for dups. */
for (ki2 = ki->next; ki2; ki2 = ki2->next)
if (ki2->keyid[0] == keyid[0] && ki2->keyid[1] == keyid[1])
- return NULL; /* Duplicated keyid - retrun NULL. */
+ return NULL; /* Duplicated keyid - return NULL. */
/* This is the only one - return it. */
return ki;
@@ -486,7 +486,7 @@ key_table_put (PKT_public_key *pk, uid_item_t ui)
}
/* Add an item to the bucket. We allocate a whole block of items
- * for cache performace reasons. */
+ * for cache performance reasons. */
if (!key_item_attic)
{
key_item_t kiblock;
diff --git a/g10/tdbio.c b/g10/tdbio.c
index b6c38bd24..bfeede991 100644
--- a/g10/tdbio.c
+++ b/g10/tdbio.c
@@ -107,7 +107,7 @@ static char *db_name;
/* The handle for locking the trustdb file and a counter to record how
* often this lock has been taken. That counter is required because
- * dotlock does not implemen recursive locks. */
+ * dotlock does not implement recursive locks. */
static dotlock_t lockhandle;
static unsigned int is_locked;
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-17 14:59:47 +0000