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

* keyedit.c (show_key_with_all_names_colon): Make --with-colons --edit

Browse source 
display match the validity and trust of --with-colons --list-keys.

* passphrase.c (agent_send_all_options): Fix compile warning.

* keylist.c (list_keyblock_colon): Validity for subkeys should match that
of the primary key, and not that of the last user ID.

* getkey.c (merge_selfsigs): Revoked/expired/invalid primary keys carry
these facts onto all their subkeys, but only after the subkey has a chance
to be marked valid.  This is to fix an incorrect "invalid public key"
error verifying a signature made by a revoked signing subkey, with a valid
unrevoked primary key.
This commit is contained in:
David Shaw 2002-11-13 13:23:03 +00:00
parent 3817bf604e
commit 365011c8f1
5 changed files with 90 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

12
g10/keylist.c
View file

@ -694,7 +694,6 @@ list_keyblock_colon( KBNODE keyblock, int secret, int fpr )
sk = NULL;
keyid_from_pk( pk, keyid );
fputs( "pub:", stdout );
trustletter = 0;
if ( !pk->is_valid )
putchar ('i');
else if ( pk->is_revoked )
@ -755,6 +754,7 @@ list_keyblock_colon( KBNODE keyblock, int secret, int fpr )
}
else {
byte namehash[20];
int uid_validity;
if( pk && !ulti_hack ) {
if( node->pkt->pkt.user_id->attrib_data )
@ -765,11 +765,11 @@ list_keyblock_colon( KBNODE keyblock, int secret, int fpr )
rmd160_hash_buffer( namehash,
node->pkt->pkt.user_id->name,
node->pkt->pkt.user_id->len );
trustletter = get_validity_info( pk, namehash );
uid_validity = get_validity_info( pk, namehash );
}
else
trustletter = 'u';
printf("%s:%c::::::::",str,trustletter);
uid_validity = 'u';
printf("%s:%c::::::::",str,uid_validity);
}
}
if(node->pkt->pkt.user_id->attrib_data)
@ -818,7 +818,9 @@ list_keyblock_colon( KBNODE keyblock, int secret, int fpr )
else if ( opt.fast_list_mode || opt.no_expensive_trust_checks )
;
else {
printf("%c", trustletter );
/* trustletter should always be defined here */
if(trustletter)
printf("%c", trustletter );
}
printf(":%u:%d:%08lX%08lX:%s:%s:",
nbits_from_pk( pk2 ),