security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-08 12:44:23 +01:00
Code Activity

gpg: Refactor print_seckey_info.

Browse Source 
* g10/keylist.c (print_seckey_info): Break formatting functionality
into...
(format_seckey_info): ... this new function.

--
Signed-off-by: Neal H. Walfield <neal@g10code.com>
This commit is contained in:
Neal H. Walfield 2015-11-20 12:52:04 +01:00
parent 46e128d44a
commit f8a65ac96b
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
g10/keylist.c
View File

@ -163,21 +163,32 @@ secret_key_list (ctrl_t ctrl, strlist_t list)
list_one (ctrl, list, 1, 0); list_one (ctrl, list, 1, 0);
} }
void char *
print_seckey_info (PKT_public_key *pk) format_seckey_info (PKT_public_key *pk)
{ {
u32 keyid[2]; u32 keyid[2];
char *p; char *p;
char pkstrbuf[PUBKEY_STRING_SIZE]; char pkstrbuf[PUBKEY_STRING_SIZE];
char *info;
keyid_from_pk (pk, keyid); keyid_from_pk (pk, keyid);
p = get_user_id_native (keyid); p = get_user_id_native (keyid);
tty_printf ("\nsec %s/%s %s %s\n", info = xtryasprintf ("sec %s/%s %s %s",
pubkey_string (pk, pkstrbuf, sizeof pkstrbuf), pubkey_string (pk, pkstrbuf, sizeof pkstrbuf),
keystr (keyid), datestr_from_pk (pk), p); keystr (keyid), datestr_from_pk (pk), p);
xfree (p); xfree (p);
return info;
}
void
print_seckey_info (PKT_public_key *pk)
{
char *p = format_seckey_info (pk);
tty_printf ("\n%s\n", p);
xfree (p);
} }
/* Print information about the public key. With FP passed as NULL, /* Print information about the public key. With FP passed as NULL,

1
g10/main.h
View File

@ -387,6 +387,7 @@ void show_keyserver_url(PKT_signature *sig,int indent,int mode);
void show_notation(PKT_signature *sig,int indent,int mode,int which); void show_notation(PKT_signature *sig,int indent,int mode,int which);
void dump_attribs (const PKT_user_id *uid, PKT_public_key *pk); void dump_attribs (const PKT_user_id *uid, PKT_public_key *pk);
void set_attrib_fd(int fd); void set_attrib_fd(int fd);
char *format_seckey_info (PKT_public_key *pk);
void print_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_pubkey_info (estream_t fp, PKT_public_key *pk);
void print_card_key_info (estream_t fp, KBNODE keyblock); void print_card_key_info (estream_t fp, KBNODE keyblock);