simon-git: putty (master): Ben Harris

[Commits to Tartarus CVS repository.]

TL;DR:
  05e802d uxcons: Don't try to include <sys/select.h> on systems that don't have it.
  30cf737 Unix Plink: Set O_NONBLOCK on the SIGWINCH pipe.
  561f978 May as well set FD_CLOEXEC on the signal pipe as well.
  8a2797c ssh_pkt_defersend: don't call do_ssh2_transport when using SSH-1.

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-02 13:31:39

commit 05e802d5fe8d34b326ad251d5e25b76f7d006b33
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=05e802d5fe8d34b326ad251d5e25b76f7d006b33;hp=4ae1577b432c1859704d2763f70a764dee23bd98
Author: Ben Harris <bjh21 at bjh21.me.uk>
Date:   Sun May 1 18:11:50 2016 +0200

    uxcons: Don't try to include <sys/select.h> on systems that don't have it.
    
    Also include <sys/time.h> for ancient systems that define select()
    there.

 unix/uxcons.c |    3 +++
 1 file changed, 3 insertions(+)

commit 30cf7371f3b044f183fcef73aaa10afcbddec886
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=30cf7371f3b044f183fcef73aaa10afcbddec886;hp=05e802d5fe8d34b326ad251d5e25b76f7d006b33
Author: Ben Harris <bjh21 at bjh21.me.uk>
Date:   Sun May 1 17:46:40 2016 +0200

    Unix Plink: Set O_NONBLOCK on the SIGWINCH pipe.
    
    This should avoid the possibility of the SIGWINCH handler's blocking
    when trying to write to the pipe.  This could only happen if we'd
    somehow received PIPE_BUF SIGWINCHes without reading the pipe, which
    would be difficult to achieve.
    
    While we're at it, also set O_NONBLOCK on the reading side of the pipe,
    just in case.

 unix/uxplink.c |    3 +++
 1 file changed, 3 insertions(+)

commit 561f97874b48ba2043e9043e57b5b904cd26dbf7
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=561f97874b48ba2043e9043e57b5b904cd26dbf7;hp=30cf7371f3b044f183fcef73aaa10afcbddec886
Author: Ben Harris <bjh21 at bjh21.me.uk>
Date:   Sun May 1 17:55:07 2016 +0200

    May as well set FD_CLOEXEC on the signal pipe as well.

 unix/uxplink.c |    2 ++
 1 file changed, 2 insertions(+)

commit 8a2797cf0f32de5f2814609a3a64dd4c7dd63457
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=8a2797cf0f32de5f2814609a3a64dd4c7dd63457;hp=561f97874b48ba2043e9043e57b5b904cd26dbf7
Author: Ben Harris <bjh21 at bjh21.me.uk>
Date:   Sun May 1 19:16:22 2016 +0200

    ssh_pkt_defersend: don't call do_ssh2_transport when using SSH-1.
    
    Also add an assertion to do_ssh2_transport to catch this.
    
    This bug would be highly unlikely to manifest accidentally, but I
    think you could trigger it by setting the data-based rekey threshold
    very low.

 ssh.c |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)