simon-git: putty (master): Simon Tatham

[Commits to Tartarus CVS repository.]

TL;DR:
  d637528 Implementation of OpenSSH's bcrypt.
  2968563 Provide a script to regenerate the Blowfish init tables.
  1e453d1 Some miscellaneous marshalling helpers.
  38d1db1 Teach PuTTYgen to import from OpenSSH's new key format.

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-04-27 20:57:25

commit d6375281810357b262065549592e171c01ee7c1e
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=d6375281810357b262065549592e171c01ee7c1e;hp=a8658edb17a462da32499752810bd6c989159500
Author: Simon Tatham <anakin at pobox.com>
Date:   Mon Apr 27 20:48:29 2015 +0100

    Implementation of OpenSSH's bcrypt.
    
    This isn't the same as the standard bcrypt; it's OpenSSH's
    modification that they use for their new-style key format.
    
    In order to implement this, I've broken up blowfish_setkey() into two
    subfunctions, and provided one of them with an extra optional salt
    parameter, which is NULL in ordinary Blowfish but used by bcrypt.
    Also, I've exposed some of sshblowf.c's internal machinery for the new
    sshbcrypt.c to use.

 ssh.h       |    4 ++
 sshbcrypt.c |  124 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 sshblowf.c  |   85 ++++++++++++++++++++++++++++++++--------
 sshblowf.h  |   15 ++++++++
 4 files changed, 213 insertions(+), 15 deletions(-)

commit 2968563180ae5013976123d8c5106a6c394b96a6
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=2968563180ae5013976123d8c5106a6c394b96a6;hp=d6375281810357b262065549592e171c01ee7c1e
Author: Simon Tatham <anakin at pobox.com>
Date:   Mon Apr 27 20:48:29 2015 +0100

    Provide a script to regenerate the Blowfish init tables.
    
    Since I've recently published a program that can easily generate the
    required digits of pi, and since I was messing around in sshblowf.c
    already, it seemed like a good idea to provide a derivation of all
    that hex data.

 sshblowf.c |   21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

commit 1e453d1f972821021749258fb2b393813fb4e940
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=1e453d1f972821021749258fb2b393813fb4e940;hp=2968563180ae5013976123d8c5106a6c394b96a6
Author: Simon Tatham <anakin at pobox.com>
Date:   Mon Apr 27 20:48:29 2015 +0100

    Some miscellaneous marshalling helpers.
    
    I'm about to use these in a new piece of code, but they may come in
    helpful elsewhere as well. match_ssh_id in particular wraps an idiom
    that's quite common in the rest of the codebase.

 misc.c |   34 ++++++++++++++++++++++++++++++++++
 misc.h |   17 +++++++++++++++++
 2 files changed, 51 insertions(+)

commit 38d1db194ddd2b7499b2fcb5bc76f69aef8d9da9
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=38d1db194ddd2b7499b2fcb5bc76f69aef8d9da9;hp=1e453d1f972821021749258fb2b393813fb4e940
Author: Simon Tatham <anakin at pobox.com>
Date:   Mon Apr 27 20:48:29 2015 +0100

    Teach PuTTYgen to import from OpenSSH's new key format.
    
    This is import only, for the moment: I haven't written an exporter
    yet. Also, we currently don't support the format's full generality - a
    new-style OpenSSH key file can contain multiple keys, but this code
    currently only handles files with one key in them. That should be easy
    to change, though, given only a little UI.

 Recipe   |    8 +-
 import.c |  988 ++++++++++++++++++++++++++++++++++++++++++++------------------
 2 files changed, 710 insertions(+), 286 deletions(-)