nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-02 03:52:49 -05:00
Code Issues Projects Releases Wiki Activity

Added a command-line key generation tool. Currently builds and runs

Browse Source 
on Linux, but the (very few) platform-specific bits are already
abstracted out of the main code, so it should port to other
platforms with a minimum of fuss.

[originally from svn r3762]
This commit is contained in:
Simon Tatham
2004-01-22 19:15:32 +00:00
parent 7b140b2fe7
commit 2d1287b9ca
10 changed files with 1040 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
sshpubk.c
View File

@ -186,6 +186,7 @@ int loadrsakey(const Filename *filename, struct RSAKey *key, char *passphrase,
* This routine will take care of calling fclose() for us.
*/
ret = loadrsakey_main(fp, key, FALSE, NULL, passphrase, &error);
fp = NULL;
goto end;
}
@ -195,7 +196,8 @@ int loadrsakey(const Filename *filename, struct RSAKey *key, char *passphrase,
error = "not an SSH-1 RSA file";
end:
fclose(fp);
if (fp)
fclose(fp);
if ((ret != 1) && errorstr)
*errorstr = error;
return ret;
@ -264,6 +266,7 @@ int rsakey_pubblob(const Filename *filename, void **blob, int *bloblen,
*blob = rsa_public_blob(&key, bloblen);
freersakey(&key);
ret = 1;
fp = NULL;
}
} else {
error = "not an SSH-1 RSA file";
@ -612,6 +615,16 @@ struct ssh2_userkey ssh2_wrong_passphrase = {
NULL, NULL, NULL
};
const struct ssh_signkey *find_pubkey_alg(const char *name)
{
if (!strcmp(name, "ssh-rsa"))
return &ssh_rsa;
else if (!strcmp(name, "ssh-dss"))
return &ssh_dss;
else
return NULL;
}
struct ssh2_userkey *ssh2_load_userkey(const Filename *filename,
char *passphrase, const char **errorstr)
{
@ -653,11 +666,8 @@ struct ssh2_userkey *ssh2_load_userkey(const Filename *filename,
if ((b = read_body(fp)) == NULL)
goto error;
/* Select key algorithm structure. */
if (!strcmp(b, "ssh-rsa"))
alg = &ssh_rsa;
else if (!strcmp(b, "ssh-dss"))
alg = &ssh_dss;
else {
alg = find_pubkey_alg(b);
if (!alg) {
sfree(b);
goto error;
}
@ -897,11 +907,8 @@ char *ssh2_userkey_loadpub(const Filename *filename, char **algorithm,
if ((b = read_body(fp)) == NULL)
goto error;
/* Select key algorithm structure. Currently only ssh-rsa. */
if (!strcmp(b, "ssh-rsa"))
alg = &ssh_rsa;
else if (!strcmp(b, "ssh-dss"))
alg = &ssh_dss;
else {
alg = find_pubkey_alg(b);
if (!alg) {
sfree(b);
goto error;
}