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

The comment that Private-Hash: was not allowed in DSS PuTTY-User-Key-File-1

Browse Source 
keys was apparently incorrect; prior to r1413, it was both allowed, and
generated for passphraseless keys. Remove it and associated validation so that
people are able to load such keys into PuTTYgen to upgrade them, as suggested.

[originally from svn r5403]
[r1413 == 6608016fc28d97e9fd5f53cfc671f9e7ccafd8ce]
This commit is contained in:
Jacob Nevins 2005-02-26 15:50:29 +00:00
parent ce802e55dd
commit d88995b856
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sshpubk.c
View File

@ -461,10 +461,9 @@ int saversakey(const Filename *filename, struct RSAKey *key, char *passphrase)
* with "PuTTY-User-Key-File-1" (version number differs). In this * with "PuTTY-User-Key-File-1" (version number differs). In this
* format the Private-MAC: field only covers the private-plaintext * format the Private-MAC: field only covers the private-plaintext
* field and nothing else (and without the 4-byte string length on * field and nothing else (and without the 4-byte string length on
* the front too). Moreover, for RSA keys the Private-MAC: field * the front too). Moreover, the Private-MAC: field can be replaced
* can be replaced with a Private-Hash: field which is a plain * with a Private-Hash: field which is a plain SHA-1 hash instead of
* SHA-1 hash instead of an HMAC. This is not allowable in DSA * an HMAC (this was generated for unencrypted keys).
* keys. (Yes, the old format was a mess. Guess why it changed :-)
*/ */
static int read_header(FILE * fp, char *header) static int read_header(FILE * fp, char *header)
@ -723,8 +722,7 @@ struct ssh2_userkey *ssh2_load_userkey(const Filename *filename,
if ((mac = read_body(fp)) == NULL) if ((mac = read_body(fp)) == NULL)
goto error; goto error;
is_mac = 1; is_mac = 1;
} else if (0 == strcmp(header, "Private-Hash") && } else if (0 == strcmp(header, "Private-Hash") && old_fmt) {
alg == &ssh_rsa && old_fmt) {
if ((mac = read_body(fp)) == NULL) if ((mac = read_body(fp)) == NULL)
goto error; goto error;
is_mac = 0; is_mac = 0;