simon-svn: putty: simon

[Commits to Tartarus CVS repository.]

SVN root:       svn://svn.tartarus.org/sgt
Changes by:     simon
Revision:       9643
Date:           2012-08-30 19:44:34 +0100 (Thu, 30 Aug 2012)

Log message (10 lines):
In openssh_read(), we shouldn't ever return SSH2_WRONG_PASSPHRASE for
an unencrypted key. (The other import function, sshcom_read(), already
got this right.) Thanks to David Wedderwille for the report.

This is more than just an error-reporting mistake; it actually causes
Windows PuTTYgen to tight-loop on attempting to load a corrupt OpenSSH
key, because the 'wrong passphrase' return value causes the caller to
loop round and try again, but of course it knows the key is
unencrypted so it doesn't prompt for a different passphrase and just
tries again with no change...

Modified files:
U   putty/import.c

Links:
http://svn.tartarus.org/sgt/?rev=9643&view=rev
http://svn.tartarus.org/sgt/putty/import.c?rev=9643&r1=9642&r2=9643