upstream: whitespace; no code change

OpenBSD-Commit-ID: efefc1c47e880887bdee8cd2127ca93177eaad79

diff --git a/authfd.c b/authfd.c
index ae4eafb78c01c90983d4a414675d354cb5981502..189ebb39345fe120ef5d6c982e74e89f5030fef5 100644 (file)
--- a/authfd.c
+++ b/authfd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: authfd.c,v 1.125 2020/10/19 22:49:23 dtucker Exp $ */
+/* $OpenBSD: authfd.c,v 1.126 2020/10/29 02:52:43 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -62,7 +62,7 @@
 #include "ssherr.h"
 
 #define MAX_AGENT_IDENTITIES   2048            /* Max keys in agent reply */
-#define MAX_AGENT_REPLY_LEN    (256 * 1024)    /* Max bytes in agent reply */
+#define MAX_AGENT_REPLY_LEN    (256 * 1024)    /* Max bytes in agent reply */
 
 /* macro to check for "agent failure" message */
 #define agent_failed(x) \

diff --git a/digest-openssl.c b/digest-openssl.c
index dbbea425185477e8a30f2865eb83b1695a627a0b..e073a807b148303348b949c5567cff23b32b3f48 100644 (file)
--- a/digest-openssl.c
+++ b/digest-openssl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: digest-openssl.c,v 1.7 2017/05/08 22:57:38 djm Exp $ */
+/* $OpenBSD: digest-openssl.c,v 1.9 2020/10/29 02:52:43 djm Exp $ */
 /*
  * Copyright (c) 2013 Damien Miller <djm@mindrot.org>
  *
@@ -56,11 +56,11 @@ struct ssh_digest {
 
 /* NB. Indexed directly by algorithm number */
 const struct ssh_digest digests[] = {
-       { SSH_DIGEST_MD5,       "MD5",          16,     EVP_md5 },
-       { SSH_DIGEST_SHA1,      "SHA1",         20,     EVP_sha1 },
-       { SSH_DIGEST_SHA256,    "SHA256",       32,     EVP_sha256 },
+       { SSH_DIGEST_MD5,       "MD5",          16,     EVP_md5 },
+       { SSH_DIGEST_SHA1,      "SHA1",         20,     EVP_sha1 },
+       { SSH_DIGEST_SHA256,    "SHA256",       32,     EVP_sha256 },
        { SSH_DIGEST_SHA384,    "SHA384",       48,     EVP_sha384 },
-       { SSH_DIGEST_SHA512,    "SHA512",       64,     EVP_sha512 },
+       { SSH_DIGEST_SHA512,    "SHA512",       64,     EVP_sha512 },
        { -1,                   NULL,           0,      NULL },
 };
 

diff --git a/mux.c b/mux.c
index 24b3d6a02201f526e0c75e4602e76b1aca41f239..d0f066a77d623117d0aa72efb8df8c173a97fb02 100644 (file)
--- a/mux.c
+++ b/mux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mux.c,v 1.85 2020/10/18 11:32:01 djm Exp $ */
+/* $OpenBSD: mux.c,v 1.86 2020/10/29 02:52:43 djm Exp $ */
 /*
  * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
  *
@@ -472,7 +472,7 @@ mux_master_process_new_session(struct ssh *ssh, u_int rid,
            CHAN_EXTENDED_WRITE, "client-session", /*nonblock*/0);
 
        nc->ctl_chan = c->self;         /* link session -> control channel */
-       c->remote_id = nc->self;        /* link control -> session channel */
+       c->remote_id = nc->self;        /* link control -> session channel */
        c->have_remote_id = 1;
 
        if (cctx->want_tty && escape_char != 0xffffffff) {
@@ -1035,7 +1035,7 @@ mux_master_process_stdio_fwd(struct ssh *ssh, u_int rid,
        free(chost);
 
        nc->ctl_chan = c->self;         /* link session -> control channel */
-       c->remote_id = nc->self;        /* link control -> session channel */
+       c->remote_id = nc->self;        /* link control -> session channel */
        c->have_remote_id = 1;
 
        debug2_f("channel_new: %d control %d", nc->self, nc->ctl_chan);

diff --git a/sftp.c b/sftp.c
index e522844dea7f15284d7efe482ff478b0ae367c76..b641be2bc4c7094d9520a76c1e3dc61b61e58c39 100644 (file)
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.203 2020/10/18 11:32:02 djm Exp $ */
+/* $OpenBSD: sftp.c,v 1.204 2020/10/29 02:52:43 djm Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -1172,7 +1172,7 @@ undo_glob_escape(char *s)
  * last argument's quote has been properly terminated or 0 otherwise.
  * This parameter is only of use if "sloppy" is set.
  */
-#define MAXARGS        128
+#define MAXARGS                128
 #define MAXARGLEN      8192
 static char **
 makeargv(const char *arg, int *argcp, int sloppy, char *lastquote,

diff --git a/ssh-keygen.c b/ssh-keygen.c
index acac61742cca9afa507b99b42654bfd1805a5d61..1603206206a8b1624945ba53f0425800fa1bf58b 100644 (file)
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.421 2020/10/18 11:32:02 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.422 2020/10/29 02:52:43 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -3101,7 +3101,7 @@ usage(void)
            "       ssh-keygen -Y check-novalidate -n namespace -s signature_file\n"
            "       ssh-keygen -Y sign -f key_file -n namespace file ...\n"
            "       ssh-keygen -Y verify -f allowed_signers_file -I signer_identity\n"
-           "                   -n namespace -s signature_file [-r revocation_file]\n");
+           "                  -n namespace -s signature_file [-r revocation_file]\n");
        exit(1);
 }
 

diff --git a/sshconnect2.c b/sshconnect2.c
index ad81e18a4139c36ebcd3915597e37c70a383b67d..87986346e7bd0340fe76be4e2bc2ac40306695a8 100644 (file)
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.331 2020/10/18 11:32:02 djm Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.332 2020/10/29 02:52:43 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
@@ -1604,8 +1604,8 @@ key_type_allowed_by_config(struct sshkey *key)
 
 /*
  * try keys in the following order:
- *     1. certificates listed in the config file
- *     2. other input certificates
+ *     1. certificates listed in the config file
+ *     2. other input certificates
  *     3. agent keys that are found in the config file
  *     4. other agent keys
  *     5. keys that are only listed in the config file