summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2023-03-05 05:34:09 +0000
committerDarren Tucker <dtucker@dtucker.net>2023-03-05 19:27:31 +1100
commitfc7f8f2188d4a4fc8ba77eddbe863c7665666db5 (patch)
tree0d19bf3eea09b7ae3a4149f09d54d80b7992e0c3
parent6c165c36246d8004c20e1df5cec4961a5ac422d6 (diff)
upstream: Remove unused compat.h includes.
We've previously removed a lot of the really old compatibility code, and with it went the need to include compat.h in most of the files that have it. OpenBSD-Commit-ID: 5af8baa194be00a3092d17598e88a5b29f7ea2b4
-rw-r--r--auth.c3
-rw-r--r--auth2-hostbased.c3
-rw-r--r--auth2-none.c3
-rw-r--r--auth2-pubkeyfile.c3
-rw-r--r--auth2.c3
-rw-r--r--authfd.c3
-rw-r--r--dispatch.c3
-rw-r--r--kexgexs.c3
-rw-r--r--readconf.c3
-rw-r--r--servconf.c3
-rw-r--r--serverloop.c3
-rw-r--r--session.c3
-rw-r--r--ssh-agent.c3
-rw-r--r--ssh-dss.c3
-rw-r--r--ssh-rsa.c3
-rw-r--r--sshconnect.c3
16 files changed, 16 insertions, 32 deletions
diff --git a/auth.c b/auth.c
index 03a777cc..3b380d9b 100644
--- a/auth.c
+++ b/auth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.c,v 1.159 2022/12/09 00:17:40 dtucker Exp $ */
+/* $OpenBSD: auth.c,v 1.160 2023/03/05 05:34:09 dtucker Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@@ -74,7 +74,6 @@
#include "authfile.h"
#include "monitor_wrap.h"
#include "ssherr.h"
-#include "compat.h"
#include "channels.h"
/* import */
diff --git a/auth2-hostbased.c b/auth2-hostbased.c
index cdfe7fd8..06bb464f 100644
--- a/auth2-hostbased.c
+++ b/auth2-hostbased.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-hostbased.c,v 1.51 2023/02/17 04:22:50 dtucker Exp $ */
+/* $OpenBSD: auth2-hostbased.c,v 1.52 2023/03/05 05:34:09 dtucker Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@@ -40,7 +40,6 @@
#include "log.h"
#include "misc.h"
#include "servconf.h"
-#include "compat.h"
#include "sshkey.h"
#include "hostfile.h"
#include "auth.h"
diff --git a/auth2-none.c b/auth2-none.c
index d9f97223..8966fd08 100644
--- a/auth2-none.c
+++ b/auth2-none.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-none.c,v 1.24 2021/12/19 22:12:07 djm Exp $ */
+/* $OpenBSD: auth2-none.c,v 1.25 2023/03/05 05:34:09 dtucker Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@@ -44,7 +44,6 @@
#include "log.h"
#include "misc.h"
#include "servconf.h"
-#include "compat.h"
#include "ssh2.h"
#include "ssherr.h"
#ifdef GSSAPI
diff --git a/auth2-pubkeyfile.c b/auth2-pubkeyfile.c
index 0cfacac3..31e7481f 100644
--- a/auth2-pubkeyfile.c
+++ b/auth2-pubkeyfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-pubkeyfile.c,v 1.3 2022/07/01 03:52:57 djm Exp $ */
+/* $OpenBSD: auth2-pubkeyfile.c,v 1.4 2023/03/05 05:34:09 dtucker Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2010 Damien Miller. All rights reserved.
@@ -42,7 +42,6 @@
#include "ssh.h"
#include "log.h"
#include "misc.h"
-#include "compat.h"
#include "sshkey.h"
#include "digest.h"
#include "hostfile.h"
diff --git a/auth2.c b/auth2.c
index 6c061934..c1bffe96 100644
--- a/auth2.c
+++ b/auth2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2.c,v 1.164 2022/02/23 11:18:13 djm Exp $ */
+/* $OpenBSD: auth2.c,v 1.165 2023/03/05 05:34:09 dtucker Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@@ -46,7 +46,6 @@
#include "sshbuf.h"
#include "misc.h"
#include "servconf.h"
-#include "compat.h"
#include "sshkey.h"
#include "hostfile.h"
#include "auth.h"
diff --git a/authfd.c b/authfd.c
index b633e35e..13f9432e 100644
--- a/authfd.c
+++ b/authfd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: authfd.c,v 1.130 2022/04/27 11:08:55 dtucker Exp $ */
+/* $OpenBSD: authfd.c,v 1.131 2023/03/05 05:34:09 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -55,7 +55,6 @@
#include "sshkey.h"
#include "authfd.h"
#include "cipher.h"
-#include "compat.h"
#include "log.h"
#include "atomicio.h"
#include "misc.h"
diff --git a/dispatch.c b/dispatch.c
index 6e4c501e..6118147b 100644
--- a/dispatch.c
+++ b/dispatch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dispatch.c,v 1.32 2019/01/19 21:33:13 djm Exp $ */
+/* $OpenBSD: dispatch.c,v 1.33 2023/03/05 05:34:09 dtucker Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@@ -34,7 +34,6 @@
#include "log.h"
#include "dispatch.h"
#include "packet.h"
-#include "compat.h"
#include "ssherr.h"
int
diff --git a/kexgexs.c b/kexgexs.c
index 72b444f6..676de77a 100644
--- a/kexgexs.c
+++ b/kexgexs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexgexs.c,v 1.44 2021/12/19 22:08:06 djm Exp $ */
+/* $OpenBSD: kexgexs.c,v 1.45 2023/03/05 05:34:09 dtucker Exp $ */
/*
* Copyright (c) 2000 Niels Provos. All rights reserved.
* Copyright (c) 2001 Markus Friedl. All rights reserved.
@@ -46,7 +46,6 @@
#include "packet.h"
#include "dh.h"
#include "ssh2.h"
-#include "compat.h"
#ifdef GSSAPI
#include "ssh-gss.h"
#endif
diff --git a/readconf.c b/readconf.c
index cf794988..e71428b2 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.372 2023/01/13 02:58:20 dtucker Exp $ */
+/* $OpenBSD: readconf.c,v 1.373 2023/03/05 05:34:09 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -54,7 +54,6 @@
#include "xmalloc.h"
#include "ssh.h"
#include "ssherr.h"
-#include "compat.h"
#include "cipher.h"
#include "pathnames.h"
#include "log.h"
diff --git a/servconf.c b/servconf.c
index 552fda75..9d5b73ec 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: servconf.c,v 1.391 2023/03/03 04:34:49 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.392 2023/03/05 05:34:09 dtucker Exp $ */
/*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved
@@ -54,7 +54,6 @@
#include "sshbuf.h"
#include "misc.h"
#include "servconf.h"
-#include "compat.h"
#include "pathnames.h"
#include "cipher.h"
#include "sshkey.h"
diff --git a/serverloop.c b/serverloop.c
index 6db0916d..550a3ba8 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: serverloop.c,v 1.234 2023/01/17 09:44:48 djm Exp $ */
+/* $OpenBSD: serverloop.c,v 1.235 2023/03/05 05:34:09 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -69,7 +69,6 @@
#include "canohost.h"
#include "sshpty.h"
#include "channels.h"
-#include "compat.h"
#include "ssh2.h"
#include "sshkey.h"
#include "cipher.h"
diff --git a/session.c b/session.c
index f30d7ac5..a08c268f 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.333 2023/01/06 02:42:34 djm Exp $ */
+/* $OpenBSD: session.c,v 1.334 2023/03/05 05:34:09 dtucker Exp $ */
/*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved
@@ -72,7 +72,6 @@
#include "ssherr.h"
#include "match.h"
#include "uidswap.h"
-#include "compat.h"
#include "channels.h"
#include "sshkey.h"
#include "cipher.h"
diff --git a/ssh-agent.c b/ssh-agent.c
index 63e1137b..d5811f97 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.294 2022/12/04 11:03:11 dtucker Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.295 2023/03/05 05:34:09 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -80,7 +80,6 @@
#include "sshbuf.h"
#include "sshkey.h"
#include "authfd.h"
-#include "compat.h"
#include "log.h"
#include "misc.h"
#include "digest.h"
diff --git a/ssh-dss.c b/ssh-dss.c
index 2ea0c0a5..3174ef14 100644
--- a/ssh-dss.c
+++ b/ssh-dss.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-dss.c,v 1.48 2022/10/28 00:44:44 djm Exp $ */
+/* $OpenBSD: ssh-dss.c,v 1.49 2023/03/05 05:34:09 dtucker Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@@ -37,7 +37,6 @@
#include <string.h>
#include "sshbuf.h"
-#include "compat.h"
#include "ssherr.h"
#include "digest.h"
#define SSHKEY_INTERNAL
diff --git a/ssh-rsa.c b/ssh-rsa.c
index 6516ddc1..be8f51e7 100644
--- a/ssh-rsa.c
+++ b/ssh-rsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-rsa.c,v 1.78 2022/10/28 02:47:04 djm Exp $ */
+/* $OpenBSD: ssh-rsa.c,v 1.79 2023/03/05 05:34:09 dtucker Exp $ */
/*
* Copyright (c) 2000, 2003 Markus Friedl <markus@openbsd.org>
*
@@ -28,7 +28,6 @@
#include <string.h>
#include "sshbuf.h"
-#include "compat.h"
#include "ssherr.h"
#define SSHKEY_INTERNAL
#include "sshkey.h"
diff --git a/sshconnect.c b/sshconnect.c
index 792bc34b..7f350eea 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.361 2023/01/13 02:44:02 djm Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.362 2023/03/05 05:34:09 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -54,7 +54,6 @@
#include "ssh.h"
#include "sshbuf.h"
#include "packet.h"
-#include "compat.h"
#include "sshkey.h"
#include "sshconnect.h"
#include "log.h"