simon-git: putty (master): Simon Tatham

[Commits to Tartarus hosted VCS]

TL;DR:
  eaac876 Support aes256-ctr encryption when imported OpenSSH keys.
  044a930 Use aes256-ctr when exporting new-style OpenSSH keys.

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-04-11 22:43:22

commit eaac8768e4a27302a3ed24e37c460fb69cbe5b4b
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=eaac8768e4a27302a3ed24e37c460fb69cbe5b4b;hp=f41d3650292ee4d521b8588daa202bdfcee5cc6c
Author: Tim Kosse <tim.kosse at filezilla-project.org>
Date:   Mon Apr 9 09:28:43 2018 +0200

    Support aes256-ctr encryption when imported OpenSSH keys.
    
    OpenSSH 7.6 switched from aes256-cbc to aes256-ctr for encrypting
    new-style private keys.

 import.c | 16 +++++++++++++---
 ssh.h    |  1 +
 sshaes.c |  2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)

commit 044a9304e3215c1933f6afde35aab594d8631639
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=044a9304e3215c1933f6afde35aab594d8631639;hp=eaac8768e4a27302a3ed24e37c460fb69cbe5b4b
Author: Tim Kosse <tim.kosse at filezilla-project.org>
Date:   Mon Apr 9 09:38:52 2018 +0200

    Use aes256-ctr when exporting new-style OpenSSH keys.
    
    This mimics behavior of OpenSSH 7.6 or later.

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