diff options
| author | David Shaw <[email protected]> | 2004-03-03 05:47:51 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-03-03 05:47:51 +0000 |
| commit | 2d7fe1d3a1eaaf77957a6726280136a6dd02691b (patch) | |
| tree | 73be1a1760719399e4766a94a01c4dc05b47fe0d /g10/options.h | |
| parent | * packet.h, free-packet.c (free_encrypted, free_plaintext), parse-packet.c (diff) | |
| download | gnupg-2d7fe1d3a1eaaf77957a6726280136a6dd02691b.tar.gz gnupg-2d7fe1d3a1eaaf77957a6726280136a6dd02691b.zip | |
* options.h, g10.c (main): Add a more flexible --keyid-format option to
replace the list-option (and eventually verify-option) show-long-keyids.
The format can be short, long, 0xshort, and 0xlong.
* keydb.h, keyid.c (keystr, keystrlen): New functions to generate a
printable keyid.
* keyedit.c (print_and_check_one_sig, show_key_with_all_names), keylist.c
(list_keyblock_print): Use new keystr() function here to print keyids.
Diffstat (limited to '')
| -rw-r--r-- | g10/options.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/g10/options.h b/g10/options.h index ef7a4b36f..9aabc23ce 100644 --- a/g10/options.h +++ b/g10/options.h @@ -107,6 +107,10 @@ struct { CO_GNUPG=0, CO_RFC2440, CO_RFC1991, CO_PGP2, CO_PGP6, CO_PGP7, CO_PGP8 } compliance; + enum + { + KF_SHORT, KF_LONG, KF_0xSHORT, KF_0xLONG + } keyid_format; int pgp2_workarounds; int shm_coprocess; const char *set_filename; @@ -248,11 +252,10 @@ struct #define LIST_SHOW_NOTATIONS (1<<2) #define LIST_SHOW_KEYSERVER_URLS (1<<3) #define LIST_SHOW_VALIDITY (1<<4) -#define LIST_SHOW_LONG_KEYIDS (1<<5) -#define LIST_SHOW_UNUSABLE_UIDS (1<<6) -#define LIST_SHOW_UNUSABLE_SUBKEYS (1<<7) -#define LIST_SHOW_KEYRING (1<<8) -#define LIST_SHOW_SIG_EXPIRE (1<<9) +#define LIST_SHOW_UNUSABLE_UIDS (1<<5) +#define LIST_SHOW_UNUSABLE_SUBKEYS (1<<6) +#define LIST_SHOW_KEYRING (1<<7) +#define LIST_SHOW_SIG_EXPIRE (1<<8) #define VERIFY_SHOW_PHOTOS (1<<0) #define VERIFY_SHOW_POLICY_URLS (1<<1) |