merge 5.4p1

1 files changed, 11 insertions, 1 deletions

diff --git a/ssh2.h b/ssh2.h
index 1c33dc268..3ffaf686b 100644
--- a/ssh2.h
+++ b/ssh2.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh2.h,v 1.11 2008/11/04 08:22:13 djm Exp $ */
+/* $OpenBSD: ssh2.h,v 1.13 2010/02/26 20:29:54 djm Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -166,3 +166,13 @@
 
 #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