settings.c (putty-0.75) | : | settings.c (putty-0.76) | ||
---|---|---|---|---|
skipping to change at line 611 | skipping to change at line 611 | |||
wprefs(sesskey, "Cipher", ciphernames, CIPHER_MAX, conf, CONF_ssh_cipherlist ); | wprefs(sesskey, "Cipher", ciphernames, CIPHER_MAX, conf, CONF_ssh_cipherlist ); | |||
wprefs(sesskey, "KEX", kexnames, KEX_MAX, conf, CONF_ssh_kexlist); | wprefs(sesskey, "KEX", kexnames, KEX_MAX, conf, CONF_ssh_kexlist); | |||
wprefs(sesskey, "HostKey", hknames, HK_MAX, conf, CONF_ssh_hklist); | wprefs(sesskey, "HostKey", hknames, HK_MAX, conf, CONF_ssh_hklist); | |||
write_setting_b(sesskey, "PreferKnownHostKeys", conf_get_bool(conf, CONF_ssh _prefer_known_hostkeys)); | write_setting_b(sesskey, "PreferKnownHostKeys", conf_get_bool(conf, CONF_ssh _prefer_known_hostkeys)); | |||
write_setting_i(sesskey, "RekeyTime", conf_get_int(conf, CONF_ssh_rekey_time )); | write_setting_i(sesskey, "RekeyTime", conf_get_int(conf, CONF_ssh_rekey_time )); | |||
#ifndef NO_GSSAPI | #ifndef NO_GSSAPI | |||
write_setting_i(sesskey, "GssapiRekey", conf_get_int(conf, CONF_gssapirekey) ); | write_setting_i(sesskey, "GssapiRekey", conf_get_int(conf, CONF_gssapirekey) ); | |||
#endif | #endif | |||
write_setting_s(sesskey, "RekeyBytes", conf_get_str(conf, CONF_ssh_rekey_dat a)); | write_setting_s(sesskey, "RekeyBytes", conf_get_str(conf, CONF_ssh_rekey_dat a)); | |||
write_setting_b(sesskey, "SshNoAuth", conf_get_bool(conf, CONF_ssh_no_userau th)); | write_setting_b(sesskey, "SshNoAuth", conf_get_bool(conf, CONF_ssh_no_userau th)); | |||
write_setting_b(sesskey, "SshNoTrivialAuth", conf_get_bool(conf, CONF_ssh_no _trivial_userauth)); | ||||
write_setting_b(sesskey, "SshBanner", conf_get_bool(conf, CONF_ssh_show_bann er)); | write_setting_b(sesskey, "SshBanner", conf_get_bool(conf, CONF_ssh_show_bann er)); | |||
write_setting_b(sesskey, "AuthTIS", conf_get_bool(conf, CONF_try_tis_auth)); | write_setting_b(sesskey, "AuthTIS", conf_get_bool(conf, CONF_try_tis_auth)); | |||
write_setting_b(sesskey, "AuthKI", conf_get_bool(conf, CONF_try_ki_auth)); | write_setting_b(sesskey, "AuthKI", conf_get_bool(conf, CONF_try_ki_auth)); | |||
#ifndef NO_GSSAPI | #ifndef NO_GSSAPI | |||
write_setting_b(sesskey, "AuthGSSAPI", conf_get_bool(conf, CONF_try_gssapi_a uth)); | write_setting_b(sesskey, "AuthGSSAPI", conf_get_bool(conf, CONF_try_gssapi_a uth)); | |||
write_setting_b(sesskey, "AuthGSSAPIKEX", conf_get_bool(conf, CONF_try_gssap i_kex)); | write_setting_b(sesskey, "AuthGSSAPIKEX", conf_get_bool(conf, CONF_try_gssap i_kex)); | |||
wprefs(sesskey, "GSSLibs", gsslibkeywords, ngsslibs, conf, CONF_ssh_gsslist) ; | wprefs(sesskey, "GSSLibs", gsslibkeywords, ngsslibs, conf, CONF_ssh_gsslist) ; | |||
write_setting_filename(sesskey, "GSSCustom", conf_get_filename(conf, CONF_ss h_gss_custom)); | write_setting_filename(sesskey, "GSSCustom", conf_get_filename(conf, CONF_ss h_gss_custom)); | |||
#endif | #endif | |||
write_setting_b(sesskey, "SshNoShell", conf_get_bool(conf, CONF_ssh_no_shell )); | write_setting_b(sesskey, "SshNoShell", conf_get_bool(conf, CONF_ssh_no_shell )); | |||
skipping to change at line 1027 | skipping to change at line 1028 | |||
int sshprot = gppi_raw(sesskey, "SshProt", 3); | int sshprot = gppi_raw(sesskey, "SshProt", 3); | |||
/* Old sessions may contain the values corresponding to the fallbacks | /* Old sessions may contain the values corresponding to the fallbacks | |||
* we used to allow; migrate them */ | * we used to allow; migrate them */ | |||
if (sshprot == 1) sshprot = 0; /* => "SSH-1 only" */ | if (sshprot == 1) sshprot = 0; /* => "SSH-1 only" */ | |||
else if (sshprot == 2) sshprot = 3; /* => "SSH-2 only" */ | else if (sshprot == 2) sshprot = 3; /* => "SSH-2 only" */ | |||
conf_set_int(conf, CONF_sshprot, sshprot); | conf_set_int(conf, CONF_sshprot, sshprot); | |||
} | } | |||
gpps(sesskey, "LogHost", "", conf, CONF_loghost); | gpps(sesskey, "LogHost", "", conf, CONF_loghost); | |||
gppb(sesskey, "SSH2DES", false, conf, CONF_ssh2_des_cbc); | gppb(sesskey, "SSH2DES", false, conf, CONF_ssh2_des_cbc); | |||
gppb(sesskey, "SshNoAuth", false, conf, CONF_ssh_no_userauth); | gppb(sesskey, "SshNoAuth", false, conf, CONF_ssh_no_userauth); | |||
gppb(sesskey, "SshNoTrivialAuth", false, conf, CONF_ssh_no_trivial_userauth) ; | ||||
gppb(sesskey, "SshBanner", true, conf, CONF_ssh_show_banner); | gppb(sesskey, "SshBanner", true, conf, CONF_ssh_show_banner); | |||
gppb(sesskey, "AuthTIS", false, conf, CONF_try_tis_auth); | gppb(sesskey, "AuthTIS", false, conf, CONF_try_tis_auth); | |||
gppb(sesskey, "AuthKI", true, conf, CONF_try_ki_auth); | gppb(sesskey, "AuthKI", true, conf, CONF_try_ki_auth); | |||
#ifndef NO_GSSAPI | #ifndef NO_GSSAPI | |||
gppb(sesskey, "AuthGSSAPI", true, conf, CONF_try_gssapi_auth); | gppb(sesskey, "AuthGSSAPI", true, conf, CONF_try_gssapi_auth); | |||
gppb(sesskey, "AuthGSSAPIKEX", true, conf, CONF_try_gssapi_kex); | gppb(sesskey, "AuthGSSAPIKEX", true, conf, CONF_try_gssapi_kex); | |||
gprefs(sesskey, "GSSLibs", "\0", | gprefs(sesskey, "GSSLibs", "\0", | |||
gsslibkeywords, ngsslibs, conf, CONF_ssh_gsslist); | gsslibkeywords, ngsslibs, conf, CONF_ssh_gsslist); | |||
gppfile(sesskey, "GSSCustom", conf, CONF_ssh_gss_custom); | gppfile(sesskey, "GSSCustom", conf, CONF_ssh_gss_custom); | |||
#endif | #endif | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 2 lines changed or added |