simon-git: putty (master): Simon Tatham

[Commits to Tartarus CVS repository.]

TL;DR:
  78b8bde Fix enum-conflation in cmdgen.c.
  79bbf37 Separate key-type enum values for old and new OpenSSH keys.
  67202f7 Completely separate old and new OpenSSH key handling code.
  7cfa9f4 Write an exporter for the new OpenSSH 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-28 20:08:44

commit 78b8bde7aff42a958f48d541ffcecf06bbde3eb1
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=78b8bde7aff42a958f48d541ffcecf06bbde3eb1;hp=38d1db194ddd2b7499b2fcb5bc76f69aef8d9da9
Author: Simon Tatham <anakin at pobox.com>
Date:   Tue Apr 28 19:46:08 2015 +0100

    Fix enum-conflation in cmdgen.c.
    
    I'd somehow managed to declare an enum in cmdgen.c with key types
    OPENSSH and SSHCOM, and use it interchangeably with the one in ssh.h
    with SSH_KEYTYPE_OPENSSH and SSH_KEYTYPE_SSHCOM.
    
    It so happened that the relevant two enum values matched up! So this
    hasn't caused a bug yet, but it's an accident waiting to happen. Fix
    it before it does.

 cmdgen.c |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

commit 79bbf37c9eaa8b33ddfbce1fa93580b62ba412cf
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=79bbf37c9eaa8b33ddfbce1fa93580b62ba412cf;hp=78b8bde7aff42a958f48d541ffcecf06bbde3eb1
Author: Simon Tatham <anakin at pobox.com>
Date:   Tue Apr 28 19:46:58 2015 +0100

    Separate key-type enum values for old and new OpenSSH keys.
    
    It's all very well for these two different formats to share a type
    code as long as we're only loading them and not saving, but as soon as
    we need to save one or the other, we'll need different type codes
    after all.
    
    This commit introduces the openssh_new_write() function, but for the
    moment, it always returns failure.

 cmdgen.c          |   48 +++++++++++++++++++++++++++++++++++-------------
 import.c          |   35 ++++++++++++++++++++++++++---------
 ssh.h             |    4 +++-
 sshpubk.c         |    8 ++++++--
 windows/winpgen.c |   33 +++++++++++++++++++++++----------
 5 files changed, 93 insertions(+), 35 deletions(-)

commit 67202f798a9895ad773d1114b337e512c58afc7e
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=67202f798a9895ad773d1114b337e512c58afc7e;hp=79bbf37c9eaa8b33ddfbce1fa93580b62ba412cf
Author: Simon Tatham <anakin at pobox.com>
Date:   Tue Apr 28 19:49:55 2015 +0100

    Completely separate old and new OpenSSH key handling code.
    
    I thought it would be a good idea to share the loading code on the
    basis that the outer header line + base64 format isn't too different,
    but in fact I ended up faffing endlessly with mode bits and unions and
    constantly re-testing in every subfunction which kind of key it was,
    so that small saving wasn't worth it.

 import.c | 1522 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 806 insertions(+), 716 deletions(-)

commit 7cfa9f46270c4fa4e2b05b7a90ebd6a89d0ba460
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=7cfa9f46270c4fa4e2b05b7a90ebd6a89d0ba460;hp=67202f798a9895ad773d1114b337e512c58afc7e
Author: Simon Tatham <anakin at pobox.com>
Date:   Tue Apr 28 19:51:52 2015 +0100

    Write an exporter for the new OpenSSH format.
    
    This was a lot less work than the importer, partly because the bcrypt
    primitive is already working now, and mostly because we don't have to
    handle the possible cross product of ciphers and kdfs in full and
    completely hypothetical generality - we can emit a fixed choice of
    either nothing or our chosen pair.

 import.c |  169 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 167 insertions(+), 2 deletions(-)