From: jacob Date: Tue, 2 Sep 2003 19:00:17 +0000 (+0000) Subject: When loading SSH-2 key, ignore passphrase argument if key is unencrypted. X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/commitdiff_plain/39ace9b0c689d2aba7872eeb25c40c7327c0b935?ds=inline When loading SSH-2 key, ignore passphrase argument if key is unencrypted. This should get rid of a problem that three or four people reported where PuTTY intermittently reports "Unable to load private key" (MAC failed). (ssh.c:do_ssh2_authconn() should also initialise its passphrase so it's not passing garbage passphrases around, of course, but I haven't yet worked out where the best place in the auth loop to do that would be.) git-svn-id: svn://svn.tartarus.org/sgt/putty@3439 cda61777-01e9-0310-a592-d414129be87e --- diff --git a/sshpubk.c b/sshpubk.c index 1659acec..3975e0fe 100644 --- a/sshpubk.c +++ b/sshpubk.c @@ -784,7 +784,7 @@ struct ssh2_userkey *ssh2_load_userkey(const Filename *filename, SHA_Init(&s); SHA_Bytes(&s, header, sizeof(header)-1); - if (passphrase) + if (cipher && passphrase) SHA_Bytes(&s, passphrase, passlen); SHA_Final(&s, mackey);