security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

gpg: Make --with-subkey-fingerprint the default. 

* g10/gpg.c (oWithoutSubkeyFingerprint): New.
(opts): Add "without-subkey-fingerprint".
(main): Make --with-subkey-fingerprint the default.  Implementation
the without option.
--

Given that the default for the keyid format is none, the subkey
fingerprints are important to do anything with a subkey.  Thus we make
the old option the default and provide a new option to revert it.
This commit is contained in:
Werner Koch 2024-04-16 18:31:29 +02:00
parent 4e32ff209d
commit 2a71c3cf97
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/gpg.texi
View File

@ -2893,12 +2893,15 @@ Same as the command @option{--fingerprint} but changes only the format
of the output and may be used together with another command. of the output and may be used together with another command.
@item --with-subkey-fingerprint @item --with-subkey-fingerprint
@itemx --without-subkey-fingerprint
@opindex with-subkey-fingerprint @opindex with-subkey-fingerprint
@opindex without-subkey-fingerprint
If a fingerprint is printed for the primary key, this option forces If a fingerprint is printed for the primary key, this option forces
printing of the fingerprint for all subkeys. This could also be printing of the fingerprint for all subkeys. This could also be
achieved by using the @option{--with-fingerprint} twice but by using achieved by using the @option{--with-fingerprint} twice but by using
this option along with keyid-format "none" a compact fingerprint is this option along with the default keyid-format "none" a compact
printed. fingerprint is printed. Since version 2.6.0 this option is active by
default; use the ``without'' variant to disable it.
@item --with-v5-fingerprint @item --with-v5-fingerprint
@opindex with-v5-fingerprint @opindex with-v5-fingerprint

6
g10/gpg.c
View File

@ -206,6 +206,7 @@ enum cmd_and_opt_values
oWithV5Fingerprint, oWithV5Fingerprint,
oWithFingerprint, oWithFingerprint,
oWithSubkeyFingerprint, oWithSubkeyFingerprint,
oWithoutSubkeyFingerprint,
oWithICAOSpelling, oWithICAOSpelling,
oWithKeygrip, oWithKeygrip,
oWithKeyScreening, oWithKeyScreening,
@ -824,6 +825,7 @@ static gpgrt_opt_t opts[] = {
ARGPARSE_s_n (oWithFingerprint, "with-fingerprint", "@"), ARGPARSE_s_n (oWithFingerprint, "with-fingerprint", "@"),
ARGPARSE_s_n (oWithSubkeyFingerprint, "with-subkey-fingerprint", "@"), ARGPARSE_s_n (oWithSubkeyFingerprint, "with-subkey-fingerprint", "@"),
ARGPARSE_s_n (oWithSubkeyFingerprint, "with-subkey-fingerprints", "@"), ARGPARSE_s_n (oWithSubkeyFingerprint, "with-subkey-fingerprints", "@"),
ARGPARSE_s_n (oWithoutSubkeyFingerprint, "without-subkey-fingerprint", "@"),
ARGPARSE_s_n (oWithICAOSpelling, "with-icao-spelling", "@"), ARGPARSE_s_n (oWithICAOSpelling, "with-icao-spelling", "@"),
ARGPARSE_s_n (oWithKeygrip, "with-keygrip", "@"), ARGPARSE_s_n (oWithKeygrip, "with-keygrip", "@"),
ARGPARSE_s_n (oWithKeyScreening,"with-key-screening", "@"), ARGPARSE_s_n (oWithKeyScreening,"with-key-screening", "@"),
@ -2503,6 +2505,7 @@ main (int argc, char **argv)
opt.passphrase_repeat = 1; opt.passphrase_repeat = 1;
opt.emit_version = 0; opt.emit_version = 0;
opt.weak_digests = NULL; opt.weak_digests = NULL;
opt.with_subkey_fingerprint = 1;
opt.compliance = CO_GNUPG; opt.compliance = CO_GNUPG;
/* Check special options given on the command line. */ /* Check special options given on the command line. */
@ -2909,6 +2912,9 @@ main (int argc, char **argv)
case oWithSubkeyFingerprint: case oWithSubkeyFingerprint:
opt.with_subkey_fingerprint = 1; opt.with_subkey_fingerprint = 1;
break; break;
case oWithoutSubkeyFingerprint:
opt.with_subkey_fingerprint = 0;
break;
case oWithICAOSpelling: case oWithICAOSpelling:
opt.with_icao_spelling = 1; opt.with_icao_spelling = 1;
break; break;