import openssh-5.2p1-gsskex-all-20090726.patch

1 files changed, 8 insertions, 5 deletions

diff --git a/readconf.h b/readconf.h
index 10067f117..1fc653b1b 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.h,v 1.74 2008/06/26 11:46:31 grunk Exp $ */
+/* $OpenBSD: readconf.h,v 1.78 2009/02/12 03:00:56 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -20,9 +20,9 @@
 
 typedef struct {
         char     *listen_host;          /* Host (address) to listen on. */
-        u_short   listen_port;          /* Port to forward. */
+        int       listen_port;          /* Port to forward. */
         char     *connect_host;         /* Host to connect. */
-        u_short   connect_port;         /* Port to connect on connect_host. */
+        int       connect_port;         /* Port to connect on connect_host. */
 }       Forward;
 /* Data structure for representing option data. */
 
@@ -44,13 +44,16 @@ typedef struct {
         int     challenge_response_authentication;
                                         /* Try S/Key or TIS, authentication. */
         int     gss_authentication;     /* Try GSS authentication */
-        int     gss_keyex;              /* Try GSS key exchange */
+        int     gss_keyex;              /* Try GSS key exchange */
         int     gss_deleg_creds;        /* Delegate GSS credentials */
         int     gss_trust_dns;          /* Trust DNS for GSS canonicalization */
+        int     gss_renewal_rekey;      /* Credential renewal forces rekey */
+        char    *gss_client_identity;   /* Principal to initiate GSSAPI with */
         int     password_authentication;        /* Try password
                                                  * authentication. */
         int     kbd_interactive_authentication; /* Try keyboard-interactive auth. */
         char    *kbd_interactive_devices; /* Keyboard-interactive auth devices. */
+        int     zero_knowledge_password_authentication; /* Try jpake */
         int     batch_mode;     /* Batch mode: do not ask for passwords. */
         int     check_host_ip;  /* Also keep track of keys for IP address */
         int     strict_host_key_checking;       /* Strict host key checking. */
@@ -135,7 +138,7 @@ typedef struct {
 void     initialize_options(Options *);
 void     fill_default_options(Options *);
 int      read_config_file(const char *, const char *, Options *, int);
-int      parse_forward(Forward *, const char *);
+int      parse_forward(Forward *, const char *, int, int);
 
 int
 process_config_line(Options *, const char *, char *, const char *, int, int *);