diff options
-rw-r--r-- | auth-krb5.c | 3 | ||||
-rw-r--r-- | ssh1.h | 3 | ||||
-rw-r--r-- | ssh2.h | 6 | ||||
-rw-r--r-- | ssh_api.c | 4 | ||||
-rw-r--r-- | ttymodes.c | 3 |
5 files changed, 9 insertions, 10 deletions
diff --git a/auth-krb5.c b/auth-krb5.c index d1c5a2f3..a5a81ed2 100644 --- 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" @@ -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) */ @@ -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 @@ -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" @@ -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" |