nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-09 09:27:59 +00:00
Code Issues Projects Releases Wiki Activity

Random Unix puttygen improvements highlighted by a post to comp.security.ssh:

Browse Source 
- fix diagnostic if keyfile and '-t' both specified
 - add diagnostic for generating a key but discarding the private part
 - document '-q' option

[originally from svn r6750]
This commit is contained in:
Jacob Nevins 2006-07-07 14:18:47 +00:00
parent f8f21619c2
commit 588e4168c8
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmdgen.c
View File

@ -128,7 +128,7 @@ void usage(int standalone)
{
fprintf(stderr,
"Usage: puttygen ( keyfile | -t type [ -b bits ] )\n"
" [ -C comment ] [ -P ]\n"
" [ -C comment ] [ -P ] [ -q ]\n"
" [ -o output-keyfile ] [ -O type | -l | -L"
" | -p ]\n");
if (standalone)
@ -149,6 +149,7 @@ void help(void)
" -b specify number of bits when generating key\n"
" -C change or specify key comment\n"
" -P change key passphrase\n"
" -q quiet: do not display progress bar\n"
" -O specify output type:\n"
" private output PuTTY private key format\n"
" private-openssh export OpenSSH private key\n"
@ -339,7 +340,7 @@ int main(int argc, char **argv)
else {
errs = TRUE;
fprintf(stderr,
"puttygen: no such option `--%s'\n", opt);
"puttygen: no such option `-%s'\n", opt);
}
}
p = NULL;
@ -490,11 +491,21 @@ int main(int argc, char **argv)
* Bomb out if we've been asked to both load and generate a
* key.
*/
if (keytype != NOKEYGEN && intype) {
if (keytype != NOKEYGEN && infile) {
fprintf(stderr, "puttygen: cannot both load and generate a key\n");
return 1;
}
/*
* We must save the private part when generating a new key.
*/
if (keytype != NOKEYGEN &&
(outtype != PRIVATE && outtype != OPENSSH && outtype != SSHCOM)) {
fprintf(stderr, "puttygen: this would generate a new key but "
"discard the private part\n");
return 1;
}
/*
* Analyse the type of the input file, in case this affects our
* course of action.

14
doc/man-pg.but
View File

@ -10,8 +10,8 @@
\c puttygen ( keyfile | -t keytype [ -b bits ] )
\e bbbbbbbb iiiiiii bb iiiiiii bb iiii
\c [ -C new-comment ] [ -P ]
\e bb iiiiiiiiiii bb
\c [ -C new-comment ] [ -P ] [ -q ]
\e bb iiiiiiiiiii bb bb
\c [ -O output-type | -l | -L | -p ]
\e bb iiiiiiiiiii bb bb bb
\c [ -o output-file ]
@ -56,6 +56,10 @@ generate SSH-1 keys).
\dd Specify the size of the key to generate, in bits. Default is 1024.
\dt \cw{\-q}
\dd Suppress the progress display when generating a new key.
In the second phase, \c{puttygen} optionally alters properties of
the key it has loaded or generated. The options to control this are:
@ -145,10 +149,14 @@ fingerprint. Otherwise, the \c{\-o} option is required.
The following options do not run PuTTYgen as normal, but print
informational messages and then quit:
\dt \cw{\-\-help}
\dt \cw{\-h}, \cw{\-\-help}
\dd Display a message summarizing the available options.
\dt \cw{\-V}, \cw{\-\-version}
\dd Display the version of PuTTYgen.
\dt \cw{\-\-pgpfp}
\dd Display the fingerprints of the PuTTY PGP Master Keys, to aid