diff options
| author | Werner Koch <[email protected]> | 2016-06-06 14:00:50 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-06-06 14:03:22 +0000 |
| commit | b047388d57443f584f1c1d6333aac5218b685042 (patch) | |
| tree | bf2248ac8941150098e9b1b3bf5a78f636842be3 /g10/main.h | |
| parent | indent: Wrap strings in debug messages. (diff) | |
| download | gnupg-b047388d57443f584f1c1d6333aac5218b685042.tar.gz gnupg-b047388d57443f584f1c1d6333aac5218b685042.zip | |
gpg: Implement --keyid-format=none.
* g10/gpg.c (main): Add option "none" to --keyid-format.
* g10/options.h (KF_NONE): New.
* g10/keyid.c (format_keyid): Implement that.
(keystr): Use format "long" is KF_NONE is in use.
(keystr_with_sub): Ditto.
* g10/keylist.c (list_keyblock_print): Adjust indentaion for KF_NONE.
Factor some code out to ...
(print_key_line): new.
(print_fingerprint): Add mode 20.
* g10/mainproc.c (list_node): Use print_key_line. Replace MAINKEY by
flags.primary in the PK. Fix putting a " revoked..." string into the
colons format.
* g10/pkclist.c (do_edit_ownertrust): Use print_key_line. This
slightly changes the putput format.
* g10/revoke.c (gen_standard_revoke): Use print_key_line. This may
also put "expires: " into the output.
--
Due to user experience problems with the keyid and we better allow to
show the fingerprint instead. Note that we do not support v3 keys
anymore and thus there is no technical need for a user to know the
keyid.
GnuPG-bug-id: 2379
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/main.h')
| -rw-r--r-- | g10/main.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/g10/main.h b/g10/main.h index 46b4ead9d..bda0bc188 100644 --- a/g10/main.h +++ b/g10/main.h @@ -426,6 +426,7 @@ char *format_seckey_info (PKT_public_key *pk); void print_seckey_info (PKT_public_key *pk); void print_pubkey_info (estream_t fp, PKT_public_key *pk); void print_card_key_info (estream_t fp, KBNODE keyblock); +void print_key_line (estream_t fp, PKT_public_key *pk, int secret); /*-- verify.c --*/ void print_file_status( int status, const char *name, int what ); |