simon-git: putty (master): Simon Tatham

[Commits to Tartarus hosted VCS]

TL;DR:
  839ed84 Revert KEX_MAX_CONF system from the GSS kex patch.
  0beb8b3 Reduce verbosity of 'GSS init sec context failed' message.
  e3cc024 Don't periodically check GSS creds in non-GSS mode.
  5788226 Centralise definition of GSSAPI check interval.

Repository:     https://git.tartarus.org/simon/putty.git
On the web:     https://git.tartarus.org/?p=simon/putty.git
Branch updated: master
Committer:      Simon Tatham <anakin at pobox.com>
Date:           2018-05-01 19:06:26

commit 839ed84e59357bd3e0cff7752fbca7aebd3e2f9b
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=839ed84e59357bd3e0cff7752fbca7aebd3e2f9b;hp=d6bdcfa75c88224d0ddf7262a5e0903a324964b3
Author: Simon Tatham <anakin at pobox.com>
Date:   Tue May 1 07:41:01 2018 +0100

    Revert KEX_MAX_CONF system from the GSS kex patch.
    
    Commit d515e4f1a went through a lot of very different shapes before it
    was finally pushed. In some of them, GSS kex had its own value in the
    kex enumeration, but it was used in ssh.c but not in config.c
    (because, as in the final version, it wasn't configured by the same
    drag-list system as the rest of them). So we had to distinguish the
    set of key exchange ids known to the program as a whole from the set
    controllable in the configuration.
    
    In the final version, GSS kex ended up even more separated from the
    kex enumeration than that: the enum value KEX_GSS_SHA1_K5 isn't used
    at all. Instead, GSS key exchange appears in the list at the point of
    translation from the list of enum values into the list of pointers to
    data structures full of kex methods.
    
    But after all the changes, everyone involved forgot to revert the part
    of the patch which split KEX_MAX in two and introduced the pointless
    value KEX_GSS_SHA1_K5! Better late than never: I'm reverting it now,
    to avoid confusion, and because I don't have any reason to think the
    distinction will be useful for any other purpose.

 config.c   | 6 +++---
 putty.h    | 8 --------
 settings.c | 6 +++---
 ssh.c      | 4 ++--
 4 files changed, 8 insertions(+), 16 deletions(-)

commit 0beb8b37a1a4e7a48501e35d859e5ca182433edd
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=0beb8b37a1a4e7a48501e35d859e5ca182433edd;hp=839ed84e59357bd3e0cff7752fbca7aebd3e2f9b
Author: Simon Tatham <anakin at pobox.com>
Date:   Tue May 1 18:54:04 2018 +0100

    Reduce verbosity of 'GSS init sec context failed' message.
    
    Now we don't generate that message as a side effect of the periodic
    check for new GSS credentials; we only generate it as part of the much
    larger slew of messages that happen during a rekey.

 ssh.c | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

commit e3cc024e38e2b4632584f85223160b88f4583979
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=e3cc024e38e2b4632584f85223160b88f4583979;hp=0beb8b37a1a4e7a48501e35d859e5ca182433edd
Author: Simon Tatham <anakin at pobox.com>
Date:   Tue May 1 18:54:09 2018 +0100

    Don't periodically check GSS creds in non-GSS mode.
    
    The 2-minutely check to see whether new GSS credentials need to be
    forwarded to the server is pointless if we're not even in the mode
    where we _have_ forwarded a previous set.
    
    This was made obvious by the overly verbose diagnostic fixed in the
    previous commit, so it's a good thing that bug was temporarily there!

 ssh.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 5788226460c10f76c2a29eed2a08b26390c67c26
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=5788226460c10f76c2a29eed2a08b26390c67c26;hp=e3cc024e38e2b4632584f85223160b88f4583979
Author: Simon Tatham <anakin at pobox.com>
Date:   Tue May 1 18:53:30 2018 +0100

    Centralise definition of GSSAPI check interval.
    
    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.

 settings.c | 2 +-
 ssh.c      | 1 -
 sshgss.h   | 2 ++
 3 files changed, 3 insertions(+), 2 deletions(-)