simon-git: putty (master): Simon Tatham

[Commits to Tartarus CVS repository.]

TL;DR:
  b003e5c Fix an SSH-breaking bug from the fuzzing merge.

Repository:     git://git.tartarus.org/simon/putty.git
On the web:     http://tartarus.org/~simon-git/gitweb/?p=putty.git
Branch updated: master
Committer:      Simon Tatham <anakin at pobox.com>
Date:           2015-11-07 20:17:44

commit b003e5cf534235f89f4de34c8d7b61baef7fe8ea
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=b003e5cf534235f89f4de34c8d7b61baef7fe8ea;hp=f3230c85457cc3d13c46e8ea91c9748dcd0054af
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Nov 7 20:15:24 2015 +0000

    Fix an SSH-breaking bug from the fuzzing merge.
    
    When we set ssh->sc{cipher,mac} to s->sc{cipher,mac}_tobe
    conditionally, we should be conditionalising on the values we're
    _reading_, not the ones we're about to overwrite.
    
    Thanks to Colin Harrison for this patch.

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