X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=putty.h;h=4b0e3fefdc3eb678cbadf3818d827d627e180d7a;hb=11655820ca7ba0e3f15a900eb3c75f60b66944d5;hp=b6aace7fae6457e8807c3133463d7b6c9d36cc3c;hpb=ba470dec5e37ffbde05425f48e7e9a64219aec2e;p=PuTTY.git

diff --git a/putty.h b/putty.h
index b6aace7f..4b0e3fef 100644
--- a/putty.h
+++ b/putty.h
@@ -232,6 +232,17 @@ enum {
     VT_XWINDOWS, VT_OEMANSI, VT_OEMONLY, VT_POORMAN, VT_UNICODE
 };
 
+enum {
+    /*
+     * SSH-2 key exchange algorithms
+     */
+    KEX_WARN,
+    KEX_DHGROUP1,
+    KEX_DHGROUP14,
+    KEX_DHGEX,
+    KEX_MAX
+};
+
 enum {
     /*
      * SSH ciphers (both SSH1 and SSH2)
@@ -388,6 +399,9 @@ struct config_tag {
 				        * but never for loading/saving */
     int nopty;
     int compression;
+    int ssh_kexlist[KEX_MAX];
+    int ssh_rekey_time;		       /* in minutes */
+    char ssh_rekey_data[16];
     int agentfwd;
     int change_username;	       /* allow username switching in SSH2 */
     int ssh_cipherlist[CIPHER_MAX];
@@ -514,7 +528,7 @@ struct config_tag {
     /* SSH bug compatibility modes */
     int sshbug_ignore1, sshbug_plainpw1, sshbug_rsa1,
 	sshbug_hmac2, sshbug_derivekey2, sshbug_rsapad2,
-	sshbug_dhgex2, sshbug_pksessid2;
+	sshbug_pksessid2;
     /* Options for pterm. Should split out into platform-dependent part. */
     int stamp_utmp;
     int login_shell;
@@ -862,7 +876,7 @@ int wc_unescape(char *output, const char *wildcard);
 void logevent(void *frontend, const char *);
 void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
 			 char *keystr, char *fingerprint);
-void askcipher(void *frontend, char *ciphername, int cs);
+void askalg(void *frontend, const char *algtype, const char *algname);
 int askappend(void *frontend, Filename filename);
 
 /*