security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

Fixed bug#1044. Use of --fingerprint with --with-fingerprint.

Browse Source
This commit is contained in:
Werner Koch 2009-05-20 10:23:33 +00:00
parent 556d4ed983
commit 41ee7a14cf
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
g10/ChangeLog
View File

@ -1,5 +1,8 @@
2009-05-20 Werner Koch <wk@g10code.com> 2009-05-20 Werner Koch <wk@g10code.com>
* gpg.c (main): Fix --fingerprint/--with-fingerprint command
detection. Fixes bug#1044.
* keygen.c (ask_keysize): Allow selection of DSA key size even * keygen.c (ask_keysize): Allow selection of DSA key size even
without --enable-dsa2. without --enable-dsa2.
(gen_dsa): Remove size check. (gen_dsa): Remove size check.

20
g10/gpg.c
View File

@ -1892,7 +1892,7 @@ main (int argc, char **argv)
int eyes_only=0; int eyes_only=0;
int multifile=0; int multifile=0;
int pwfd = -1; int pwfd = -1;
int with_fpr = 0; /* make an option out of --fingerprint */ int fpr_maybe_cmd = 0; /* --fingerprint maybe a command. */
int any_explicit_recipient = 0; int any_explicit_recipient = 0;
int require_secmem=0,got_secmem=0; int require_secmem=0,got_secmem=0;
@ -2241,8 +2241,13 @@ main (int argc, char **argv)
case oWithFingerprint: case oWithFingerprint:
opt.with_fingerprint = 1; opt.with_fingerprint = 1;
with_fpr=1; /*fall thru*/ opt.fingerprint++;
case oFingerprint: opt.fingerprint++; break; break;
case oFingerprint:
opt.fingerprint++;
fpr_maybe_cmd = 1;
break;
case oSecretKeyring: case oSecretKeyring:
append_to_strlist( &sec_nrings, pargs.r.ret_str); append_to_strlist( &sec_nrings, pargs.r.ret_str);
break; break;
@ -3299,9 +3304,12 @@ main (int argc, char **argv)
xfree(p); xfree(p);
} }
if( !cmd && opt.fingerprint && !with_fpr ) { /* If there is no command but the --fingerprint is given, default
set_cmd( &cmd, aListKeys); to the --list-keys command. */
} if (!cmd && fpr_maybe_cmd)
{
set_cmd (&cmd, aListKeys);
}
if( opt.verbose > 1 ) if( opt.verbose > 1 )