security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

gpg: Pass CTRL parameter to all key listing functions.

Browse source 
* 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 <wk@gnupg.org>
This commit is contained in:
Werner Koch 2015-10-08 14:55:07 +02:00
parent a400958323
commit b6d621583f
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
4 changed files with 39 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

26
g10/keygen.c
View file

@ -135,7 +135,7 @@ static byte zip_prefs[MAX_PREFS];
static int nzip_prefs;
static int mdc_available,ks_modify;
static void do_generate_keypair( struct para_data_s *para,
static void do_generate_keypair (ctrl_t ctrl, struct para_data_s *para,
struct output_control_s *outctrl, int card );
static int write_keyblock (iobuf_t out, kbnode_t node);
static gpg_error_t gen_card_key (int algo, int keyno, int is_primary,
@ -3036,7 +3036,7 @@ get_parameter_revkey( struct para_data_s *para, enum para_name key )
}
static int
proc_parameter_file( struct para_data_s *para, const char *fname,
proc_parameter_file (ctrl_t ctrl, struct para_data_s *para, const char *fname,
struct output_control_s *outctrl, int card )
{
struct para_data_s *r;
@ -3222,7 +3222,7 @@ proc_parameter_file( struct para_data_s *para, const char *fname,
append_to_parameter (para, r);
}
do_generate_keypair( para, outctrl, card );
do_generate_keypair (ctrl, para, outctrl, card );
return 0;
}
@ -3233,7 +3233,7 @@ proc_parameter_file( struct para_data_s *para, const char *fname,
* Note, that string parameters are expected to be in UTF-8
*/
static void
read_parameter_file( const char *fname )
read_parameter_file (ctrl_t ctrl, const char *fname )
{
static struct { const char *name;
enum para_name key;
@ -3328,7 +3328,7 @@ read_parameter_file( const char *fname )
outctrl.keygen_flags |= KEYGEN_FLAG_TRANSIENT_KEY;
else if( !ascii_strcasecmp( keyword, "%commit" ) ) {
outctrl.lnr = lnr;
if (proc_parameter_file( para, fname, &outctrl, 0 ))
if (proc_parameter_file (ctrl, para, fname, &outctrl, 0 ))
print_status_key_not_created
(get_parameter_value (para, pHANDLE));
release_parameter_list( para );
@ -3384,7 +3384,7 @@ read_parameter_file( const char *fname )
if( keywords[i].key == pKEYTYPE && para ) {
outctrl.lnr = lnr;
if (proc_parameter_file( para, fname, &outctrl, 0 ))
if (proc_parameter_file (ctrl, para, fname, &outctrl, 0 ))
print_status_key_not_created
(get_parameter_value (para, pHANDLE));
release_parameter_list( para );
@ -3414,7 +3414,7 @@ read_parameter_file( const char *fname )
}
else if( para ) {
outctrl.lnr = lnr;
if (proc_parameter_file( para, fname, &outctrl, 0 ))
if (proc_parameter_file (ctrl, para, fname, &outctrl, 0 ))
print_status_key_not_created (get_parameter_value (para, pHANDLE));
}
@ -3479,7 +3479,7 @@ quickgen_set_para (struct para_data_s *para, int for_subkey,
* Unattended generation of a standard key.
*/
void
quick_generate_keypair (const char *uid)
quick_generate_keypair (ctrl_t ctrl, const char *uid)
{
gpg_error_t err;
struct para_data_s *para = NULL;
@ -3569,7 +3569,7 @@ quick_generate_keypair (const char *uid)
para = r;
}
proc_parameter_file (para, "[internal]", &outctrl, 0);
proc_parameter_file (ctrl, para, "[internal]", &outctrl, 0);
leave:
release_parameter_list (para);
}
@ -3613,7 +3613,7 @@ generate_keypair (ctrl_t ctrl, int full, const char *fname,
if (opt.batch)
{
read_parameter_file( fname );
read_parameter_file (ctrl, fname);
return;
}
@ -3841,7 +3841,7 @@ generate_keypair (ctrl_t ctrl, int full, const char *fname,
r->next = para;
para = r;
proc_parameter_file (para, "[internal]", &outctrl, !!card_serialno);
proc_parameter_file (ctrl, para, "[internal]", &outctrl, !!card_serialno);
release_parameter_list (para);
}
@ -3958,7 +3958,7 @@ start_tree(KBNODE *tree)
static void
do_generate_keypair (struct para_data_s *para,
do_generate_keypair (ctrl_t ctrl, struct para_data_s *para,
struct output_control_s *outctrl, int card)
{
gpg_error_t err;
@ -4192,7 +4192,7 @@ do_generate_keypair (struct para_data_s *para,
{
tty_printf (_("public and secret key created and signed.\n") );
tty_printf ("\n");
list_keyblock_direct (pub_root, 0, 1, 1);
list_keyblock_direct (ctrl, pub_root, 0, 1, 1);
}