simon-git: putty (master): Simon Tatham

[Commits to Tartarus hosted VCS]

TL;DR:
  606cf4c2 Fix pasto in ssh2_mac_setkey, and start using it.
  24b9e671 Check for null pointers in dh_cleanup.

Repository:     https://git.tartarus.org/simon/putty.git
On the web:     https://git.tartarus.org/?p=simon/putty.git
Branch updated: master
Committer:      Simon Tatham <anakin at pobox.com>
Date:           2019-01-02 08:57:55

commit 606cf4c22b52250bfde03eb61f19520ffd8bb782
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=606cf4c22b52250bfde03eb61f19520ffd8bb782;hp=2ee23472ced0fa6ed065a41489b7fc85c20e3875
Author: Simon Tatham <anakin at pobox.com>
Date:   Wed Jan 2 08:54:07 2019 +0000

    Fix pasto in ssh2_mac_setkey, and start using it.
    
    The macro wrapper for the MAC setkey function expanded to completely
    the wrong vtable method due to a cut and paste error. And I never
    noticed, because what _should_ have been its two call sites in
    ssh2bpp.c were directly calling the _right_ vtable method instead.

 ssh.h     | 2 +-
 ssh2bpp.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 24b9e6716dd8e45a80ae62cc181cc1f73add06cf
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=24b9e6716dd8e45a80ae62cc181cc1f73add06cf;hp=606cf4c22b52250bfde03eb61f19520ffd8bb782
Author: Simon Tatham <anakin at pobox.com>
Date:   Wed Jan 2 08:55:03 2019 +0000

    Check for null pointers in dh_cleanup.
    
    If we have to abandon a Diffie-Hellman key exchange part way through
    (e.g. the connection slams shut), and we haven't yet run all the
    stages of the DH algorithm, then some of the mp_ints in the dh_ctx
    will be NULL. So we shouldn't mp_free them without checking first.

 sshdh.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)