diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-01-19 21:31:32 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-01-20 09:02:10 +1100 |
commit | 0fa174ebe129f3d0aeaf4e2d1dd8de745870d0ff (patch) | |
tree | 8ce7eacecf1200d6cb95cd01e87416cc6a3b1af7 /sshconnect.c | |
parent | 4ae7f80dfd02f2bde912a67c9f338f61e90fa79f (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 (limited to 'sshconnect.c')
-rw-r--r-- | sshconnect.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sshconnect.c b/sshconnect.c index 884e33628..346f979d1 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect.c,v 1.309 2018/12/27 03:25:25 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect.c,v 1.310 2019/01/19 21:31:32 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -70,6 +70,9 @@ | |||
70 | #include "authfd.h" | 70 | #include "authfd.h" |
71 | #include "kex.h" | 71 | #include "kex.h" |
72 | 72 | ||
73 | #include "opacket.h" /* XXX */ | ||
74 | extern struct ssh *active_state; /* XXX */ | ||
75 | |||
73 | struct sshkey *previous_host_key = NULL; | 76 | struct sshkey *previous_host_key = NULL; |
74 | 77 | ||
75 | static int matching_host_key_dns = 0; | 78 | static int matching_host_key_dns = 0; |