diff options
Diffstat (limited to '')
| -rw-r--r-- | agent/cache.c | 2 | ||||
| -rw-r--r-- | agent/call-pinentry.c | 2 | ||||
| -rw-r--r-- | agent/call-scd.c | 2 | ||||
| -rw-r--r-- | agent/command-ssh.c | 2 | ||||
| -rw-r--r-- | agent/command.c | 2 | ||||
| -rw-r--r-- | agent/divert-scd.c | 2 | ||||
| -rw-r--r-- | agent/findkey.c | 2 | ||||
| -rw-r--r-- | agent/gpg-agent.c | 2 | ||||
| -rw-r--r-- | agent/w32main.c | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/agent/cache.c b/agent/cache.c index 49402e434..3fffd2db6 100644 --- a/agent/cache.c +++ b/agent/cache.c @@ -167,7 +167,7 @@ new_data (const char *string, struct secret_data_s **r_data) /* We pad the data to 32 bytes so that it get more complicated finding something out by watching allocation patterns. This is - usally not possible but we better assume nothing about our secure + usually not possible but we better assume nothing about our secure storage provider. To support the AESWRAP mode we need to add 8 extra bytes as well. */ total = (length + 8) + 32 - ((length+8) % 32); diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c index ada477a99..4de897a6b 100644 --- a/agent/call-pinentry.c +++ b/agent/call-pinentry.c @@ -226,7 +226,7 @@ getinfo_pid_cb (void *opaque, const void *buffer, size_t length) } /* Fork off the pin entry if this has not already been done. Note, - that this function must always be used to aquire the lock for the + that this function must always be used to acquire the lock for the pinentry - we will serialize _all_ pinentry calls. */ static gpg_error_t diff --git a/agent/call-scd.c b/agent/call-scd.c index 65b5e7cfd..9c4d7b130 100644 --- a/agent/call-scd.c +++ b/agent/call-scd.c @@ -189,7 +189,7 @@ atfork_cb (void *opaque, int where) /* Fork off the SCdaemon if this has not already been done. Lock the daemon and make sure that a proper context has been setup in CTRL. This function might also lock the daemon, which means that the - caller must call unlock_scd after this fucntion has returned + caller must call unlock_scd after this function has returned success and the actual Assuan transaction been done. */ static int start_scd (ctrl_t ctrl) diff --git a/agent/command-ssh.c b/agent/command-ssh.c index 6144ae1a8..5f159f1ca 100644 --- a/agent/command-ssh.c +++ b/agent/command-ssh.c @@ -3569,7 +3569,7 @@ ssh_request_process (ctrl_t ctrl, estream_t stream_sock) out: if (err && es_feof (stream_sock)) - log_error ("error occured while processing request: %s\n", + log_error ("error occurred while processing request: %s\n", gpg_strerror (err)); if (send_err) diff --git a/agent/command.c b/agent/command.c index 509f4573d..4b6040a1a 100644 --- a/agent/command.c +++ b/agent/command.c @@ -2585,7 +2585,7 @@ static const char hlp_putval[] = "\n" "KEY is an an arbitrary symbol with the same syntax rules as keys\n" "for shell environment variables. PERCENT_ESCAPED_VALUE is the\n" - "corresponsing value; they should be similar to the values of\n" + "corresponding value; they should be similar to the values of\n" "envronment variables but gpg-agent does not enforce any\n" "restrictions. If that value is not given any value under that KEY\n" "is removed from this special environment."; diff --git a/agent/divert-scd.c b/agent/divert-scd.c index a2da9e70e..5d3b1efa5 100644 --- a/agent/divert-scd.c +++ b/agent/divert-scd.c @@ -224,7 +224,7 @@ getpin_cb (void *opaque, const char *info, char *buf, size_t maxbuf) log_debug ("pin_cb called without proper PIN info hack\n"); /* If BUF has been passed as NULL, we are in pinpad mode: The - callback opens the popup and immediatley returns. */ + callback opens the popup and immediately returns. */ if (!buf) { if (maxbuf == 0) /* Close the pinentry. */ diff --git a/agent/findkey.c b/agent/findkey.c index af61e7e50..c5e7ae74e 100644 --- a/agent/findkey.c +++ b/agent/findkey.c @@ -1219,7 +1219,7 @@ agent_key_info_from_file (ctrl_t ctrl, const unsigned char *grip, /* Delete the key with GRIP from the disk after having asked for - confirmation using DESC_TEXT. If FORCE is set the fucntion won't + confirmation using DESC_TEXT. If FORCE is set the function won't require a confirmation via Pinentry or warns if the key is also used by ssh. diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index f81a2fbd8..3a5abbba4 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -1485,7 +1485,7 @@ agent_deinit_default_ctrl (ctrl_t ctrl) /* Because the ssh protocol does not send us information about the current TTY setting, we use this function to use those from startup - or those explictly set. This is also used for the restricted mode + or those explicitly set. This is also used for the restricted mode where we ignore requests to change the environment. */ gpg_error_t agent_copy_startup_env (ctrl_t ctrl) diff --git a/agent/w32main.c b/agent/w32main.c index 5ccbb5e0d..d907fe597 100644 --- a/agent/w32main.c +++ b/agent/w32main.c @@ -258,7 +258,7 @@ handle_taskbar (void *ctx) /* This function initializes the Window system and sets up the taskbar icon. We only have very limited GUI support just to give the - taskbar icon a little bit of life. This fucntion is called once to + taskbar icon a little bit of life. This function is called once to fire up the icon. */ int w32_setup_taskbar (void) |