X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/b41069ff844e8d8e24da43b7f777801be1a55390..d40a94b97d318ea943d466abf6c123a71bcbf87a:/putty.h

diff --git a/putty.h b/putty.h
index 88774e0d..e4ca7865 100644
--- a/putty.h
+++ b/putty.h
@@ -135,8 +135,8 @@ enum {
      * Close On Exit behaviours. (cfg.close_on_exit)
      */
     COE_NEVER,      /* Never close the window */
-    COE_ALWAYS,     /* Always close the window */
-    COE_NORMAL      /* Close window on "normal" (non-error) exits only */
+    COE_NORMAL,     /* Close window on "normal" (non-error) exits only */
+    COE_ALWAYS      /* Always close the window */
 };
 
 typedef struct {
@@ -171,11 +171,12 @@ typedef struct {
     int nopty;
     int compression;
     int agentfwd;
-    enum { CIPHER_3DES, CIPHER_BLOWFISH, CIPHER_DES } cipher;
+    enum { CIPHER_3DES, CIPHER_BLOWFISH, CIPHER_DES, CIPHER_AES } cipher;
     char keyfile[FILENAME_MAX];
     int sshprot;                       /* use v1 or v2 when both available */
     int buggymac;                      /* MAC bug commmercial <=v2.3.x SSH2 */
     int try_tis_auth;
+    int ssh_subsys;		       /* run a subsystem rather than a command */
     /* Telnet options */
     char termtype[32];
     char termspeed[32];
@@ -381,7 +382,8 @@ extern Backend telnet_backend;
  * Exports from ssh.c.
  */
 
-extern int (*ssh_get_password)(const char *prompt, char *str, int maxlen);
+extern int (*ssh_get_line)(const char *prompt, char *str, int maxlen,
+                           int is_pw);
 extern Backend ssh_backend;
 
 /*