simon-git: putty (master): Ben Harris

[Commits to Tartarus CVS repository.]

TL;DR:
  d8eff10 Assert that ssh2_channel_check_close() is only called in SSH-2.
  1c8c385 Generalise ssh2_channel_msg() to ssh_channel_msg().
  d17b973 Switch SSH-1 channel message handlers to use ssh_channel_msg().
  08d4ca0 More strictness in ssh_channel_msg().

Repository:     git://git.tartarus.org/simon/putty.git
On the web:     http://tartarus.org/~simon-git/gitweb/?p=putty.git
Branch updated: master
Committer:      Ben Harris <bjh21 at bjh21.me.uk>
Date:           2016-05-22 23:08:09

commit d8eff1070d6e4582a05cb4db67759fb0e3ad8f4b
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=d8eff1070d6e4582a05cb4db67759fb0e3ad8f4b;hp=bc48975ce52aa4f69497db039317c249410d4b9d
Author: Ben Harris <bjh21 at bjh21.me.uk>
Date:   Sun May 22 13:50:34 2016 +0100

    Assert that ssh2_channel_check_close() is only called in SSH-2.
    
    That really should be true, but I don't entirely trust
    sshfwd_unclean_close().

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

commit 1c8c38555d08d94f447ca74f00ef6ea9778e183b
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=1c8c38555d08d94f447ca74f00ef6ea9778e183b;hp=d8eff1070d6e4582a05cb4db67759fb0e3ad8f4b
Author: Ben Harris <bjh21 at bjh21.me.uk>
Date:   Sun May 22 22:14:00 2016 +0100

    Generalise ssh2_channel_msg() to ssh_channel_msg().
    
    It now supports both SSH-1 and SSH-2 channel messages.  The SSH-1 code
    doesn't yet use it, though.

 ssh.c |   47 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 17 deletions(-)

commit d17b9733a9307b58ebf96419258d6c4ac3cd04d2
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=d17b9733a9307b58ebf96419258d6c4ac3cd04d2;hp=1c8c38555d08d94f447ca74f00ef6ea9778e183b
Author: Ben Harris <bjh21 at bjh21.me.uk>
Date:   Sun May 22 22:21:20 2016 +0100

    Switch SSH-1 channel message handlers to use ssh_channel_msg().
    
    This gives consistent (and stricter) handling of channel messages
    directed at non-existent and half-open channels.

 ssh.c |   28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

commit 08d4ca078763518ba377ac59a86a1580e6214c27
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=08d4ca078763518ba377ac59a86a1580e6214c27;hp=d17b9733a9307b58ebf96419258d6c4ac3cd04d2
Author: Ben Harris <bjh21 at bjh21.me.uk>
Date:   Sun May 22 22:57:25 2016 +0100

    More strictness in ssh_channel_msg().
    
    Now it disconnects if the server sends
    SSH_MSG_CHANNEL_OPEN_CONFIRMATION or SSH_MSG_CHANNEL_OPEN_FAILURE for
    a channel that isn't half-open.  Assertions in the SSH-2 handlers for
    these messages rely on this behaviour even though it's never been
    enforced before.

 ssh.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)