diff options
Diffstat (limited to '')
| -rw-r--r-- | agent/agent.h | 4 | ||||
| -rw-r--r-- | agent/cache.c | 2 | ||||
| -rw-r--r-- | agent/command-ssh.c | 2 | ||||
| -rw-r--r-- | agent/command.c | 2 | ||||
| -rw-r--r-- | agent/findkey.c | 4 | ||||
| -rw-r--r-- | agent/gpg-agent.c | 2 | ||||
| -rw-r--r-- | agent/pksign.c | 2 | ||||
| -rw-r--r-- | agent/w32main.c | 4 |
8 files changed, 11 insertions, 11 deletions
diff --git a/agent/agent.h b/agent/agent.h index 18d60fb36..eb819a0ff 100644 --- a/agent/agent.h +++ b/agent/agent.h @@ -48,7 +48,7 @@ #define MAX_DIGEST_LEN 64 /* The maximum length of a passphrase (in bytes). Note: this is - further contrained by the Assuan line length (and any other text on + further constrained by the Assuan line length (and any other text on the same line). However, the Assuan line length is 1k bytes so this shouldn't be a problem in practice. */ #define MAX_PASSPHRASE_LEN 255 @@ -126,7 +126,7 @@ struct int enable_passphrase_history; /* If set the extended key format is used for new keys. Note that - * this may vave the value 2 in which case + * this may have the value 2 in which case * --disable-extended-key-format won't have any effect and thus * effectivley locking it. This is required to support existing * profiles which lock the use of --enable-extended-key-format. */ diff --git a/agent/cache.c b/agent/cache.c index c5c67e320..20a604006 100644 --- a/agent/cache.c +++ b/agent/cache.c @@ -205,7 +205,7 @@ housekeeping (void) for (r=thecache; r; r = r->next) { if (r->cache_mode == CACHE_MODE_PIN) - ; /* Don't let it expire - scdaemon explictly flushes them. */ + ; /* Don't let it expire - scdaemon explicitly flushes them. */ else if (r->pw && r->ttl >= 0 && r->accessed + r->ttl < current) { if (DBG_CACHE) diff --git a/agent/command-ssh.c b/agent/command-ssh.c index 8adbe01cd..51f37e18b 100644 --- a/agent/command-ssh.c +++ b/agent/command-ssh.c @@ -1508,7 +1508,7 @@ ssh_signature_encoder_dsa (ssh_key_type_spec_t *spec, /* DSA specific code. */ - /* FIXME: Why this complicated code? Why collecting boths mpis in a + /* FIXME: Why this complicated code? Why collecting both mpis in a buffer instead of writing them out one after the other? */ for (i = 0; i < 2; i++) { diff --git a/agent/command.c b/agent/command.c index 1b07600c3..6f179cb08 100644 --- a/agent/command.c +++ b/agent/command.c @@ -656,7 +656,7 @@ static const char hlp_setkeydesc[] = "Set a description to be used for the next PKSIGN, PKDECRYPT, IMPORT_KEY\n" "or EXPORT_KEY operation if this operation requires a passphrase. If\n" "this command is not used a default text will be used. Note, that\n" - "this description implictly selects the label used for the entry\n" + "this description implicitly selects the label used for the entry\n" "box; if the string contains the string PIN (which in general will\n" "not be translated), \"PIN\" is used, otherwise the translation of\n" "\"passphrase\" is used. The description string should not contain\n" diff --git a/agent/findkey.c b/agent/findkey.c index 69c90b37f..7fb938b35 100644 --- a/agent/findkey.c +++ b/agent/findkey.c @@ -199,8 +199,8 @@ write_extended_private_key (char *fname, estream_t fp, int update, /* Write an S-expression formatted key to our key storage. With FORCE * passed as true an existing key with the given GRIP will get - * overwritten. If SERIALNO and KEYREF are give an a Token line is added to - * th key if the extended format ist used. */ + * overwritten. If SERIALNO and KEYREF are given a Token line is added to + * the key if the extended format is used. */ int agent_write_private_key (const unsigned char *grip, const void *buffer, size_t length, int force, diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index 70e9e229f..4678cf359 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -2030,7 +2030,7 @@ agent_copy_startup_env (ctrl_t ctrl) Fixme: Due to the way the argument parsing works, we create a memory leak here for all string type arguments. There is currently no clean way to tell whether the memory for the argument has been - allocated or points into the process' original arguments. Unless + allocated or points into the process's original arguments. Unless we have a mechanism to tell this, we need to live on with this. */ static void reread_configuration (void) diff --git a/agent/pksign.c b/agent/pksign.c index 8e88deecc..3474f9434 100644 --- a/agent/pksign.c +++ b/agent/pksign.c @@ -349,7 +349,7 @@ agent_pksign_do (ctrl_t ctrl, const char *cache_nonce, if (agent_card_serialno (ctrl, &serialno, NULL)) { - /* No card availabale or error reading the card. */ + /* No card available or error reading the card. */ err = gpg_error (GPG_ERR_NO_SECKEY); goto leave; } diff --git a/agent/w32main.c b/agent/w32main.c index 0e3927ad2..143106079 100644 --- a/agent/w32main.c +++ b/agent/w32main.c @@ -40,8 +40,8 @@ static HWND glob_hwnd; number of args to reserve before the first one. This code is based on Alexandre Julliard's LGPLed wine-0.9.34/dlls/kernel32/process.c and modified to fit into our framework. The function returns NULL - on error; on success an arry with the argiments is returned. This - array has been allocaqted using a plain malloc (and not the usual + on error; on success an array with the arguments is returned. This + array has been allocated using a plain malloc (and not the usual xtrymalloc). */ static char ** build_argv (char *cmdline_arg, int reserved) |