security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

* keylist.c (list_one): Don't show the keyring filename when in

Browse source 
--with-colons mode.  Actually translate "Keyring" string.

* mainproc.c (proc_tree): We can't currently handle multiple signatures of
different classes or digests (we'd pretty much have to run a different
hash context for each), but if they are all the same, make an exception.
This is Debian bug #194292.

* sig-check.c (check_key_signature2): Make string translatable.

* packet.h, getkey.c (fixup_uidnode): Mark real primary uids differently
than assumed primaries.

* keyedit.c (no_primary_warning): Use the differently marked primaries
here in a new function to warn when an --edit-key command might rearrange
the self-sig dates enough to change which uid is primary. (menu_expire,
menu_set_preferences): Use no_primary_warning() here.

* Makefile.am: Use @DLLIBS@ for -ldl.
This commit is contained in:
David Shaw 2003-05-30 22:18:31 +00:00
parent 03c53702fb
commit d6e7a14fa7
8 changed files with 115 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

28
g10/keylist.c
View file

@ -187,16 +187,20 @@ list_all( int secret )
log_error ("keydb_get_keyblock failed: %s\n", g10_errstr(rc));
goto leave;
}
resname = keydb_get_resource_name (hd);
if (lastresname != resname ) {
int i;
if(!opt.with_colons)
{
resname = keydb_get_resource_name (hd);
if (lastresname != resname )
{
int i;
printf("%s\n", resname );
for(i=strlen(resname); i; i-- )
putchar('-');
putchar('\n');
lastresname = resname;
}
printf("%s\n", resname );
for(i=strlen(resname); i; i-- )
putchar('-');
putchar('\n');
lastresname = resname;
}
}
merge_keys_and_selfsig( keyblock );
list_keyblock( keyblock, secret, opt.fingerprint,
opt.check_sigs?&stats:NULL);
@ -222,7 +226,7 @@ list_one( STRLIST names, int secret )
KBNODE keyblock = NULL;
GETKEY_CTX ctx;
const char *resname;
char *keyring_str = N_("Keyring");
char *keyring_str = _("Keyring");
int i;
struct sig_stats stats;
@ -245,7 +249,7 @@ list_one( STRLIST names, int secret )
return;
}
do {
if (opt.show_keyring) {
if (opt.show_keyring && !opt.with_colons) {
resname = keydb_get_resource_name (get_ctx_handle(ctx));
printf("%s: %s\n", keyring_str, resname);
for(i = strlen(resname) + strlen(keyring_str) + 2; i; i-- )
@ -265,7 +269,7 @@ list_one( STRLIST names, int secret )
return;
}
do {
if (opt.show_keyring) {
if (opt.show_keyring && !opt.with_colons) {
resname = keydb_get_resource_name (get_ctx_handle(ctx));
printf("%s: %s\n", keyring_str, resname);
for(i = strlen(resname) + strlen(keyring_str) + 2; i; i-- )