upstream commit

move SSH_MSG_NONE, so we don't have to include ssh1.h;
 ok deraadt@

Upstream-ID: c2f97502efc761a41b18c17ddf460e138ca7994e

diff --git a/auth-krb5.c b/auth-krb5.c
index d1c5a2f3289858e6d7f9823040998ecf83156a60..a5a81ed2ed8ec8e14301c70327cabc958f4c86c1 100644 (file)
--- a/auth-krb5.c
+++ b/auth-krb5.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-krb5.c,v 1.21 2016/01/27 06:44:58 djm Exp $ */
+/* $OpenBSD: auth-krb5.c,v 1.22 2016/05/04 14:22:33 markus Exp $ */
 /*
  *    Kerberos v5 authentication and ticket-passing routines.
  *
@@ -36,7 +36,6 @@
 
 #include "xmalloc.h"
 #include "ssh.h"
-#include "ssh1.h"
 #include "packet.h"
 #include "log.h"
 #include "buffer.h"

diff --git a/ssh1.h b/ssh1.h
index 353d930415f7ed93c77957ee8c297a33c54e1f4d..6a05c4724bb7b89216fbcbc42d6b40cca72adad7 100644 (file)
--- a/ssh1.h
+++ b/ssh1.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh1.h,v 1.6 2006/03/25 22:22:43 djm Exp $ */
+/* $OpenBSD: ssh1.h,v 1.7 2016/05/04 14:22:33 markus Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -22,7 +22,6 @@
 #define SSH_MSG_MIN                            1
 #define SSH_MSG_MAX                            254
 /* Message name */                     /* msg code */  /* arguments */
-#define SSH_MSG_NONE                           0       /* no message */
 #define SSH_MSG_DISCONNECT                     1       /* cause (string) */
 #define SSH_SMSG_PUBLIC_KEY                    2       /* ck,msk,srvk,hostk */
 #define SSH_CMSG_SESSION_KEY                   3       /* key (BIGNUM) */

diff --git a/ssh2.h b/ssh2.h
index 5d1918bf8012e89b0ab271eb27cac1f359f3a093..f2e37c96aa262be8b4dacd6fe4f42a1f6b8e5fb7 100644 (file)
--- a/ssh2.h
+++ b/ssh2.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh2.h,v 1.17 2016/01/14 16:17:40 markus Exp $ */
+/* $OpenBSD: ssh2.h,v 1.18 2016/05/04 14:22:33 markus Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -55,6 +55,10 @@
  *     192-255  Local extensions
  */
 
+/* special marker for no message */
+
+#define SSH_MSG_NONE                                   0
+
 /* ranges */
 
 #define SSH2_MSG_TRANSPORT_MIN                         1

diff --git a/ssh_api.c b/ssh_api.c
index acd0b83c18214ffdf8f377461d32275a9a358051..2a9f1497c75acd6f36809815c642fc78d122bcc7 100644 (file)
--- a/ssh_api.c
+++ b/ssh_api.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh_api.c,v 1.6 2016/05/02 10:26:04 djm Exp $ */
+/* $OpenBSD: ssh_api.c,v 1.7 2016/05/04 14:22:33 markus Exp $ */
 /*
  * Copyright (c) 2012 Markus Friedl.  All rights reserved.
  *
@@ -17,14 +17,12 @@
 
 #include "includes.h"
 
-#include "ssh1.h" /* For SSH_MSG_NONE */
 #include "ssh_api.h"
 #include "compat.h"
 #include "log.h"
 #include "authfile.h"
 #include "sshkey.h"
 #include "misc.h"
-#include "ssh1.h"
 #include "ssh2.h"
 #include "version.h"
 #include "myproposal.h"

diff --git a/ttymodes.c b/ttymodes.c
index 6f51b8a70836618782570d5680fc80b663f4d709..db772c39c7435e7f7c2e2b5b8f0b5b10e34af136 100644 (file)
--- a/ttymodes.c
+++ b/ttymodes.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ttymodes.c,v 1.29 2008/11/02 00:16:16 stevesk Exp $ */
+/* $OpenBSD: ttymodes.c,v 1.30 2016/05/04 14:22:33 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -54,7 +54,6 @@
 
 #include "packet.h"
 #include "log.h"
-#include "ssh1.h"
 #include "compat.h"
 #include "buffer.h"