simon-git: putty (pre-0.65): Simon Tatham

[Commits to Tartarus CVS repository.]

TL;DR:
  06946b4 Fix a mismerge in kex null-pointer checks.
  31ff9e0 Fix a crash when connection-sharing during userauth.

Repository:     git://git.tartarus.org/simon/putty.git
On the web:     http://tartarus.org/~simon-git/gitweb/?p=putty.git
Branch updated: pre-0.65
Committer:      Simon Tatham <anakin at pobox.com>
Date:           2015-06-22 19:43:08

commit 06946b4d4b3816fc2b26dd650a0b9d379fabdd85
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=06946b4d4b3816fc2b26dd650a0b9d379fabdd85;hp=be9e5ea0a05782df2aa455853d6e1e2efe4772b8
Author: Simon Tatham <anakin at pobox.com>
Date:   Mon Jun 22 19:36:57 2015 +0100

    Fix a mismerge in kex null-pointer checks.
    
    I removed a vital line of code while fixing the merge conflicts when
    cherry-picking 1eb578a488a71284d6b18e46df301e54805f2c35 as
    26fe1e26c0f7ab42440332882295667d4a0ac500, causing Diffie-Hellman key
    exchange to be completely broken because the server's host key was
    never constructed to verify the signature with. Reinstate it.

 ssh.c |    1 +
 1 file changed, 1 insertion(+)

commit 31ff9e0f96ad946326453ccaec99d1ab8254c9bd
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=31ff9e0f96ad946326453ccaec99d1ab8254c9bd;hp=06946b4d4b3816fc2b26dd650a0b9d379fabdd85
Author: Simon Tatham <anakin at pobox.com>
Date:   Mon Jun 22 19:37:27 2015 +0100

    Fix a crash when connection-sharing during userauth.
    
    If a sharing downstream disconnected while we were still in userauth
    (probably by deliberate user action, since such a downstream would
    have just been sitting there waiting for upstream to be ready for it)
    then we could crash by attempting to count234(ssh->channels) before
    the ssh->channels tree had been set up in the first place.
    
    A simple null-pointer check fixes it. Thanks to Antti Seppanen for the
    report.

 ssh.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)