diff options
| author | David Shaw <[email protected]> | 2003-05-31 23:23:19 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-05-31 23:23:19 +0000 |
| commit | b17358948de8a71e94f59390e128665e7466bb8c (patch) | |
| tree | e3cde5cef2119ae2e05ca0e476a1f6d6e97679c5 /g10/main.h | |
| parent | * main.h, misc.c (parse_options): New general option line parser. Fix the (diff) | |
| download | gnupg-b17358948de8a71e94f59390e128665e7466bb8c.tar.gz gnupg-b17358948de8a71e94f59390e128665e7466bb8c.zip | |
* mainproc.c (check_sig_and_print), main.h, keylist.c (show_policy,
show_notation): Collapse the old print_notation_data into show_policy()
and show_notation() so there is only one function to print notations and
policy URLs.
* options.h, main.h, g10.c (main), keyedit.c (print_and_check_one_sig),
keylist.c (list_one, list_keyblock_print), pkclist.c (do_edit_ownertrust),
sign.c (mk_notation_and_policy): New "list-options" and "verify-options"
commands. These replace the existing --show-photos/--no-show-photos,
--show-notation/--no-show-notation,
--show-policy-url/--no-show-policy-url, and --show-keyring options. The
new method is more flexible since a user can specify (for example) showing
photos during sig verification, but not in key listings. The old options
are emulated.
Diffstat (limited to 'g10/main.h')
| -rw-r--r-- | g10/main.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/g10/main.h b/g10/main.h index e27f78dc4..bb1ac8d6f 100644 --- a/g10/main.h +++ b/g10/main.h @@ -213,13 +213,18 @@ struct revocation_reason_info * void release_revocation_reason_info( struct revocation_reason_info *reason ); /*-- keylist.c --*/ +#define LIST_SHOW_PHOTOS 1 +#define LIST_SHOW_POLICY 2 +#define LIST_SHOW_NOTATION 4 +#define LIST_SHOW_KEYRING 8 + void public_key_list( STRLIST list ); void secret_key_list( STRLIST list ); void reorder_keyblock (KBNODE keyblock); void list_keyblock( KBNODE keyblock, int secret, int fpr, void *opaque ); void print_fingerprint (PKT_public_key *pk, PKT_secret_key *sk, int mode); -void show_policy_url(PKT_signature *sig,int indent); -void show_notation(PKT_signature *sig,int indent); +void show_policy_url(PKT_signature *sig,int indent,int mode); +void show_notation(PKT_signature *sig,int indent,int mode); void dump_attribs(const PKT_user_id *uid, PKT_public_key *pk,PKT_secret_key *sk); void set_attrib_fd(int fd); @@ -227,6 +232,10 @@ void print_seckey_info (PKT_secret_key *sk); void print_pubkey_info (PKT_public_key *pk); /*-- verify.c --*/ +#define VERIFY_SHOW_PHOTOS 1 +#define VERIFY_SHOW_POLICY 2 +#define VERIFY_SHOW_NOTATION 4 + void print_file_status( int status, const char *name, int what ); int verify_signatures( int nfiles, char **files ); int verify_files( int nfiles, char **files ); |