diff options
| author | Neal H. Walfield <[email protected]> | 2016-02-19 13:59:19 +0000 |
|---|---|---|
| committer | Neal H. Walfield <[email protected]> | 2016-02-19 15:13:02 +0000 |
| commit | 10671c3a4c18ea26035a5819a9f2b8fd6c7e41ea (patch) | |
| tree | 9d7abdad56dc9159e3018e37e940b2ccd8237c8d | |
| parent | gpg: Initialize the primary key when generating a key. (diff) | |
| download | gnupg-10671c3a4c18ea26035a5819a9f2b8fd6c7e41ea.tar.gz gnupg-10671c3a4c18ea26035a5819a9f2b8fd6c7e41ea.zip | |
gpg: Use format_keyid rather than manually formatting the keyid.
* 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 <[email protected]>
| -rw-r--r-- | g10/keyedit.c | 3 | ||||
| -rw-r--r-- | g10/keygen.c | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/g10/keyedit.c b/g10/keyedit.c index 19ddf2922..f2ef6134e 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -3953,8 +3953,7 @@ menu_addrevoker (ctrl_t ctrl, kbnode_t pub_keyblock, int sensitive) log_error (_("this key has already been designated " "as a revoker\n")); - sprintf (buf, "%08lX%08lX", - (ulong) pk->keyid[0], (ulong) pk->keyid[1]); + format_keyid (pk_keyid (pk), KF_LONG, buf, sizeof (buf)); write_status_text (STATUS_ALREADY_SIGNED, buf); break; diff --git a/g10/keygen.c b/g10/keygen.c index be132bb07..8f25fe9eb 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -3840,15 +3840,15 @@ card_write_key_to_backup_file (PKT_public_key *sk, const char *backup_dir) { gpg_error_t err = 0; int rc; + char keyid_buffer[2 * 8 + 1]; char name_buffer[50]; char *fname; IOBUF fp; mode_t oldmask; PACKET *pkt = NULL; - keyid_from_pk (sk, NULL); - snprintf (name_buffer, sizeof name_buffer, "sk_%08lX%08lX.gpg", - (ulong)sk->keyid[0], (ulong)sk->keyid[1]); + format_keyid (pk_keyid (sk), KF_LONG, keyid_buffer, sizeof (keyid_buffer)); + snprintf (name_buffer, sizeof name_buffer, "sk_%s.gpg", keyid_buffer); fname = make_filename (backup_dir, name_buffer, NULL); /* Note that the umask call is not anymore needed because |