aboutsummaryrefslogtreecommitdiffstats
path: root/agent
diff options
context:
space:
mode:
Diffstat (limited to 'agent')
-rw-r--r--agent/command-ssh.c2
-rw-r--r--agent/command.c2
-rw-r--r--agent/gpg-agent.c2
-rw-r--r--agent/keyformat.txt4
-rw-r--r--agent/protect-tool.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index 83a27ed50..083b8d890 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -1253,7 +1253,7 @@ ssh_receive_mpint_list (estream_t stream, int secret,
elems_n = strlen (elems);
elems_public = spec->elems_key_public;
- /* Check that either noth, CERT and the WITH_CERT flag, are given or
+ /* Check that either both, CERT and the WITH_CERT flag, are given or
none of them. */
if (!(!!(spec->flags & SPEC_FLAG_WITH_CERT) ^ !cert))
{
diff --git a/agent/command.c b/agent/command.c
index 7e651bfdb..1ecdf20cd 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -3176,7 +3176,7 @@ register_commands (assuan_context_t ctx)
/* Startup the server. If LISTEN_FD and FD is given as -1, this is a
simple piper server, otherwise it is a regular server. CTRL is the
control structure for this connection; it has only the basic
- intialization. */
+ initialization. */
void
start_command_handler (ctrl_t ctrl, gnupg_fd_t listen_fd, gnupg_fd_t fd)
{
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 75a9283f4..d3c3891f3 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -2498,7 +2498,7 @@ handle_connections (gnupg_fd_t listen_fd,
strerror (errno));
else
{
- /* We need to watch the directory for the file becuase there
+ /* We need to watch the directory for the file because there
* won't be an IN_DELETE_SELF for a socket file. */
char *slash = strrchr (socket_name, '/');
log_assert (slash && slash[1]);
diff --git a/agent/keyformat.txt b/agent/keyformat.txt
index ddfb44b0b..e80496e1c 100644
--- a/agent/keyformat.txt
+++ b/agent/keyformat.txt
@@ -363,8 +363,8 @@ optional. The oder of the "key" lists and the order of the "value"
lists mut match, that is the first "key"-list is associated with the
first "value" list in the encrypted_octet_string.
-The protection mode etc. is indentical to the protection mode as
-decribed for the private key format.
+The protection mode etc. is identical to the protection mode as
+described for the private key format.
list of the secret key parameters. The protected-at expression is
optional; the isotimestamp is 15 bytes long (e.g. "19610711T172000").
diff --git a/agent/protect-tool.c b/agent/protect-tool.c
index dbf781144..fa97b694d 100644
--- a/agent/protect-tool.c
+++ b/agent/protect-tool.c
@@ -611,7 +611,7 @@ main (int argc, char **argv )
else if (argc > 1)
usage (1);
- /* Allocate an CTRL object. An empty object should sufficent. */
+ /* Allocate an CTRL object. An empty object should sufficient. */
ctrl = xtrycalloc (1, sizeof *ctrl);
if (!ctrl)
{