upstream: whitespace

OpenBSD-Commit-ID: bf9e4a1049562ee4322684fbdce07142f04fdbb7

diff --git a/gss-genr.c b/gss-genr.c
index 2cd695e543c433cc02496f7f84360b36d7eac97a..aa34b71c555821483f8e2bef808057f43468b15f 100644 (file)
--- a/gss-genr.c
+++ b/gss-genr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gss-genr.c,v 1.28 2021/01/27 10:05:28 djm Exp $ */
+/* $OpenBSD: gss-genr.c,v 1.29 2024/02/01 02:37:33 djm Exp $ */
 
 /*
  * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved.
@@ -278,7 +278,7 @@ ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host)
        gss_OID_desc spnego_oid = {6, (void *)"\x2B\x06\x01\x05\x05\x02"};
 
        /* RFC 4462 says we MUST NOT do SPNEGO */
-       if (oid->length == spnego_oid.length && 
+       if (oid->length == spnego_oid.length &&
            (memcmp(oid->elements, spnego_oid.elements, oid->length) == 0))
                return 0; /* false */
 
@@ -286,7 +286,7 @@ ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host)
        ssh_gssapi_set_oid(*ctx, oid);
        major = ssh_gssapi_import_name(*ctx, host);
        if (!GSS_ERROR(major)) {
-               major = ssh_gssapi_init_ctx(*ctx, 0, GSS_C_NO_BUFFER, &token, 
+               major = ssh_gssapi_init_ctx(*ctx, 0, GSS_C_NO_BUFFER, &token,
                    NULL);
                gss_release_buffer(&minor, &token);
                if ((*ctx)->context != GSS_C_NO_CONTEXT)
@@ -294,7 +294,7 @@ ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host)
                            GSS_C_NO_BUFFER);
        }
 
-       if (GSS_ERROR(major)) 
+       if (GSS_ERROR(major))
                ssh_gssapi_delete_ctx(ctx);
 
        return (!GSS_ERROR(major));

