Add support for RFC 4432 RSA key exchange, the patch for which has been

[u/mdw/putty] / settings.c

diff --git a/settings.c b/settings.c
index 10f3573..c937d3c 100644 (file)
--- a/settings.c
+++ b/settings.c
@@ -27,6 +27,7 @@ static const struct keyval kexnames[] = {
     { "dh-gex-sha1",       KEX_DHGEX },
     { "dh-group14-sha1",    KEX_DHGROUP14 },
     { "dh-group1-sha1",            KEX_DHGROUP1 },
+    { "rsa",               KEX_RSA },
     { "WARN",              KEX_WARN }
 };
 
@@ -571,9 +572,9 @@ void load_open_settings(void *sesskey, Config *cfg)
        char *default_kexes;
        gppi(sesskey, "BugDHGEx2", 0, &i); i = 2-i;
        if (i == FORCE_ON)
-           default_kexes = "dh-group14-sha1,dh-group1-sha1,WARN,dh-gex-sha1";
+           default_kexes = "dh-group14-sha1,dh-group1-sha1,rsa,WARN,dh-gex-sha1";
        else
-           default_kexes = "dh-gex-sha1,dh-group14-sha1,dh-group1-sha1,WARN";
+           default_kexes = "dh-gex-sha1,dh-group14-sha1,dh-group1-sha1,rsa,WARN";
        gprefs(sesskey, "KEX", default_kexes,
               kexnames, KEX_MAX, cfg->ssh_kexlist);
     }