Fix a couple of whitespace things. Portable already has these so this

removes two diffs between the two.

diff --git a/usr.bin/ssh/clientloop.c b/usr.bin/ssh/clientloop.c
index 2c97c86..39ecbe5 100644 (file)
--- a/usr.bin/ssh/clientloop.c
+++ b/usr.bin/ssh/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.364 2021/05/26 01:47:24 djm Exp $ */
+/* $OpenBSD: clientloop.c,v 1.365 2021/07/05 01:21:07 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -564,7 +564,7 @@ client_wait_until_can_do_something(struct ssh *ssh,
                        fatal_fr(r, "sshbuf_putf");
                quit_pending = 1;
        } else if (options.server_alive_interval > 0 && !FD_ISSET(connection_in,
-            *readsetp) && monotime() >= server_alive_time)
+           *readsetp) && monotime() >= server_alive_time)
                /*
                 * ServerAlive check is needed. We can't rely on the select
                 * timing out since traffic on the client side such as port

diff --git a/usr.bin/ssh/sshkey.c b/usr.bin/ssh/sshkey.c
index a3be721..d313fa2 100644 (file)
--- a/usr.bin/ssh/sshkey.c
+++ b/usr.bin/ssh/sshkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey.c,v 1.116 2021/04/03 06:18:41 djm Exp $ */
+/* $OpenBSD: sshkey.c,v 1.117 2021/07/05 01:21:07 dtucker Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Alexander von Gernler.  All rights reserved.
@@ -1276,7 +1276,6 @@ peek_type_nid(const char *s, size_t l, int *nid)
        return KEY_UNSPEC;
 }
 
-
 /* XXX this can now be made const char * */
 int
 sshkey_read(struct sshkey *ret, char **cpp)