diff --git a/nchan.c b/nchan.c
index d33426fedf91f139c1788290e1b64d7bc01ab4c8..b156695b27bd546b878b4f176efeca90bb1da17c 100644 (file)
--- a/nchan.c
+++ b/nchan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nchan.c,v 1.74 2022/02/01 23:32:51 djm Exp $ */
+/* $OpenBSD: nchan.c,v 1.75 2024/02/01 02:37:33 djm Exp $ */
 /*
  * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl.  All rights reserved.
  *
@@ -349,7 +349,7 @@ chan_is_dead(struct ssh *ssh, Channel *c, int do_send)
        if (c->flags & CHAN_LOCAL) {
                debug2("channel %d: is dead (local)", c->self);
                return 1;
-       }               
+       }
        if (!(c->flags & CHAN_CLOSE_SENT)) {
                if (do_send) {
                        chan_send_close2(ssh, c);

diff --git a/session.c b/session.c
index aa342e84de4c8c0b2d34ca5f5b96f542d15c212e..c821dcd4462dcfeeb5cd328cf8742b54f4947ffe 100644 (file)
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.336 2023/08/10 23:05:48 djm Exp $ */
+/* $OpenBSD: session.c,v 1.337 2024/02/01 02:37:33 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -1327,7 +1327,7 @@ safely_chroot(const char *path, uid_t uid)
                        memcpy(component, path, cp - path);
                        component[cp - path] = '\0';
                }
-       
+
                debug3_f("checking '%s'", component);
 
                if (stat(component, &st) != 0)

diff --git a/sftp.c b/sftp.c
index c609b4153d79d2ddf482f55e21769e6df9e1d681..76ba4de373cb2af88186b72f23aeb21d84dd1b2b 100644 (file)
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.236 2023/09/10 23:12:32 djm Exp $ */
+/* $OpenBSD: sftp.c,v 1.237 2024/02/01 02:37:33 djm Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -177,24 +177,24 @@ struct CMD {
 #define LOCAL  2
 
 static const struct CMD cmds[] = {
-       { "bye",        I_QUIT,         NOARGS,         NOARGS  },
-       { "cd",         I_CHDIR,        REMOTE,         NOARGS  },
-       { "chdir",      I_CHDIR,        REMOTE,         NOARGS  },
-       { "chgrp",      I_CHGRP,        REMOTE,         NOARGS  },
-       { "chmod",      I_CHMOD,        REMOTE,         NOARGS  },
-       { "chown",      I_CHOWN,        REMOTE,         NOARGS  },
-       { "copy",       I_COPY,         REMOTE,         LOCAL   },
-       { "cp",         I_COPY,         REMOTE,         LOCAL   },
-       { "df",         I_DF,           REMOTE,         NOARGS  },
-       { "dir",        I_LS,           REMOTE,         NOARGS  },
-       { "exit",       I_QUIT,         NOARGS,         NOARGS  },
-       { "get",        I_GET,          REMOTE,         LOCAL   },
-       { "help",       I_HELP,         NOARGS,         NOARGS  },
+       { "bye",        I_QUIT,         NOARGS,         NOARGS  },
+       { "cd",         I_CHDIR,        REMOTE,         NOARGS  },
+       { "chdir",      I_CHDIR,        REMOTE,         NOARGS  },
+       { "chgrp",      I_CHGRP,        REMOTE,         NOARGS  },
+       { "chmod",      I_CHMOD,        REMOTE,         NOARGS  },
+       { "chown",      I_CHOWN,        REMOTE,         NOARGS  },
+       { "copy",       I_COPY,         REMOTE,         LOCAL   },
+       { "cp",         I_COPY,         REMOTE,         LOCAL   },
+       { "df",         I_DF,           REMOTE,         NOARGS  },
+       { "dir",        I_LS,           REMOTE,         NOARGS  },
+       { "exit",       I_QUIT,         NOARGS,         NOARGS  },
+       { "get",        I_GET,          REMOTE,         LOCAL   },
+       { "help",       I_HELP,         NOARGS,         NOARGS  },
        { "lcd",        I_LCHDIR,       LOCAL,          NOARGS  },
        { "lchdir",     I_LCHDIR,       LOCAL,          NOARGS  },
        { "lls",        I_LLS,          LOCAL,          NOARGS  },
        { "lmkdir",     I_LMKDIR,       LOCAL,          NOARGS  },
-       { "ln",         I_LINK,         REMOTE,         REMOTE  },
+       { "ln",         I_LINK,         REMOTE,         REMOTE  },
        { "lpwd",       I_LPWD,         LOCAL,          NOARGS  },
        { "ls",         I_LS,           REMOTE,         NOARGS  },
        { "lumask",     I_LUMASK,       NOARGS,         NOARGS  },
@@ -203,17 +203,17 @@ static const struct CMD cmds[] = {
        { "mput",       I_PUT,          LOCAL,          REMOTE  },
        { "progress",   I_PROGRESS,     NOARGS,         NOARGS  },
        { "put",        I_PUT,          LOCAL,          REMOTE  },
-       { "pwd",        I_PWD,          REMOTE,         NOARGS  },
-       { "quit",       I_QUIT,         NOARGS,         NOARGS  },
-       { "reget",      I_REGET,        REMOTE,         LOCAL   },
-       { "rename",     I_RENAME,       REMOTE,         REMOTE  },
+       { "pwd",        I_PWD,          REMOTE,         NOARGS  },
+       { "quit",       I_QUIT,         NOARGS,         NOARGS  },
+       { "reget",      I_REGET,        REMOTE,         LOCAL   },
+       { "rename",     I_RENAME,       REMOTE,         REMOTE  },
        { "reput",      I_REPUT,        LOCAL,          REMOTE  },
        { "rm",         I_RM,           REMOTE,         NOARGS  },
        { "rmdir",      I_RMDIR,        REMOTE,         NOARGS  },
        { "symlink",    I_SYMLINK,      REMOTE,         REMOTE  },
-       { "version",    I_VERSION,      NOARGS,         NOARGS  },
-       { "!",          I_SHELL,        NOARGS,         NOARGS  },
-       { "?",          I_HELP,         NOARGS,         NOARGS  },
+       { "version",    I_VERSION,      NOARGS,         NOARGS  },
+       { "!",          I_SHELL,        NOARGS,         NOARGS  },
+       { "?",          I_HELP,         NOARGS,         NOARGS  },
        { NULL,         -1,             -1,             -1      }
 };
 

diff --git a/sshbuf-getput-crypto.c b/sshbuf-getput-crypto.c
index 56ffdd86156a59277d8740e7cbb357e323a92bd5..af3f39795d6bec6d254959f8f52cea024b507b79 100644 (file)
--- a/sshbuf-getput-crypto.c
+++ b/sshbuf-getput-crypto.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: sshbuf-getput-crypto.c,v 1.10 2022/05/25 06:03:44 djm Exp $   */
+/*     $OpenBSD: sshbuf-getput-crypto.c,v 1.11 2024/02/01 02:37:33 djm Exp $   */
 /*
  * Copyright (c) 2011 Damien Miller
  *
@@ -123,7 +123,7 @@ sshbuf_get_eckey(struct sshbuf *buf, EC_KEY *v)
                SSHBUF_ABORT();
                return SSH_ERR_INTERNAL_ERROR;
        }
-       return 0;       
+       return 0;
 }
 #endif /* OPENSSL_HAS_ECC */