summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-01-19 21:31:32 +0000
committerDamien Miller <djm@mindrot.org>2019-01-20 09:02:10 +1100
commit0fa174ebe129f3d0aeaf4e2d1dd8de745870d0ff (patch)
tree8ce7eacecf1200d6cb95cd01e87416cc6a3b1af7
parent4ae7f80dfd02f2bde912a67c9f338f61e90fa79f (diff)
upstream: begin landing remaining refactoring of packet parsing
API, started almost exactly six years ago. This change stops including the old packet_* API by default and makes each file that requires the old API include it explicitly. We will commit file-by-file refactoring to remove the old API in consistent steps. with & ok markus@ OpenBSD-Commit-ID: 93c98a6b38f6911fd1ae025a1ec57807fb4d4ef4
Diffstat
-rw-r--r--auth.c5
-rw-r--r--auth2-hostbased.c4
-rw-r--r--auth2.c5
-rw-r--r--channels.c5
-rw-r--r--clientloop.c5
-rw-r--r--monitor.c5
-rw-r--r--monitor_wrap.c5
-rw-r--r--mux.c5
-rw-r--r--opacket.c3
-rw-r--r--packet.h6
-rw-r--r--servconf.c5
-rw-r--r--serverloop.c5
-rw-r--r--session.c5
-rw-r--r--ssh.c5
-rw-r--r--sshconnect.c5
-rw-r--r--sshconnect2.c5
-rw-r--r--sshd.c5
17 files changed, 62 insertions, 21 deletions
diff --git a/auth.c b/auth.c
index 7d48d07a..94f43a6c 100644
--- a/auth.c
+++ b/auth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.c,v 1.135 2019/01/17 04:20:53 djm Exp $ */
+/* $OpenBSD: auth.c,v 1.136 2019/01/19 21:31:32 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@@ -77,6 +77,9 @@
#include "compat.h"
#include "channels.h"
+#include "opacket.h" /* XXX */
+extern struct ssh *active_state; /* XXX */
+
/* import */
extern ServerOptions options;
extern int use_privsep;
diff --git a/auth2-hostbased.c b/auth2-hostbased.c
index 764ceff7..e28a48fb 100644
--- a/auth2-hostbased.c
+++ b/auth2-hostbased.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-hostbased.c,v 1.38 2018/09/20 03:28:06 djm Exp $ */
+/* $OpenBSD: auth2-hostbased.c,v 1.39 2019/01/19 21:31:32 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@@ -51,6 +51,8 @@
#include "ssherr.h"
#include "match.h"
+extern struct ssh *active_state; /* XXX */
+
/* import */
extern ServerOptions options;
extern u_char *session_id2;
diff --git a/auth2.c b/auth2.c
index 4415c11e..3df2acf7 100644
--- a/auth2.c
+++ b/auth2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2.c,v 1.151 2019/01/17 04:20:53 djm Exp $ */
+/* $OpenBSD: auth2.c,v 1.152 2019/01/19 21:31:32 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@@ -61,6 +61,9 @@
#include "ssherr.h"
#include "digest.h"
+#include "opacket.h" /* XXX */
+extern struct ssh *active_state; /* XXX */
+
/* import */
extern ServerOptions options;
extern u_char *session_id2;
diff --git a/channels.c b/channels.c
index 6d2e1c6a..dcda44b0 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.387 2018/12/07 02:31:20 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.388 2019/01/19 21:31:32 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -84,6 +84,9 @@
#include "pathnames.h"
#include "match.h"
+#include "opacket.h" /* XXX */
+extern struct ssh *active_state; /* XXX */
+
/* -- agent forwarding */
#define NUM_SOCKS 10
diff --git a/clientloop.c b/clientloop.c
index 8d312cda..d29ec00b 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.318 2018/09/21 12:46:22 djm Exp $ */
+/* $OpenBSD: clientloop.c,v 1.319 2019/01/19 21:31:32 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -112,6 +112,9 @@
#include "ssherr.h"
#include "hostfile.h"
+#include "opacket.h" /* XXX */
+extern struct ssh *active_state; /* XXX */
+
/* import options */
extern Options options;
diff --git a/monitor.c b/monitor.c
index 09d3a27f..e15a5225 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.188 2018/11/16 02:43:56 djm Exp $ */
+/* $OpenBSD: monitor.c,v 1.189 2019/01/19 21:31:32 djm Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -96,6 +96,9 @@
#include "match.h"
#include "ssherr.h"
+#include "opacket.h" /* XXX */
+extern struct ssh *active_state; /* XXX */
+
#ifdef GSSAPI
static Gssctxt *gsscontext = NULL;
#endif
diff --git a/monitor_wrap.c b/monitor_wrap.c
index 732fb347..6ceaa371 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor_wrap.c,v 1.107 2018/07/20 03:46:34 djm Exp $ */
+/* $OpenBSD: monitor_wrap.c,v 1.108 2019/01/19 21:31:32 djm Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -76,6 +76,9 @@
#include "ssherr.h"
+#include "opacket.h" /* XXX */
+extern struct ssh *active_state; /* XXX */
+
/* Imports */
extern struct monitor *pmonitor;
extern struct sshbuf *loginmsg;
diff --git a/mux.c b/mux.c
index 8e4b6082..abc1e05a 100644
--- a/mux.c
+++ b/mux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mux.c,v 1.77 2018/09/26 07:32:44 djm Exp $ */
+/* $OpenBSD: mux.c,v 1.78 2019/01/19 21:31:32 djm Exp $ */
/*
* Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
*
@@ -68,6 +68,9 @@
#include "clientloop.h"
#include "ssherr.h"
+#include "opacket.h" /* XXX */
+extern struct ssh *active_state; /* XXX */
+
/* from ssh.c */
extern int tty_flag;
extern Options options;
diff --git a/opacket.c b/opacket.c
index e637d7a7..56a76939 100644
--- a/opacket.c
+++ b/opacket.c
@@ -2,11 +2,12 @@
/* Written by Markus Friedl. Placed in the public domain. */
#include "includes.h"
-
+/* $OpenBSD: opacket.c,v 1.8 2019/01/19 21:31:32 djm Exp $ */
#include <stdarg.h>
#include "ssherr.h"
#include "packet.h"
+#include "opacket.h" /* XXX */
#include "log.h"
struct ssh *active_state, *backup_state;
diff --git a/packet.h b/packet.h
index 170203ca..c58b52d3 100644
--- a/packet.h
+++ b/packet.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.h,v 1.86 2018/07/09 21:20:26 markus Exp $ */
+/* $OpenBSD: packet.h,v 1.87 2019/01/19 21:31:32 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -204,10 +204,6 @@ int sshpkt_get_end(struct ssh *ssh);
void sshpkt_fmt_connection_id(struct ssh *ssh, char *s, size_t l);
const u_char *sshpkt_ptr(struct ssh *, size_t *lenp);
-/* OLD API */
-extern struct ssh *active_state;
-#include "opacket.h"
-
#if !defined(WITH_OPENSSL)
# undef BIGNUM
# undef EC_KEY
diff --git a/servconf.c b/servconf.c
index 52d9be42..0ec095bd 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: servconf.c,v 1.344 2018/11/19 04:12:32 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.345 2019/01/19 21:31:32 djm Exp $ */
/*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved
@@ -65,6 +65,9 @@
#include "myproposal.h"
#include "digest.h"
+#include "opacket.h" /* XXX */
+extern struct ssh *active_state; /* XXX */
+
static void add_listen_addr(ServerOptions *, const char *,
const char *, int);
static void add_one_listen_addr(ServerOptions *, const char *,
diff --git a/serverloop.c b/serverloop.c
index 7be83e2d..e0c26bbb 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: serverloop.c,v 1.209 2018/07/27 05:13:02 dtucker Exp $ */
+/* $OpenBSD: serverloop.c,v 1.210 2019/01/19 21:31:32 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -78,6 +78,9 @@
#include "serverloop.h"
#include "ssherr.h"
+#include "opacket.h" /* XXX */
+extern struct ssh *active_state; /* XXX */
+
extern ServerOptions options;
/* XXX */
diff --git a/session.c b/session.c
index 0452f507..f0dabe11 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.309 2019/01/17 04:45:09 djm Exp $ */
+/* $OpenBSD: session.c,v 1.310 2019/01/19 21:31:32 djm Exp $ */
/*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved
@@ -105,6 +105,9 @@
#include <selinux/selinux.h>
#endif
+#include "opacket.h" /* XXX */
+extern struct ssh *active_state; /* XXX */
+
#define IS_INTERNAL_SFTP(c) \
(!strncmp(c, INTERNAL_SFTP_NAME, sizeof(INTERNAL_SFTP_NAME) - 1) && \
(c[sizeof(INTERNAL_SFTP_NAME) - 1] == '\0' || \
diff --git a/ssh.c b/ssh.c
index 16536a97..a206a5fc 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.497 2018/12/27 03:25:25 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.498 2019/01/19 21:31:32 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -113,6 +113,9 @@
#include "ssh-pkcs11.h"
#endif
+#include "opacket.h" /* XXX */
+extern struct ssh *active_state; /* XXX move here */
+
extern char *__progname;
/* Saves a copy of argv for setproctitle emulation */
diff --git a/sshconnect.c b/sshconnect.c
index 884e3362..346f979d 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.309 2018/12/27 03:25:25 djm Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.310 2019/01/19 21:31:32 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -70,6 +70,9 @@
#include "authfd.h"
#include "kex.h"
+#include "opacket.h" /* XXX */
+extern struct ssh *active_state; /* XXX */
+
struct sshkey *previous_host_key = NULL;
static int matching_host_key_dns = 0;
diff --git a/sshconnect2.c b/sshconnect2.c
index 0e8f323d..73ffe77a 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.292 2019/01/04 03:27:50 djm Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.293 2019/01/19 21:31:32 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Damien Miller. All rights reserved.
@@ -77,6 +77,9 @@
#include "ssh-gss.h"
#endif
+#include "opacket.h" /* XXX */
+extern struct ssh *active_state; /* XXX */
+
/* import */
extern char *client_version_string;
extern char *server_version_string;
diff --git a/sshd.c b/sshd.c
index 1d25c88f..ad8c152a 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.521 2019/01/17 01:50:24 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.522 2019/01/19 21:31:32 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -123,6 +123,9 @@
#include "version.h"
#include "ssherr.h"
+#include "opacket.h" /* XXX */
+extern struct ssh *active_state; /* XXX move decl to this file */
+
/* Re-exec fds */
#define REEXEC_DEVCRYPTO_RESERVED_FD (STDERR_FILENO + 1)
#define REEXEC_STARTUP_PIPE_FD (STDERR_FILENO + 2)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 02:45:11 +0000