tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 07:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream: spelling errors in comments; no code change from

Browse Source 
OpenBSD-Commit-ID: 166ea64f6d84f7bac5636dbd38968592cb5eb924
This commit is contained in:
djm@openbsd.org 2020-03-13 03:17:07 +00:00 committed by Damien Miller
parent c084a2d040
commit d081f017c2
10 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PROTOCOL.mux
View File

@ -39,7 +39,7 @@ messages between the client and server. The client therefore must
speak a significant subset of the SSH protocol, but in return is able speak a significant subset of the SSH protocol, but in return is able
to access basically the full suite of connection protocol features. to access basically the full suite of connection protocol features.
Moreover, as no file descriptor passing is required, the connection Moreover, as no file descriptor passing is required, the connection
supporting a proxy client may iteself be forwarded or relayed to another supporting a proxy client may itself be forwarded or relayed to another
host if necessary. host if necessary.
1. Connection setup 1. Connection setup
@ -295,4 +295,4 @@ XXX session inspection via master
XXX signals via mux request XXX signals via mux request
XXX list active connections via mux XXX list active connections via mux
$OpenBSD: PROTOCOL.mux,v 1.11 2018/09/26 07:30:05 djm Exp $ $OpenBSD: PROTOCOL.mux,v 1.12 2020/03/13 03:17:07 djm Exp $

4
cipher.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: cipher.c,v 1.115 2020/02/26 13:40:09 jsg Exp $ */ /* $OpenBSD: cipher.c,v 1.116 2020/03/13 03:17:07 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -337,7 +337,7 @@ cipher_init(struct sshcipher_ctx **ccp, const struct sshcipher *cipher,
/* /*
* cipher_crypt() operates as following: * cipher_crypt() operates as following:
* Copy 'aadlen' bytes (without en/decryption) from 'src' to 'dest'. * Copy 'aadlen' bytes (without en/decryption) from 'src' to 'dest'.
* Theses bytes are treated as additional authenticated data for * These bytes are treated as additional authenticated data for
* authenticated encryption modes. * authenticated encryption modes.
* En/Decrypt 'len' bytes at offset 'aadlen' from 'src' to 'dest'. * En/Decrypt 'len' bytes at offset 'aadlen' from 'src' to 'dest'.
* Use 'authlen' bytes at offset 'len'+'aadlen' as the authentication tag. * Use 'authlen' bytes at offset 'len'+'aadlen' as the authentication tag.

6
configure.ac
View File

@ -3111,9 +3111,13 @@ if test "x$enable_sk" = "xyes" -a "x$enable_sk_internal" = "xyes" ; then
AC_DEFINE([ENABLE_SK_INTERNAL], [], AC_DEFINE([ENABLE_SK_INTERNAL], [],
[Enable for built-in U2F/FIDO support]) [Enable for built-in U2F/FIDO support])
enable_sk="built-in" enable_sk="built-in"
], [ ], ], [ AC_MSG_ERROR([no usable libfido2 found]) ],
[ $OTHERLIBS ] [ $OTHERLIBS ]
) )
AC_CHECK_HEADER([fido.h], [],
AC_MSG_ERROR([missing fido.h from libfido2]))
AC_CHECK_HEADER([fido/credman.h], [],
AC_MSG_ERROR([missing fido/credman.h from libfido2]))
fi fi
AC_CHECK_FUNCS([ \ AC_CHECK_FUNCS([ \

4
gss-serv.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: gss-serv.c,v 1.31 2018/07/09 21:37:55 markus Exp $ */ /* $OpenBSD: gss-serv.c,v 1.32 2020/03/13 03:17:07 djm Exp $ */
/* /*
* Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
@ -337,7 +337,7 @@ ssh_gssapi_storecreds(void)
debug("ssh_gssapi_storecreds: Not a GSSAPI mechanism"); debug("ssh_gssapi_storecreds: Not a GSSAPI mechanism");
} }
/* This allows GSSAPI methods to do things to the childs environment based /* This allows GSSAPI methods to do things to the child's environment based
* on the passed authentication process and credentials. * on the passed authentication process and credentials.
*/ */
/* As user */ /* As user */

4
monitor.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: monitor.c,v 1.209 2020/02/26 13:40:09 jsg Exp $ */ /* $OpenBSD: monitor.c,v 1.210 2020/03/13 03:17:07 djm Exp $ */
/* /*
* Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Niels Provos <provos@citi.umich.edu>
* Copyright 2002 Markus Friedl <markus@openbsd.org> * Copyright 2002 Markus Friedl <markus@openbsd.org>
@ -1722,7 +1722,7 @@ monitor_apply_keystate(struct ssh *ssh, struct monitor *pmonitor)
} }
} }
/* This function requries careful sanity checking */ /* This function requires careful sanity checking */
void void
mm_get_keystate(struct ssh *ssh, struct monitor *pmonitor) mm_get_keystate(struct ssh *ssh, struct monitor *pmonitor)

