diff options
| author | Werner Koch <wk@gnupg.org> | 2019-04-05 17:02:43 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2019-04-05 17:02:43 +0200 |
| commit | ea32842d5c2e2d262d32791130d7eae5c8c3edcf (patch) | |
| tree | abd6a0925cf27392ffc484f7d16c21c94b4ad33a /g10/import.c | |
| parent | scd:piv: Fix RSA decryption. (diff) | |
| download | gnupg2-ea32842d5c2e2d262d32791130d7eae5c8c3edcf.tar.xz gnupg2-ea32842d5c2e2d262d32791130d7eae5c8c3edcf.zip | |
gpg: Fix printing of the user id during import.
* g10/getkey.c (struct keyid_list): Add field fprlen.
(cache_user_id): Set and test it.
(get_user_id_byfpr): Make static, add arg fprlen and use it.
(get_user_id_byfpr_native): Add arg fprlen and change all callers.
--
This was a regression in the 2.3 base.
GnuPG-bug-id: 3801
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'g10/import.c')
| -rw-r--r-- | g10/import.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/g10/import.c b/g10/import.c index c2a1dd033..6c8a37785 100644 --- a/g10/import.c +++ b/g10/import.c @@ -2028,7 +2028,7 @@ import_one (ctrl_t ctrl, /* We are ready. */ if (!opt.quiet && !silent) { - char *p = get_user_id_byfpr_native (ctrl, fpr2); + char *p = get_user_id_byfpr_native (ctrl, fpr2, fpr2len); log_info (_("key %s: public key \"%s\" imported\n"), keystr(keyid), p); xfree(p); @@ -2114,7 +2114,7 @@ import_one (ctrl_t ctrl, /* We are ready. */ if (!opt.quiet && !silent) { - char *p = get_user_id_byfpr_native (ctrl, fpr2); + char *p = get_user_id_byfpr_native (ctrl, fpr2, fpr2len); if (n_uids == 1 ) log_info( _("key %s: \"%s\" 1 new user ID\n"), keystr(keyid),p); @@ -2175,7 +2175,7 @@ import_one (ctrl_t ctrl, if (!opt.quiet && !silent) { - char *p = get_user_id_byfpr_native (ctrl, fpr2); + char *p = get_user_id_byfpr_native (ctrl, fpr2, fpr2len); log_info( _("key %s: \"%s\" not changed\n"),keystr(keyid),p); xfree(p); } |