aboutsummaryrefslogtreecommitdiffstats
path: root/ssh2.h
diff options
context:
space:
mode:
authorGreg Hartman <ghartman@google.com>2017-06-22 20:49:52 -0700
committerGreg Hartman <ghartman@google.com>2017-06-23 15:44:15 -0700
commit9768ca48f57aaf035f508a473421d210b5145e99 (patch)
treec2ba282fc91c65b4abbf688efbd6f09f467601da /ssh2.h
parent7b5a7c1b3bb341c2ce7fa7d6386d4204680a92e4 (diff)
downloadplatform_external_openssh-9768ca48f57aaf035f508a473421d210b5145e99.tar.gz
platform_external_openssh-9768ca48f57aaf035f508a473421d210b5145e99.tar.bz2
platform_external_openssh-9768ca48f57aaf035f508a473421d210b5145e99.zip
Merge openssh 7.5p1
BUG: 35443510 Change-Id: I2558fb80234e145c13ccb7a51859f2a5fd2e0324
Diffstat (limited to 'ssh2.h')
-rw-r--r--ssh2.h14
1 files changed, 6 insertions, 8 deletions
diff --git a/ssh2.h b/ssh2.h
index 59417e61..f2e37c96 100644
--- a/ssh2.h
+++ b/ssh2.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh2.h,v 1.15 2014/01/29 06:18:35 djm 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
@@ -80,6 +84,7 @@
#define SSH2_MSG_DEBUG 4
#define SSH2_MSG_SERVICE_REQUEST 5
#define SSH2_MSG_SERVICE_ACCEPT 6
+#define SSH2_MSG_EXT_INFO 7
/* transport layer: alg negotiation */
@@ -164,13 +169,6 @@
#define SSH2_EXTENDED_DATA_STDERR 1
-/* kex messages for resume@appgate.com */
-#define SSH2_MSG_KEX_ROAMING_RESUME 30
-#define SSH2_MSG_KEX_ROAMING_AUTH_REQUIRED 31
-#define SSH2_MSG_KEX_ROAMING_AUTH 32
-#define SSH2_MSG_KEX_ROAMING_AUTH_OK 33
-#define SSH2_MSG_KEX_ROAMING_AUTH_FAIL 34
-
/* Certificate types for OpenSSH certificate keys extension */
#define SSH2_CERT_TYPE_USER 1
#define SSH2_CERT_TYPE_HOST 2