summaryrefslogtreecommitdiff
path: root/ssh_api.c
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2016-05-04 14:22:33 +0000
committerDamien Miller <djm@mindrot.org>2016-05-19 17:48:34 +1000
commit0516454151ae722fc8256c3c56115c6baf24c5b0 (patch)
tree77e564e315d3a426051f32d59ba4720b4f2de860 /ssh_api.c
parent332ff3d770631e7513fea38cf0d3689f673f0e3f (diff)
upstream commit
move SSH_MSG_NONE, so we don't have to include ssh1.h; ok deraadt@ Upstream-ID: c2f97502efc761a41b18c17ddf460e138ca7994e
Diffstat (limited to 'ssh_api.c')
-rw-r--r--ssh_api.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/ssh_api.c b/ssh_api.c
index acd0b83c1..2a9f1497c 100644
--- a/ssh_api.c
+++ b/ssh_api.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh_api.c,v 1.6 2016/05/02 10:26:04 djm Exp $ */ 1/* $OpenBSD: ssh_api.c,v 1.7 2016/05/04 14:22:33 markus Exp $ */
2/* 2/*
3 * Copyright (c) 2012 Markus Friedl. All rights reserved. 3 * Copyright (c) 2012 Markus Friedl. All rights reserved.
4 * 4 *
@@ -17,14 +17,12 @@
17 17
18#include "includes.h" 18#include "includes.h"
19 19
20#include "ssh1.h" /* For SSH_MSG_NONE */
21#include "ssh_api.h" 20#include "ssh_api.h"
22#include "compat.h" 21#include "compat.h"
23#include "log.h" 22#include "log.h"
24#include "authfile.h" 23#include "authfile.h"
25#include "sshkey.h" 24#include "sshkey.h"
26#include "misc.h" 25#include "misc.h"
27#include "ssh1.h"
28#include "ssh2.h" 26#include "ssh2.h"
29#include "version.h" 27#include "version.h"
30#include "myproposal.h" 28#include "myproposal.h"