simon-git: putty (master): Simon Tatham

[Commits to Tartarus hosted VCS]

TL;DR:
  281d317 Make put_padding() have a consistent argument order.
  ba5e56c Add a missing check of outgoing_data.

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:           2018-06-13 19:48:02

commit 281d317ab9f37210b9340cce6d7725cf7c9acf27
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=281d317ab9f37210b9340cce6d7725cf7c9acf27;hp=93afcf02af7a68d736b487d9665aca741a3d5e0b
Author: Simon Tatham <anakin at pobox.com>
Date:   Wed Jun 13 19:42:19 2018 +0100

    Make put_padding() have a consistent argument order.
    
    Thanks to Alex Landau for pointing out that commit 8b98fea4a
    introduced two uses of it with the arguments one way round and one
    with them the other way round. (Plus a fourth use where it doesn't
    matter, because the padding at the end of the encrypted blob of an
    OpenSSH PEM private key consists of n bytes with value n. :-)
    
    On the basis of majority vote, I've switched the order in the function
    definition to match the two of the three call sites that expressed the
    same opinion, and fixed the third.

 marshal.c | 2 +-
 marshal.h | 6 +++---
 ssh2bpp.c | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

commit ba5e56cd1b448ac7d97e2d8d7cb9eafab66a45b9
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=ba5e56cd1b448ac7d97e2d8d7cb9eafab66a45b9;hp=281d317ab9f37210b9340cce6d7725cf7c9acf27
Author: Simon Tatham <anakin at pobox.com>
Date:   Wed Jun 13 19:44:44 2018 +0100

    Add a missing check of outgoing_data.
    
    When the whole SSH connection is throttled and then unthrottled, we
    need to requeue the callback that transfers data to the Socket from
    the new outgoing_data queue introduced in commit 9e3522a97.
    
    The user-visible effect of this missing call was that outgoing SFTP
    transactions would lock up, because in SFTP mode we enable the
    "simple at putty.projects.tartarus.org" mode and essentially turn off the
    per-channel window management, so throttling of the whole connection
    becomes the main source of back-pressure.

 ssh.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)