simon-git: putty (master): Ben Harris

[Commits to Tartarus CVS repository.]

TL;DR:
  307aacc When encrypting packet length with ChaCha20, treat sequence number as 32 bits.

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:           2015-06-24 21:58:50

commit 307aaccc59f6fbfdf7b980ae709c083786044163
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=307aaccc59f6fbfdf7b980ae709c083786044163;hp=0bd014e456a0e5f755c45a8a5a420d6fad85c1d8
Author: Ben Harris <bjh21 at bjh21.me.uk>
Date:   Wed Jun 24 21:58:11 2015 +0100

    When encrypting packet length with ChaCha20, treat sequence number as 32 bits.
    
    While ChaCha20 takes a 64-bit nonce, SSH-2 defines the message
    sequence number to wrap at 2^32 and OpenSSH stores it in a u_int32_t,
    so the upper 32 bits should always be zero.  PuTTY was getting this
    wrong, and either using an incorrect nonce or causing GCC to complain
    about an invalid shift, depending on the size of "unsigned long".  Now
    I think it gets it right.

 sshccp.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)