X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/0965bee0865fd8ea129b2de62a3c50e09c59a184..d8770b1245ff0acd81f581c5667563e0d127104a:/settings.c

diff --git a/settings.c b/settings.c
index b8a7f79f..ad062dd5 100644
--- a/settings.c
+++ b/settings.c
@@ -42,7 +42,7 @@ void save_settings (char *section, int do_host, Config *cfg) {
             }
         write_setting_s (sesskey, "Protocol", p);
     }
-    write_setting_i (sesskey, "CloseOnExit", !!cfg->close_on_exit);
+    write_setting_i (sesskey, "CloseOnExit", cfg->close_on_exit);
     write_setting_i (sesskey, "WarnOnClose", !!cfg->warn_on_close);
     write_setting_i (sesskey, "PingInterval", cfg->ping_interval / 60);     /* minutes */
     write_setting_i (sesskey, "PingIntervalSecs", cfg->ping_interval % 60); /* seconds */
@@ -73,8 +73,11 @@ void save_settings (char *section, int do_host, Config *cfg) {
     write_setting_i (sesskey, "Compression", cfg->compression);
     write_setting_i (sesskey, "AgentFwd", cfg->agentfwd);
     write_setting_s (sesskey, "RemoteCmd", cfg->remote_cmd);
-    write_setting_s (sesskey, "Cipher", cfg->cipher == CIPHER_BLOWFISH ? "blowfish" :
-                             cfg->cipher == CIPHER_DES ? "des" : "3des");
+    write_setting_s (sesskey, "Cipher",
+                     cfg->cipher == CIPHER_BLOWFISH ? "blowfish" :
+                     cfg->cipher == CIPHER_DES ? "des" :
+                     cfg->cipher == CIPHER_AES ? "aes" :
+                     "3des");
     write_setting_i (sesskey, "AuthTIS", cfg->try_tis_auth);
     write_setting_i (sesskey, "SshProt", cfg->sshprot);
     write_setting_i (sesskey, "BuggyMAC", cfg->buggymac);
@@ -157,6 +160,8 @@ void load_settings (char *section, int do_host, Config *cfg) {
 
     sesskey = open_settings_r(section);
 
+    cfg->ssh_subsys = 0;               /* FIXME: load this properly */
+
     gpps (sesskey, "HostName", "", cfg->host, sizeof(cfg->host));
     gppi (sesskey, "PortNumber", default_port, &cfg->port);
     gpps (sesskey, "LogFileName", "putty.log",
@@ -171,7 +176,7 @@ void load_settings (char *section, int do_host, Config *cfg) {
             break;
         }
 
-    gppi (sesskey, "CloseOnExit", 1, &cfg->close_on_exit);
+    gppi (sesskey, "CloseOnExit", COE_NORMAL, &cfg->close_on_exit);
     gppi (sesskey, "WarnOnClose", 1, &cfg->warn_on_close);
     {
       /* This is two values for backward compatibility with 0.50/0.51 */
@@ -216,6 +221,8 @@ void load_settings (char *section, int do_host, Config *cfg) {
 	    cfg->cipher = CIPHER_BLOWFISH;
 	else if (!strcmp(cipher, "des"))
 	    cfg->cipher = CIPHER_DES;
+	else if (!strcmp(cipher, "aes"))
+	    cfg->cipher = CIPHER_AES;
 	else
 	    cfg->cipher = CIPHER_3DES;
     }