security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-21 14:47:03 +01:00
Code Activity

* keylist.c (print_seckey_info, print_pubkey_info): --keyid-format

Browse Source 
conversion. (list_keyblock_print): 0xshort should not push us into the new
list format since it is not much longer than regular 8-character short
keyids.
This commit is contained in:
David Shaw 2004-03-06 20:45:44 +00:00
parent b8cd31217e
commit a5208f2e1d
2 changed files with 27 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
g10/ChangeLog
View File

@ -1,5 +1,11 @@
2004-03-06 David Shaw <dshaw@jabberwocky.com> 2004-03-06 David Shaw <dshaw@jabberwocky.com>
* keylist.c (print_seckey_info, print_pubkey_info): --keyid-format
conversion.
(list_keyblock_print): 0xshort should not push us into the new
list format since it is not much longer than regular 8-character
short keyids.
* keydb.h, keyid.c (keystr_from_pk, keystr_from_sk): New functions * keydb.h, keyid.c (keystr_from_pk, keystr_from_sk): New functions
to pull a key string from a key in one step. This isn't faster to pull a key string from a key in one step. This isn't faster
than before, but makes for neater code. than before, but makes for neater code.

55
g10/keylist.c
View File

@ -112,21 +112,18 @@ secret_key_list( STRLIST list )
void void
print_seckey_info (PKT_secret_key *sk) print_seckey_info (PKT_secret_key *sk)
{ {
u32 sk_keyid[2]; u32 keyid[2];
size_t n; char *p;
char *p;
keyid_from_sk (sk, sk_keyid); keyid_from_sk (sk, keyid);
tty_printf ("\nsec %4u%c/%08lX %s ", p=get_user_id_printable(keyid);
nbits_from_sk (sk),
pubkey_letter (sk->pubkey_algo), tty_printf ("\nsec %4u%c/%s %s %s\n",
(ulong)sk_keyid[1], datestr_from_sk (sk)); nbits_from_sk (sk),
pubkey_letter (sk->pubkey_algo),
keystr(keyid), datestr_from_sk (sk), p);
p = get_user_id (sk_keyid, &n); m_free (p);
tty_print_utf8_string (p, n);
m_free (p);
tty_printf ("\n");
} }
/* Print information about the public key. With FP passed as NULL, /* Print information about the public key. With FP passed as NULL,
@ -135,33 +132,23 @@ print_seckey_info (PKT_secret_key *sk)
void void
print_pubkey_info (FILE *fp, PKT_public_key *pk) print_pubkey_info (FILE *fp, PKT_public_key *pk)
{ {
u32 pk_keyid[2]; u32 keyid[2];
size_t n;
char *p; char *p;
keyid_from_pk (pk, pk_keyid); keyid_from_pk (pk, keyid);
p=get_user_id_printable(keyid);
if (fp) if (fp)
fprintf (fp, "pub %4u%c/%08lX %s ", fprintf (fp, "pub %4u%c/%s %s %s\n",
nbits_from_pk (pk), nbits_from_pk (pk),
pubkey_letter (pk->pubkey_algo), pubkey_letter (pk->pubkey_algo),
(ulong)pk_keyid[1], datestr_from_pk (pk)); keystr(keyid), datestr_from_pk (pk), p);
else else
tty_printf ("\npub %4u%c/%08lX %s ", tty_printf ("\npub %4u%c/%s %s %s\n",
nbits_from_pk (pk), nbits_from_pk (pk), pubkey_letter (pk->pubkey_algo),
pubkey_letter (pk->pubkey_algo), keystr(keyid), datestr_from_pk (pk), p);
(ulong)pk_keyid[1], datestr_from_pk (pk));
p = get_user_id (pk_keyid, &n);
if (fp)
print_utf8_string2 (fp, p, n, '\n');
else
tty_print_utf8_string (p, n);
m_free (p); m_free (p);
if (fp)
putc ('\n', fp);
else
tty_printf ("\n\n");
} }
/* /*
@ -606,7 +593,7 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque )
int newformat=((opt.list_options&LIST_SHOW_VALIDITY) && !secret) int newformat=((opt.list_options&LIST_SHOW_VALIDITY) && !secret)
|| (opt.list_options & (LIST_SHOW_UNUSABLE_UIDS || (opt.list_options & (LIST_SHOW_UNUSABLE_UIDS
| LIST_SHOW_UNUSABLE_SUBKEYS)) | LIST_SHOW_UNUSABLE_SUBKEYS))
|| (keystrlen()>8); || (keystrlen()>10);
/* get the keyid from the keyblock */ /* get the keyid from the keyblock */
node = find_kbnode( keyblock, secret? PKT_SECRET_KEY : PKT_PUBLIC_KEY ); node = find_kbnode( keyblock, secret? PKT_SECRET_KEY : PKT_PUBLIC_KEY );
@ -710,7 +697,7 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque )
else if(newformat) else if(newformat)
printf("uid%*s",keystrlen()+10,""); printf("uid%*s",keystrlen()+10,"");
else if(any) else if(any)
printf("uid%*s",29,""); printf("uid%*s",keystrlen()+21,"");
print_utf8_string( stdout, uid->name, uid->len ); print_utf8_string( stdout, uid->name, uid->len );
putchar('\n'); putchar('\n');