6
session.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: session.c,v 1.318 2020/01/23 07:10:22 dtucker Exp $ */ /* $OpenBSD: session.c,v 1.319 2020/03/13 03:17:07 djm Exp $ */
/* /*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
@ -1017,7 +1017,7 @@ do_setup_env(struct ssh *ssh, Session *s, const char *shell)
#ifdef GSSAPI #ifdef GSSAPI
/* Allow any GSSAPI methods that we've used to alter /* Allow any GSSAPI methods that we've used to alter
* the childs environment as they see fit * the child's environment as they see fit
*/ */
ssh_gssapi_do_child(&env, &envsize); ssh_gssapi_do_child(&env, &envsize);
#endif #endif
@ -2412,7 +2412,7 @@ session_exit_message(struct ssh *ssh, Session *s, int status)
/* /*
* Adjust cleanup callback attachment to send close messages when * Adjust cleanup callback attachment to send close messages when
* the channel gets EOF. The session will be then be closed * the channel gets EOF. The session will be then be closed
* by session_close_by_channel when the childs close their fds. * by session_close_by_channel when the child sessions close their fds.
*/ */
channel_register_cleanup(ssh, c->self, session_close_by_channel, 1); channel_register_cleanup(ssh, c->self, session_close_by_channel, 1);

4
ssh-keygen.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-keygen.c,v 1.403 2020/03/13 03:12:17 djm Exp $ */ /* $OpenBSD: ssh-keygen.c,v 1.404 2020/03/13 03:17:07 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -2476,7 +2476,7 @@ load_sign_key(const char *keypath, const struct sshkey *pubkey)
int r; int r;
/* /*
* If passed a public key filename, then try to locate the correponding * If passed a public key filename, then try to locate the corresponding
* private key. This lets us specify certificates on the command-line * private key. This lets us specify certificates on the command-line
* and have ssh-keygen find the appropriate private key. * and have ssh-keygen find the appropriate private key.
*/ */

4
sshbuf.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshbuf.h,v 1.19 2020/01/25 23:02:14 djm Exp $ */ /* $OpenBSD: sshbuf.h,v 1.20 2020/03/13 03:17:07 djm Exp $ */
/* /*
* Copyright (c) 2011 Damien Miller * Copyright (c) 2011 Damien Miller
* *
@ -187,7 +187,7 @@ int sshbuf_peek_u8(const struct sshbuf *buf, size_t offset,
u_char *valp); u_char *valp);
/* /*
* Functions to poke values into an exisiting buffer (e.g. a length header * Functions to poke values into an existing buffer (e.g. a length header
* to a packet). The destination bytes must already exist in the buffer. * to a packet). The destination bytes must already exist in the buffer.
*/ */
int sshbuf_poke_u64(struct sshbuf *buf, size_t offset, u_int64_t val); int sshbuf_poke_u64(struct sshbuf *buf, size_t offset, u_int64_t val);

4
sshd.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshd.c,v 1.549 2020/01/31 23:13:04 djm Exp $ */ /* $OpenBSD: sshd.c,v 1.550 2020/03/13 03:17:07 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1110,7 +1110,7 @@ server_accept_loop(int *sock_in, int *sock_out, int *newsock, int *config_s)
for (i = 0; i < num_listen_socks; i++) for (i = 0; i < num_listen_socks; i++)
if (listen_socks[i] > maxfd) if (listen_socks[i] > maxfd)
maxfd = listen_socks[i]; maxfd = listen_socks[i];
/* pipes connected to unauthenticated childs */ /* pipes connected to unauthenticated child sshd processes */
startup_pipes = xcalloc(options.max_startups, sizeof(int)); startup_pipes = xcalloc(options.max_startups, sizeof(int));
startup_flags = xcalloc(options.max_startups, sizeof(int)); startup_flags = xcalloc(options.max_startups, sizeof(int));
for (i = 0; i < options.max_startups; i++) for (i = 0; i < options.max_startups; i++)

4
umac.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: umac.c,v 1.19 2020/02/26 13:40:09 jsg Exp $ */ /* $OpenBSD: umac.c,v 1.20 2020/03/13 03:17:07 djm Exp $ */
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
* *
* umac.c -- C Implementation UMAC Message Authentication * umac.c -- C Implementation UMAC Message Authentication
@ -39,7 +39,7 @@
* at http://www.esat.kuleuven.ac.be/~rijmen/rijndael/ (search for * at http://www.esat.kuleuven.ac.be/~rijmen/rijndael/ (search for
* "Barreto"). The only two files needed are rijndael-alg-fst.c and * "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 * rijndael-alg-fst.h. Brian Gladman's version is distributed with the GNU
* Public lisence at http://fp.gladman.plus.com/AES/index.htm. It * 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 crypo library is
* the third. * the third.
* *