simon-git: putty (master): Simon Tatham

[Commits to Tartarus CVS repository.]

TL;DR:
  90af5be Sort out the mess with OpenSSH key file formats.
  cc42050 Clear an extra low bit in EdDSA exponent calculation.

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-05-10 14:07:23

commit 90af5bed04f8e4dcf7e42c464b1be6cc7056f768
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=90af5bed04f8e4dcf7e42c464b1be6cc7056f768;hp=76a4b576e58fa3b245b02f9fbb052e4651acbfa9
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun May 10 07:42:48 2015 +0100

    Sort out the mess with OpenSSH key file formats.
    
    When I implemented reading and writing of the new format a couple of
    weeks ago, I kept them strictly separate in the UI, so you have to ask
    for the format you want when exporting. But in fact this is silly,
    because not every key type can be saved in both formats, and OpenSSH
    itself has the policy of using the old format for key types it can
    handle, unless specifically asked to use the new one.
    
    So I've now arranged that the key file format enum has three values
    for OpenSSH: PEM, NEW and AUTO. Files being loaded are identified as
    either PEM or NEW, which describe the two physical file formats. But
    exporting UIs present either AUTO or NEW, where AUTO is the virtual
    format meaning 'save in the old format if possible, otherwise the new
    one'.

 cmdgen.c          |   29 +++++++++++++++--------------
 import.c          |   28 ++++++++++++++++++++++++++--
 ssh.h             |   28 ++++++++++++++++++++++++++++
 sshpubk.c         |    7 +++++++
 windows/winpgen.c |   22 +++++++++++-----------
 5 files changed, 87 insertions(+), 27 deletions(-)

commit cc420507a98ed6aad8ef9260cfa70f32a45849b7
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=cc420507a98ed6aad8ef9260cfa70f32a45849b7;hp=90af5bed04f8e4dcf7e42c464b1be6cc7056f768
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun May 10 14:04:16 2015 +0100

    Clear an extra low bit in EdDSA exponent calculation.
    
    The source paper, and OpenSSH, agree that the lowest bit index used
    from the hash of the private key is bit 3, i.e. bits 0,1,2 at the
    bottom are all zero. We were only clearing bits 0 and 1, which would
    have worked for about half of keys. I must have got lucky during
    testing!

 sshecc.c |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)