Move ssh_gssapi_support_oids() to correct position in file to avoid diff.

[gssapi-openssh.git] / openssh / ssh1.h

diff --git a/openssh/ssh1.h b/openssh/ssh1.h
index 4cfe2a3af15c5b6123f19732d3d6b13d06ee8601..353d930415f7ed93c77957ee8c297a33c54e1f4d 100644 (file)
--- a/openssh/ssh1.h
+++ b/openssh/ssh1.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ssh1.h,v 1.3 2001/05/30 12:55:13 markus Exp $ */
+/* $OpenBSD: ssh1.h,v 1.6 2006/03/25 22:22:43 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -18,6 +18,9 @@
  * for compatibility.  The maximum value is 254; value 255 is reserved for
  * future extension.
  */
+/* Ranges */
+#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) */
@@ -29,8 +32,8 @@
 #define SSH_SMSG_AUTH_RSA_CHALLENGE            7       /* int (BIGNUM) */
 #define SSH_CMSG_AUTH_RSA_RESPONSE             8       /* int (BIGNUM) */
 #define SSH_CMSG_AUTH_PASSWORD                 9       /* pass (string) */
-#define SSH_CMSG_REQUEST_PTY                   10      /* TERM, tty modes */
-#define SSH_CMSG_WINDOW_SIZE                   11      /* row,col,xpix,ypix */
+#define SSH_CMSG_REQUEST_PTY                   10      /* TERM, tty modes */
+#define SSH_CMSG_WINDOW_SIZE                   11      /* row,col,xpix,ypix */
 #define SSH_CMSG_EXEC_SHELL                    12      /* */
 #define SSH_CMSG_EXEC_CMD                      13      /* cmd (string) */
 #define SSH_SMSG_SUCCESS                       14      /* */
@@ -45,7 +48,7 @@
 #define SSH_MSG_CHANNEL_DATA                   23      /* ch,data (int,str) */
 #define SSH_MSG_CHANNEL_CLOSE                  24      /* channel (int) */
 #define SSH_MSG_CHANNEL_CLOSE_CONFIRMATION     25      /* channel (int) */
-/*      SSH_CMSG_X11_REQUEST_FORWARDING         26         OBSOLETE */
+/*      SSH_CMSG_X11_REQUEST_FORWARDING                26         OBSOLETE */
 #define SSH_SMSG_X11_OPEN                      27      /* channel (int) */
 #define SSH_CMSG_PORT_FORWARD_REQUEST          28      /* p,host,hp (i,s,i) */
 #define SSH_MSG_PORT_OPEN                      29      /* ch,h,p (i,s,i) */
@@ -70,13 +73,6 @@
 #define SSH_MSG_CHANNEL_INPUT_EOF      SSH_MSG_CHANNEL_CLOSE
 #define SSH_MSG_CHANNEL_OUTPUT_CLOSE   SSH_MSG_CHANNEL_CLOSE_CONFIRMATION
 
-/* GSS-API authentication */
-#define SSH_CMSG_AUTH_GSSAPI                    88      /* int, strings... */
-#define SSH_SMSG_AUTH_GSSAPI_RESPONSE           89      /* string */
-#define SSH_MSG_AUTH_GSSAPI_TOKEN               90      /* string */
-#define SSH_SMSG_AUTH_GSSAPI_HASH               91      /* string */
-#define SSH_MSG_AUTH_GSSAPI_ABORT               92      /* */
-
 /*
  * Authentication methods.  New types can be added, but old types should not
  * be removed for compatibility.  The maximum allowed value is 31.
@@ -91,8 +87,6 @@
                                /* 8 to 15 are reserved */
 #define SSH_PASS_AFS_TOKEN     21
 
-#define SSH_AUTH_GSSAPI                24
-
 /* Protocol flags.  These are bit masks. */
 #define SSH_PROTOFLAG_SCREEN_NUMBER    1       /* X11 forwarding includes screen */
 #define SSH_PROTOFLAG_HOST_IN_FWD_OPEN 2       /* forwarding opens contain host */