nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 01:48:00 +00:00
Code Issues Projects Releases Wiki Activity

Centralise definition of GSSAPI check interval.

Browse Source 
It was defined separately as 2 minutes in ssh.c and settings.c.
Now both of those refer to a single definition in sshgss.h.
This commit is contained in:
Simon Tatham 2018-05-01 18:53:30 +01:00
parent e3cc024e38
commit 5788226460
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
settings.c
View File

@ -960,7 +960,7 @@ void load_open_settings(void *sesskey, Conf *conf)
gprefs(sesskey, "HostKey", "ed25519,ecdsa,rsa,dsa,WARN", gprefs(sesskey, "HostKey", "ed25519,ecdsa,rsa,dsa,WARN",
hknames, HK_MAX, conf, CONF_ssh_hklist); hknames, HK_MAX, conf, CONF_ssh_hklist);
gppi(sesskey, "RekeyTime", 60, conf, CONF_ssh_rekey_time); gppi(sesskey, "RekeyTime", 60, conf, CONF_ssh_rekey_time);
gppi(sesskey, "GssapiRekey", 2, conf, CONF_gssapirekey); gppi(sesskey, "GssapiRekey", GSS_DEF_REKEY_MINS, conf, CONF_gssapirekey);
gpps(sesskey, "RekeyBytes", "1G", conf, CONF_ssh_rekey_data); gpps(sesskey, "RekeyBytes", "1G", conf, CONF_ssh_rekey_data);
{ {
/* SSH-2 only by default */ /* SSH-2 only by default */

1
ssh.c
View File

@ -17,7 +17,6 @@
#ifndef NO_GSSAPI #ifndef NO_GSSAPI
#include "sshgssc.h" #include "sshgssc.h"
#include "sshgss.h" #include "sshgss.h"
#define GSS_DEF_REKEY_MINS 2 /* Default minutes between GSS cache checks */
#define MIN_CTXT_LIFETIME 5 /* Avoid rekey with short lifetime (seconds) */ #define MIN_CTXT_LIFETIME 5 /* Avoid rekey with short lifetime (seconds) */
#define GSS_KEX_CAPABLE (1<<0) /* Can do GSS KEX */ #define GSS_KEX_CAPABLE (1<<0) /* Can do GSS KEX */
#define GSS_CRED_UPDATED (1<<1) /* Cred updated since previous delegation */ #define GSS_CRED_UPDATED (1<<1) /* Cred updated since previous delegation */

2
sshgss.h
View File

@ -30,6 +30,8 @@ typedef gss_name_t Ssh_gss_name;
#define GSS_NO_EXPIRATION ((time_t)-1) #define GSS_NO_EXPIRATION ((time_t)-1)
#define GSS_DEF_REKEY_MINS 2 /* Default minutes between GSS cache checks */
/* Functions, provided by either wingss.c or sshgssc.c */ /* Functions, provided by either wingss.c or sshgssc.c */
struct ssh_gss_library; struct ssh_gss_library;