summaryrefslogtreecommitdiffstats
path: root/crypto/openssh/ssh2.h
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-03-14 07:56:21 -0300
committerRenato Botelho <renato@netgate.com>2016-03-14 07:56:21 -0300
commita26e4b3de35515ec3eaf2eb76b001a6a502bf56c (patch)
tree66dd86f3e16db9b45f07c989e95501b6456cf6a5 /crypto/openssh/ssh2.h
parent7d66bf7f17e48798ec04b7a6d99daff1820e28f8 (diff)
parenta64e8d254dc9ecd38594b71dcd7d53c6084c5abc (diff)
downloadFreeBSD-src-a26e4b3de35515ec3eaf2eb76b001a6a502bf56c.zip
FreeBSD-src-a26e4b3de35515ec3eaf2eb76b001a6a502bf56c.tar.gz
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'crypto/openssh/ssh2.h')
-rw-r--r--crypto/openssh/ssh2.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/crypto/openssh/ssh2.h b/crypto/openssh/ssh2.h
index 59417e6..5d1918b 100644
--- a/crypto/openssh/ssh2.h
+++ b/crypto/openssh/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.17 2016/01/14 16:17:40 markus Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -80,6 +80,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 +165,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
OpenPOWER on IntegriCloud