security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

* getkey.c (merge_selfsigs): If a subkey is already revoked by the owner,

Browse Source 
don't allow a designated revokation of the whole key to override this.
We're still revoked either way, of course.
This commit is contained in:
David Shaw 2004-01-21 23:41:42 +00:00
parent 335d393062
commit 7690350b7a
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
g10/ChangeLog
View File

@ -1,3 +1,9 @@
2004-01-21 David Shaw <dshaw@jabberwocky.com>
* getkey.c (merge_selfsigs): If a subkey is already revoked by the
owner, don't allow a designated revokation of the whole key to
override this. We're still revoked either way, of course.
2004-01-20 David Shaw <dshaw@jabberwocky.com>
* g10.c (list_config): Add "version" tag for --list-config.

2
g10/getkey.c
View File

@ -1972,7 +1972,7 @@ merge_selfsigs( KBNODE keyblock )
PKT_public_key *pk = k->pkt->pkt.public_key;
if(!main_pk->is_valid)
pk->is_valid = 0;
if(revoked)
if(revoked && !pk->is_revoked)
pk->is_revoked = revoked;
if(main_pk->has_expired)
pk->has_expired = main_pk->has_expired;