security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-15 00:29:49 +02:00
Code Activity

gpg: Use format_keyid rather than manually formatting the keyid.

Browse Source 
* g10/keyedit.c (menu_addrevoker): Use format_keyid rather than
manually formatting the keyid.
* g10/keygen.c (card_write_key_to_backup_file): Likewise.

--
Signed-off-by: Neal H. Walfield <neal@g10code.com>
This commit is contained in:
Neal H. Walfield 2016-02-19 14:59:19 +01:00
parent bf9d1248c8
commit 10671c3a4c
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
g10/keyedit.c
View File

@ -3953,8 +3953,7 @@ menu_addrevoker (ctrl_t ctrl, kbnode_t pub_keyblock, int sensitive)
log_error (_("this key has already been designated " log_error (_("this key has already been designated "
"as a revoker\n")); "as a revoker\n"));
sprintf (buf, "%08lX%08lX", format_keyid (pk_keyid (pk), KF_LONG, buf, sizeof (buf));
(ulong) pk->keyid[0], (ulong) pk->keyid[1]);
write_status_text (STATUS_ALREADY_SIGNED, buf); write_status_text (STATUS_ALREADY_SIGNED, buf);
break; break;

6
g10/keygen.c
View File

@ -3840,15 +3840,15 @@ card_write_key_to_backup_file (PKT_public_key *sk, const char *backup_dir)
{ {
gpg_error_t err = 0; gpg_error_t err = 0;
int rc; int rc;
char keyid_buffer[2 * 8 + 1];
char name_buffer[50]; char name_buffer[50];
char *fname; char *fname;
IOBUF fp; IOBUF fp;
mode_t oldmask; mode_t oldmask;
PACKET *pkt = NULL; PACKET *pkt = NULL;
keyid_from_pk (sk, NULL); format_keyid (pk_keyid (sk), KF_LONG, keyid_buffer, sizeof (keyid_buffer));
snprintf (name_buffer, sizeof name_buffer, "sk_%08lX%08lX.gpg", snprintf (name_buffer, sizeof name_buffer, "sk_%s.gpg", keyid_buffer);
(ulong)sk->keyid[0], (ulong)sk->keyid[1]);
fname = make_filename (backup_dir, name_buffer, NULL); fname = make_filename (backup_dir, name_buffer, NULL);
/* Note that the umask call is not anymore needed because /* Note that the umask call is not anymore needed because