diff options
Diffstat (limited to 'agent')
| -rw-r--r-- | agent/call-scd.c | 2 | ||||
| -rw-r--r-- | agent/command-ssh.c | 6 | ||||
| -rw-r--r-- | agent/command.c | 6 | ||||
| -rw-r--r-- | agent/divert-scd.c | 2 | ||||
| -rw-r--r-- | agent/findkey.c | 2 | ||||
| -rw-r--r-- | agent/genkey.c | 2 | ||||
| -rw-r--r-- | agent/gpg-agent.c | 2 | ||||
| -rw-r--r-- | agent/keyformat.txt | 6 | ||||
| -rw-r--r-- | agent/preset-passphrase.c | 2 | ||||
| -rw-r--r-- | agent/protect.c | 2 |
10 files changed, 16 insertions, 16 deletions
diff --git a/agent/call-scd.c b/agent/call-scd.c index 71e0f581c..33a08a995 100644 --- a/agent/call-scd.c +++ b/agent/call-scd.c @@ -50,7 +50,7 @@ /* Definition of module local data of the CTRL structure. */ struct scd_local_s { - /* We keep a list of all allocated context with a an achnor at + /* We keep a list of all allocated context with an achnor at SCD_LOCAL_LIST (see below). */ struct scd_local_s *next_local; diff --git a/agent/command-ssh.c b/agent/command-ssh.c index 729870045..79b8f859e 100644 --- a/agent/command-ssh.c +++ b/agent/command-ssh.c @@ -2721,7 +2721,7 @@ data_hash (unsigned char *data, size_t data_n, } -/* This function signs the data described by CTRL. If HASH is is not +/* This function signs the data described by CTRL. If HASH is not NULL, (HASH,HASHLEN) overrides the hash stored in CTRL. This is to allow the use of signature algorithms that implement the hashing internally (e.g. Ed25519). On success the created signature is @@ -3654,7 +3654,7 @@ start_command_handler_ssh (ctrl_t ctrl, gnupg_fd_t sock_client) #ifdef HAVE_W32_SYSTEM /* Serve one ssh-agent request. This is used for the Putty support. - REQUEST is the the mmapped memory which may be accessed up to a + REQUEST is the mmapped memory which may be accessed up to a length of MAXREQLEN. Returns 0 on success which also indicates that a valid SSH response message is now in REQUEST. */ int @@ -3749,7 +3749,7 @@ serve_mmapped_ssh_request (ctrl_t ctrl, size_t response_size; /* NB: In contrast to the request-stream, the response stream - includes the the message type byte. */ + includes the message type byte. */ if (es_fclose_snatch (response_stream, &response_data, &response_size)) { log_error ("snatching ssh response failed: %s", diff --git a/agent/command.c b/agent/command.c index c8b34e988..ec38649fb 100644 --- a/agent/command.c +++ b/agent/command.c @@ -434,7 +434,7 @@ leave_cmd (assuan_context_t ctx, gpg_error_t err) static const char hlp_geteventcounter[] = "GETEVENTCOUNTER\n" "\n" - "Return a a status line named EVENTCOUNTER with the current values\n" + "Return a status line named EVENTCOUNTER with the current values\n" "of all event counters. The values are decimal numbers in the range\n" "0 to UINT_MAX and wrapping around to 0. The actual values should\n" "not be relied upon, they shall only be used to detect a change.\n" @@ -2007,7 +2007,7 @@ static const char hlp_keywrap_key[] = "KEYWRAP_KEY [--clear] <mode>\n" "\n" "Return a key to wrap another key. For now the key is returned\n" - "verbatim and and thus makes not much sense because an eavesdropper on\n" + "verbatim and thus makes not much sense because an eavesdropper on\n" "the gpg-agent connection will see the key as well as the wrapped key.\n" "However, this function may either be equipped with a public key\n" "mechanism or not used at all if the key is a pre-shared key. In any\n" @@ -2631,7 +2631,7 @@ static const char hlp_putval[] = "try to connect to that daemon. Only if that fails they may start\n" "an own instance of the service daemon. \n" "\n" - "KEY is an an arbitrary symbol with the same syntax rules as keys\n" + "KEY is an arbitrary symbol with the same syntax rules as keys\n" "for shell environment variables. PERCENT_ESCAPED_VALUE is the\n" "corresponding value; they should be similar to the values of\n" "envronment variables but gpg-agent does not enforce any\n" diff --git a/agent/divert-scd.c b/agent/divert-scd.c index 7331f5823..c23c67335 100644 --- a/agent/divert-scd.c +++ b/agent/divert-scd.c @@ -387,7 +387,7 @@ divert_pksign (ctrl_t ctrl, } -/* Decrypt the the value given asn an S-expression in CIPHER using the +/* Decrypt the value given asn an S-expression in CIPHER using the key identified by SHADOW_INFO and return the plaintext in an allocated buffer in R_BUF. The padding information is stored at R_PADDING with -1 for not known. */ diff --git a/agent/findkey.c b/agent/findkey.c index 1b187ba9a..698f765cb 100644 --- a/agent/findkey.c +++ b/agent/findkey.c @@ -1289,7 +1289,7 @@ agent_public_key_from_file (ctrl_t ctrl, -/* Check whether the the secret key identified by GRIP is available. +/* Check whether the secret key identified by GRIP is available. Returns 0 is the key is available. */ int agent_key_available (const unsigned char *grip) diff --git a/agent/genkey.c b/agent/genkey.c index 8a43d8944..7fb0139a4 100644 --- a/agent/genkey.c +++ b/agent/genkey.c @@ -220,7 +220,7 @@ check_passphrase_constraints (ctrl_t ctrl, const char *pw, } /* Now check the constraints and collect the error messages unless - in in silent mode which returns immediately. */ + in silent mode which returns immediately. */ if (utf8_charcount (pw, -1) < minlen ) { if (!failed_constraint) diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index c0208cc88..5a5b55b62 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -2394,7 +2394,7 @@ handle_signal (int signo) } #endif -/* Check the nonce on a new connection. This is a NOP unless we we +/* Check the nonce on a new connection. This is a NOP unless we are using our Unix domain socket emulation under Windows. */ static int check_nonce (ctrl_t ctrl, assuan_sock_nonce_t *nonce) diff --git a/agent/keyformat.txt b/agent/keyformat.txt index e80496e1c..68fbdbc65 100644 --- a/agent/keyformat.txt +++ b/agent/keyformat.txt @@ -133,7 +133,7 @@ The currently defined protection modes are: *** openpgp-s2k3-sha1-aes-cbc - This describes an algorithm using using AES in CBC mode for + This describes an algorithm using AES in CBC mode for encryption, SHA-1 for integrity protection and the String to Key algorithm 3 from OpenPGP (rfc4880). @@ -182,7 +182,7 @@ The currently defined protection modes are: *** openpgp-s2k3-ocb-aes - This describes an algorithm using using AES-128 in OCB mode, a nonce + This describes an algorithm using AES-128 in OCB mode, a nonce of 96 bit, a taglen of 128 bit, and the String to Key algorithm 3 from OpenPGP (rfc4880). @@ -311,7 +311,7 @@ This format is used to transfer keys between gpg and gpg-agent. * PROTALGO is a Libgcrypt style cipher algorithm name * IV is the initialization verctor. * S2KMODE is the value from RFC-4880. - * S2KHASH is a a libgcrypt style hash algorithm identifier. + * S2KHASH is a libgcrypt style hash algorithm identifier. * S2KSALT is the 8 byte salt * S2KCOUNT is the count value from RFC-4880. diff --git a/agent/preset-passphrase.c b/agent/preset-passphrase.c index ae6f0ce53..b8d2aaa00 100644 --- a/agent/preset-passphrase.c +++ b/agent/preset-passphrase.c @@ -239,7 +239,7 @@ main (int argc, char **argv) else usage (1); - /* Tell simple-pwquery about the the standard socket name. */ + /* Tell simple-pwquery about the standard socket name. */ { char *tmp = make_filename (gnupg_socketdir (), GPG_AGENT_SOCK_NAME, NULL); simple_pw_set_socket (tmp); diff --git a/agent/protect.c b/agent/protect.c index e20586970..7ae7e64b7 100644 --- a/agent/protect.c +++ b/agent/protect.c @@ -690,7 +690,7 @@ agent_protect (const unsigned char *plainkey, const char *passphrase, return rc; /* Now create the protected version of the key. Note that the 10 - extra bytes are for for the inserted "protected-" string (the + extra bytes are for the inserted "protected-" string (the beginning of the plaintext reads: "((11:private-key(" ). The 35 term is the space for (12:protected-at15:<timestamp>). */ *resultlen = (10 |