diff options
| author | Werner Koch <[email protected]> | 2015-10-08 12:55:07 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-10-08 12:55:07 +0000 |
| commit | b6d621583fc9cbda6f9376a24f2f4cf11499a4fd (patch) | |
| tree | 0835834b3544ef61043a8bef7b7f9888066461d0 /g10/main.h | |
| parent | gpg: Remove unfinished experimental code to export as S-expressions. (diff) | |
| download | gnupg-b6d621583fc9cbda6f9376a24f2f4cf11499a4fd.tar.gz gnupg-b6d621583fc9cbda6f9376a24f2f4cf11499a4fd.zip | |
gpg: Pass CTRL parameter to all key listing functions.
* g10/keylist.c (public_key_list): Add arg CTRL.
(secret_key_list): Ditto.
(list_all, list_one): Ditto.
(locate_one): Ditto.
(list_keyblock_pka): Ditto.
(list_keyblock): Ditto.
(list_keyblock_direct): Ditto.
* g10/keygen.c (proc_parameter_file): Add arg CTRL.
(read_parameter_file): Ditto.
(quick_generate_keypair): Ditto.
(do_generate_keypair): Ditto.
(generate_keypair): Pass arg CTRL.
* g10/gpg.c (main): Pass arg CTRL to quick_generate_keypair.
--
This will help use to implement the --server mode.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/main.h')
| -rw-r--r-- | g10/main.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/g10/main.h b/g10/main.h index 42d5ce179..0bace6162 100644 --- a/g10/main.h +++ b/g10/main.h @@ -256,7 +256,7 @@ void show_basic_key_info (KBNODE keyblock); u32 parse_expire_string(const char *string); u32 ask_expire_interval(int object,const char *def_expire); u32 ask_expiredate(void); -void quick_generate_keypair (const char *uid); +void quick_generate_keypair (ctrl_t ctrl, const char *uid); void generate_keypair (ctrl_t ctrl, int full, const char *fname, const char *card_serialno, int card_backup_key); int keygen_set_std_prefs (const char *string,int personal); @@ -347,8 +347,8 @@ void public_key_list (ctrl_t ctrl, strlist_t list, int locate_mode ); void secret_key_list (ctrl_t ctrl, strlist_t list ); void print_subpackets_colon(PKT_signature *sig); void reorder_keyblock (KBNODE keyblock); -void list_keyblock_direct (kbnode_t keyblock, int secret, int has_secret, - int fpr); +void list_keyblock_direct (ctrl_t ctrl, kbnode_t keyblock, int secret, + int has_secret, int fpr); void print_fingerprint (estream_t fp, PKT_public_key *pk, int mode); void print_revokers (estream_t fp, PKT_public_key *pk); void show_policy_url(PKT_signature *sig,int indent,int mode); |