nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-17 19:18:06 -05:00
Code Issues Projects Releases Wiki Activity

When loading SSH-2 key, ignore passphrase argument if key is unencrypted.

Browse Source 
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.)

[originally from svn r3439]
This commit is contained in:
Jacob Nevins 2003-09-02 19:00:17 +00:00
parent f6835045f8
commit 15ac9c09eb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sshpubk.c
View File

@ -784,7 +784,7 @@ struct ssh2_userkey *ssh2_load_userkey(const Filename *filename,
SHA_Init(&s); SHA_Init(&s);
SHA_Bytes(&s, header, sizeof(header)-1); SHA_Bytes(&s, header, sizeof(header)-1);
if (passphrase) if (cipher && passphrase)
SHA_Bytes(&s, passphrase, passlen); SHA_Bytes(&s, passphrase, passlen);
SHA_Final(&s, mackey); SHA_Final(&s, mackey);