diff options
| -rw-r--r-- | crypt-gpgme.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/crypt-gpgme.c b/crypt-gpgme.c index e74caecb..5c3c0fe5 100644 --- a/crypt-gpgme.c +++ b/crypt-gpgme.c @@ -2422,14 +2422,18 @@ static int pgp_gpgme_extract_keys (gpgme_data_t keydata, FILE** fp) tt = subkey->timestamp; strftime (date, sizeof (date), "%Y-%m-%d", localtime (&tt)); + fprintf (*fp, "%s %5.5s %d/%8s %s\n", + more ? "sub" : "pub", + gpgme_pubkey_algo_name (subkey->pubkey_algo), subkey->length, + shortid, date); if (!more) - fprintf (*fp, "%s %5.5s %d/%8s %s %s\n", more ? "sub" : "pub", - gpgme_pubkey_algo_name (subkey->pubkey_algo), subkey->length, - shortid, date, uid->uid); - else - fprintf (*fp, "%s %5.5s %d/%8s %s\n", more ? "sub" : "pub", - gpgme_pubkey_algo_name (subkey->pubkey_algo), subkey->length, - shortid, date); + { + while (uid) + { + fprintf (*fp, "uid %s\n", NONULL (uid->uid)); + uid = uid->next; + } + } subkey = subkey->next; more = 1; } |