aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2015-12-23 14:45:30 +0000
committerWerner Koch <[email protected]>2015-12-23 14:46:05 +0000
commit363ed2e892adc97fae97111bb56b64f9f809e8d5 (patch)
tree985fff3c9651219b458ffef186dd4c9ae34bf32a
parentgpg: Add standard free() semantic to pubkey_free. (diff)
downloadgnupg-363ed2e892adc97fae97111bb56b64f9f809e8d5.tar.gz
gnupg-363ed2e892adc97fae97111bb56b64f9f809e8d5.zip
gpg: Simplify status message code from commit b30c15bf.
* g10/keygen.c (card_write_key_to_backup_file): Simplify by using hexfingerprint. -- Note that the extra blank added to FPRBUF in the old code was not needed because write_status_text_and_buffer already ensures that there will be a space. Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to '')
-rw-r--r--g10/keygen.c19
1 files changed, 2 insertions, 17 deletions
diff --git a/g10/keygen.c b/g10/keygen.c
index 03fc53cde..992e572e4 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -3861,28 +3861,13 @@ card_write_key_to_backup_file (PKT_public_key *sk, const char *backup_dir)
}
else
{
- unsigned char array[MAX_FINGERPRINT_LEN];
- char *fprbuf, *p;
- size_t n;
- int i;
+ char *fprbuf;
iobuf_close (fp);
iobuf_ioctl (NULL, IOBUF_IOCTL_INVALIDATE_CACHE, 0, (char*)fname);
log_info (_("Note: backup of card key saved to '%s'\n"), fname);
- fingerprint_from_pk (sk, array, &n);
- p = fprbuf = xmalloc (MAX_FINGERPRINT_LEN*2 + 1 + 1);
- if (!p)
- {
- err = gpg_error_from_syserror ();
- goto leave;
- }
-
- for (i=0; i < n ; i++, p += 2)
- sprintf (p, "%02X", array[i]);
- *p++ = ' ';
- *p = 0;
-
+ fprbuf = hexfingerprint (sk, NULL, 0);
write_status_text_and_buffer (STATUS_BACKUP_KEY_CREATED, fprbuf,
fname, strlen (fname), 0);
xfree (fprbuf);