Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addrmatch.c
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ addr_match_cidr_list(const char *addr, const char *_list)

/*
* NB. This function is called in pre-auth with untrusted data,
* so be extra paranoid about junk reaching getaddrino (via
* so be extra paranoid about junk reaching getaddrinfo (via
* addr_pton_cidr).
*/

Expand Down
2 changes: 1 addition & 1 deletion auth-pam.c
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ sshpam_sigchld_handler(int sig)
return; /* handler called after PAM cleanup, shouldn't happen */
if (waitpid(cleanup_ctxt->pam_thread, &sshpam_thread_status, WNOHANG)
<= 0) {
/* PAM thread has not exitted, privsep slave must have */
/* PAM thread has not exited, privsep slave must have */
kill(cleanup_ctxt->pam_thread, SIGTERM);
while (waitpid(cleanup_ctxt->pam_thread,
&sshpam_thread_status, 0) == -1) {
Expand Down
2 changes: 1 addition & 1 deletion auth2-chall.c
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ kbdint_next_device(Authctxt *authctxt, KbdintAuthctxt *kbdintctxt)
for (i = 0; devices[i]; i++) {
if (i >= sizeof(kbdintctxt->devices_done) * 8 ||
i >= sizeof(devices) / sizeof(devices[0]))
fatal_f("internal error: too may devices");
fatal_f("internal error: too many devices");
if ((kbdintctxt->devices_done & (1 << i)) != 0 ||
!auth2_method_allowed(authctxt,
"keyboard-interactive", devices[i]->name))
Expand Down
2 changes: 1 addition & 1 deletion channels.c
Original file line number Diff line number Diff line change
Expand Up @@ -4747,7 +4747,7 @@ connect_to_helper(struct ssh *ssh, const char *name, int port, int socktype,
/*
* Fake up a struct addrinfo for AF_UNIX connections.
* channel_connect_ctx_free() must check ai_family
* and use free() not freeaddirinfo() for AF_UNIX.
* and use free() not freeaddrinfo() for AF_UNIX.
*/
ai = xcalloc(1, sizeof(*ai) + sizeof(*sunaddr));
ai->ai_addr = (struct sockaddr *)(ai + 1);
Expand Down
4 changes: 2 additions & 2 deletions loginrec.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
* code should suffice.
*
* Retrieving the time of last login ('lastlog') is in some ways even
* more problemmatic than login recording. Some systems provide a
* more problematic than login recording. Some systems provide a
* simple table of all users which we seek based on uid and retrieve a
* relatively standard structure. Others record the same information in
* a directory with a separate file, and others don't record the
Expand Down Expand Up @@ -975,7 +975,7 @@ utmp_write_entry(struct logininfo *li)
/* not much point if we don't want utmpx entries */
#ifdef USE_UTMPX

/* if we have the wherewithall, use pututxline etc. */
/* if we have the wherewithal, use pututxline etc. */
# if !defined(DISABLE_PUTUTXLINE) && defined(HAVE_SETUTXENT) && \
defined(HAVE_PUTUTXLINE)
# define UTMPX_USE_LIBRARY
Expand Down
4 changes: 2 additions & 2 deletions scp.c
Original file line number Diff line number Diff line change
Expand Up @@ -969,7 +969,7 @@ brace_expand(const char *pattern, char ***patternsp, size_t *npatternsp)
continue;
}
/*
* Pattern did not expand; append the finename component to
* Pattern did not expand; append the filename component to
* the completed list
*/
if ((cp2 = strrchr(cp, '/')) != NULL)
Expand Down Expand Up @@ -1555,7 +1555,7 @@ sink_sftp(int argc, char *dst, const char *src, struct sftp_conn *conn)
memset(&g, 0, sizeof(g));

/*
* Here, we need remote glob as SFTP can not depend on remote shell
* Here, we need remote glob as SFTP cannot depend on remote shell
* expansions
*/
if ((abs_src = prepare_remote_path(conn, src)) == NULL) {
Expand Down
2 changes: 1 addition & 1 deletion session.c
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ do_authenticated(struct ssh *ssh, Authctxt *authctxt)

auth_log_authopts("active", auth_opts, 0);

/* setup the channel layer */
/* set up the channel layer */
/* XXX - streamlocal? */
set_fwdpermit_from_authopts(ssh, auth_opts);

Expand Down
2 changes: 1 addition & 1 deletion ssh-ecdsa-sk.c
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ webauthn_check_prepare_hash(const u_char *data, size_t datalen,
fprintf(stderr, "%s: received origin: %s\n", __func__, origin);
fprintf(stderr, "%s: received clientData:\n", __func__);
sshbuf_dump(wrapper, stderr);
fprintf(stderr, "%s: expected clientData premable:\n", __func__);
fprintf(stderr, "%s: expected clientData preamble:\n", __func__);
sshbuf_dump(m, stderr);
#endif
/* Check that the supplied clientData has the preamble we expect */
Expand Down
2 changes: 1 addition & 1 deletion ssh-pkcs11.c
Original file line number Diff line number Diff line change
Expand Up @@ -1890,7 +1890,7 @@ pkcs11_register_provider(char *provider_id, char *pin,
p = xcalloc(1, sizeof(*p));
p->name = xstrdup(provider_id);
p->handle = handle;
/* setup the pkcs11 callbacks */
/* set up the pkcs11 callbacks */
if ((rv = (*getfunctionlist)(&f)) != CKR_OK) {
error("C_GetFunctionList for provider %s failed: %lu",
provider_id, rv);
Expand Down
2 changes: 1 addition & 1 deletion sshd-session.c
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ privsep_postauth(struct ssh *ssh, Authctxt *authctxt)
* Hack for systems that don't support FD passing: retain privileges
* in the post-auth privsep process so it can allocate PTYs directly.
* This is basically equivalent to what we did <= 9.7, which was to
* disable post-auth privsep entriely.
* disable post-auth privsep entirely.
* Cygwin doesn't need to drop privs here although it doesn't support
* fd passing, as AFAIK PTY allocation on this platform doesn't require
* special privileges to begin with.
Expand Down
2 changes: 1 addition & 1 deletion sshkey.c
Original file line number Diff line number Diff line change
Expand Up @@ -2205,7 +2205,7 @@ sshkey_sign(struct sshkey *key,
}

/*
* ssh_key_verify returns 0 for a correct signature and < 0 on error.
* ssh_key_verify returns 0 for a correct signature and < 0 on error.
* If "alg" specified, then the signature must use that algorithm.
*/
int
Expand Down
4 changes: 2 additions & 2 deletions sshkey.h
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ enum sshkey_private_format {
#define SSHKEY_FLAG_EXT 0x0001

#define SSHKEY_CERT_MAX_PRINCIPALS 256
/* XXX opaquify? */
/* XXX opacify? */
struct sshkey_cert {
struct sshbuf *certblob; /* Kept around for use on wire */
u_int type; /* SSH2_CERT_TYPE_USER or SSH2_CERT_TYPE_HOST */
Expand All @@ -113,7 +113,7 @@ struct sshkey_cert {
char *signature_type;
};

/* XXX opaquify? */
/* XXX opacify? */
struct sshkey {
int type;
int flags;
Expand Down
6 changes: 3 additions & 3 deletions umac.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
* "Barreto"). The only two files needed are rijndael-alg-fst.c and
* rijndael-alg-fst.h. Brian Gladman's version is distributed with the GNU
* Public license at http://fp.gladman.plus.com/AES/index.htm. It
* includes a fast IA-32 assembly version. The OpenSSL crypo library is
* includes a fast IA-32 assembly version. The OpenSSL crypto library is
* the third.
*
* 5) With FORCE_C_ONLY flags set to 0, incorrect results are sometimes
Expand All @@ -53,7 +53,7 @@
/* ---------------------------------------------------------------------- */

#ifndef UMAC_OUTPUT_LEN
#define UMAC_OUTPUT_LEN 8 /* Alowable: 4, 8, 12, 16 */
#define UMAC_OUTPUT_LEN 8 /* Allowable: 4, 8, 12, 16 */
#endif

#if UMAC_OUTPUT_LEN != 4 && UMAC_OUTPUT_LEN != 8 && \
Expand Down Expand Up @@ -192,7 +192,7 @@ static void kdf(void *bufp, aes_int_key key, UINT8 ndx, int nbytes)
UINT8 *dst_buf = (UINT8 *)bufp;
int i;

/* Setup the initial value */
/* Set up the initial value */
in_buf[AES_BLOCK_LEN-9] = ndx;
in_buf[AES_BLOCK_LEN-1] = i = 1;

Expand Down
Loading