upstream: Reorder headers according to KNF,

and pull in a few we don't have from Portable.

OpenBSD-Commit-ID: d83f6c75da7bfb16bbff40fd2133d6eba4aba272

diff --git a/auth-krb5.c b/auth-krb5.c
index 9d2f1f0ea2a0596e69832c271e4fb3b33cbc26fa..3c6dc0622826c0cb30783324ee537f6926a9d00e 100644 (file)
--- a/auth-krb5.c
+++ b/auth-krb5.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-krb5.c,v 1.25 2025/09/29 21:29:22 dtucker Exp $ */
+/* $OpenBSD: auth-krb5.c,v 1.26 2026/02/08 19:54:31 dtucker Exp $ */
 /*
  *    Kerberos v5 authentication and ticket-passing routines.
  *

diff --git a/authfile.c b/authfile.c
index 16e02d9d0580428f5b0f51175989c363833b02cc..e3ca1005f6f4c52134e9d6f7a135af7c16436812 100644 (file)
--- a/authfile.c
+++ b/authfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: authfile.c,v 1.147 2025/08/29 03:50:38 djm Exp $ */
+/* $OpenBSD: authfile.c,v 1.148 2026/02/08 19:54:31 dtucker Exp $ */
 /*
  * Copyright (c) 2000, 2013 Markus Friedl.  All rights reserved.
  *

diff --git a/dh.c b/dh.c
index 168dea1dd6481c99ad81e0547bc79bbad8a6d9a6..b291750d89ec53b5939fd7ea0feb5dadf4941cd0 100644 (file)
--- a/dh.c
+++ b/dh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh.c,v 1.75 2024/12/03 16:27:53 dtucker Exp $ */
+/* $OpenBSD: dh.c,v 1.76 2026/02/08 19:54:31 dtucker Exp $ */
 /*
  * Copyright (c) 2000 Niels Provos.  All rights reserved.
  *
@@ -26,6 +26,7 @@
 #include "includes.h"
 
 #ifdef WITH_OPENSSL
+#include "openbsd-compat/openssl-compat.h"
 
 #include <errno.h>
 #include <stdarg.h>
@@ -43,8 +44,6 @@
 #include "misc.h"
 #include "ssherr.h"
 
-#include "openbsd-compat/openssl-compat.h"
-
 static const char *moduli_filename;
 
 void dh_set_moduli_file(const char *filename)

diff --git a/gss-genr.c b/gss-genr.c
index 8f1f54afb4bed2df0f4cb571d59f61f5e9a40a66..7088d93b43ebf230f2111620934ddcf2986b5748 100644 (file)
--- a/gss-genr.c
+++ b/gss-genr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gss-genr.c,v 1.30 2025/09/29 21:28:33 dtucker Exp $ */
+/* $OpenBSD: gss-genr.c,v 1.31 2026/02/08 19:54:31 dtucker Exp $ */
 
 /*
  * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved.

diff --git a/kex.c b/kex.c
index 814fad9476c222c5293d14acedc6e50d7089001d..ee2e1cc0ab992a8ef49a5601160923d0b584227e 100644 (file)
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.c,v 1.189 2025/09/15 04:40:34 djm Exp $ */
+/* $OpenBSD: kex.c,v 1.190 2026/02/08 19:54:31 dtucker Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *

diff --git a/kexgen.c b/kexgen.c
index 494d4b2335618799eea017d2b468c68ad54a646d..1541ab975cde5bfe98ab9281817f93f00685df62 100644 (file)
--- a/kexgen.c
+++ b/kexgen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexgen.c,v 1.10 2024/09/09 02:39:57 djm Exp $ */
+/* $OpenBSD: kexgen.c,v 1.11 2026/02/08 19:54:31 dtucker Exp $ */
 /*
  * Copyright (c) 2019 Markus Friedl.  All rights reserved.
  *

diff --git a/kexgexc.c b/kexgexc.c
index 097d83f3072acf915b4397502c3913eb07eb5959..a114be944706f4d1f67acf7c3adce7f59b89015c 100644 (file)
--- a/kexgexc.c
+++ b/kexgexc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexgexc.c,v 1.39 2025/10/03 00:08:02 djm Exp $ */
+/* $OpenBSD: kexgexc.c,v 1.40 2026/02/08 19:54:31 dtucker Exp $ */
 /*
  * Copyright (c) 2000 Niels Provos.  All rights reserved.
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -27,10 +27,10 @@
 #include "includes.h"
 
 #ifdef WITH_OPENSSL
+#include "openbsd-compat/openssl-compat.h"
 
 #include <sys/types.h>
 
-#include "openbsd-compat/openssl-compat.h"
 #include <openssl/bn.h>
 #include <openssl/dh.h>
 

diff --git a/kexgexs.c b/kexgexs.c
index d02cca6dcf82e76c08de7381b38f2b170d90e24f..aa61a9c1aac5569914ac61c7e6c75839c0930d67 100644 (file)
--- a/kexgexs.c
+++ b/kexgexs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexgexs.c,v 1.49 2025/10/03 00:09:26 djm Exp $ */
+/* $OpenBSD: kexgexs.c,v 1.50 2026/02/08 19:54:31 dtucker Exp $ */
 /*
  * Copyright (c) 2000 Niels Provos.  All rights reserved.
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -27,13 +27,13 @@
 #include "includes.h"
 
 #ifdef WITH_OPENSSL
+#include "openbsd-compat/openssl-compat.h"
 
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 #include <signal.h>
 
-#include "openbsd-compat/openssl-compat.h"
 #include <openssl/bn.h>
 #include <openssl/dh.h>
 

diff --git a/monitor.c b/monitor.c
index b49ab3cc947bfb9ab4703e31c71091a6e3380a80..fa66b60cbd5cb388d612642753b01dc6b9cfebc0 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.251 2025/12/19 00:56:34 djm Exp $ */
+/* $OpenBSD: monitor.c,v 1.252 2026/02/08 19:54:31 dtucker Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>

diff --git a/monitor_fdpass.c b/monitor_fdpass.c
index 786d29ab7ea8841e22992df00262d78bb4c07b00..a2472abdb01b6fb39c0cae50db6af9120b26d0b2 100644 (file)
--- a/monitor_fdpass.c
+++ b/monitor_fdpass.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor_fdpass.c,v 1.22 2020/10/18 11:32:01 djm Exp $ */
+/* $OpenBSD: monitor_fdpass.c,v 1.23 2026/02/08 19:54:31 dtucker Exp $ */
 /*
  * Copyright 2001 Niels Provos <provos@citi.umich.edu>
  * All rights reserved.

diff --git a/monitor_wrap.c b/monitor_wrap.c
index a5c6308be8189e29064cc7682225341c7fecad0f..c56f46768aa33ad6f0375fdcc0f2d7c6bea9f11d 100644 (file)
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor_wrap.c,v 1.144 2025/12/19 00:56:34 djm Exp $ */
+/* $OpenBSD: monitor_wrap.c,v 1.145 2026/02/08 19:54:31 dtucker Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>

diff --git a/packet.c b/packet.c
index 05c2adfac54bad56c95415d6fc687931ba46afea..8785db9d8314c4b3b3a74474d58875953a6432cf 100644 (file)
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.331 2025/12/30 04:28:42 djm Exp $ */
+/* $OpenBSD: packet.c,v 1.332 2026/02/08 19:54:31 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland

diff --git a/readconf.c b/readconf.c
index 580026431d96db83319ec2ecc0d5e1f2518c2e67..1e7e240027ddcc02cc7d3ae56ca330757234aba7 100644 (file)
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.407 2025/11/20 05:10:11 dtucker Exp $ */
+/* $OpenBSD: readconf.c,v 1.408 2026/02/08 19:54:31 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland

diff --git a/scp.c b/scp.c
index dae585daffa68a91c1a4c57c8dd136ba27875b9c..e46daef90b227334f4fbe778cc8c76b6b637ec76 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.271 2026/02/06 22:59:18 dtucker Exp $ */
+/* $OpenBSD: scp.c,v 1.272 2026/02/08 19:54:31 dtucker Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
@@ -88,8 +88,6 @@
 #endif
 #include <glob.h>
 #include <libgen.h>
-#include <limits.h>
-#include <util.h>
 #include <locale.h>
 #include <poll.h>
 #include <pwd.h>
@@ -101,6 +99,8 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
+#include <limits.h>
+#include <util.h>
 #if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) && !defined(BROKEN_STRNVIS)
 #include <vis.h>
 #endif

diff --git a/sftp-common.c b/sftp-common.c
index 1924e4be074508422df5c17d063e3670e4b5d265..912b332d914e3617528206e71c3a72c711aee0de 100644 (file)
--- a/sftp-common.c
+++ b/sftp-common.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-common.c,v 1.34 2023/03/31 04:00:37 djm Exp $ */
+/* $OpenBSD: sftp-common.c,v 1.35 2026/02/08 19:54:31 dtucker Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2001 Damien Miller.  All rights reserved.

diff --git a/sftp-server.c b/sftp-server.c
index b98c3cd41c7ffb6844a3b2eba1a6dd72564ddcb2..2f725d2653cd4303b64bb3168f23f34b95d922ac 100644 (file)
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server.c,v 1.150 2025/12/08 00:41:46 djm Exp $ */
+/* $OpenBSD: sftp-server.c,v 1.151 2026/02/08 19:54:31 dtucker Exp $ */
 /*
  * Copyright (c) 2000-2004 Markus Friedl.  All rights reserved.
  *
@@ -18,8 +18,8 @@
 #include "includes.h"
 
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/resource.h>
+#include <sys/stat.h>
 #include <sys/time.h>
 #ifdef HAVE_SYS_MOUNT_H
 #include <sys/mount.h>

diff --git a/sftp.c b/sftp.c
index 78b37ebbdc6711d8ab5431f26d2fb13283baf0c5..f2be1fe38112129d04d33b26f140679b67c20452 100644 (file)
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.248 2026/01/21 15:44:51 sthen Exp $ */
+/* $OpenBSD: sftp.c,v 1.249 2026/02/08 19:54:31 dtucker Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *