diff options
| author | Werner Koch <wk@gnupg.org> | 1998-10-18 17:21:22 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 1998-10-18 17:21:22 +0200 |
| commit | 6e1629686442f357146cce4052a5fa4afd59d232 (patch) | |
| tree | c6c7a5df241142ecd0797702a7bf6c3bfc8b6a33 /g10/getkey.c | |
| parent | . (diff) | |
| download | gnupg2-6e1629686442f357146cce4052a5fa4afd59d232.tar.xz gnupg2-6e1629686442f357146cce4052a5fa4afd59d232.zip | |
Snapshot release 0.4.2V0-4-2
Diffstat (limited to 'g10/getkey.c')
| -rw-r--r-- | g10/getkey.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/getkey.c b/g10/getkey.c index 90bd09a25..3aa12033d 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -610,7 +610,7 @@ merge_one_pk_and_selfsig( KBNODE keyblock, KBNODE knode ) for(k=keyblock; k; k = k->next ) { if( k->pkt->pkttype == PKT_SIGNATURE && (sig=k->pkt->pkt.signature)->sig_class >= 0x10 - && sig->sig_class <= 0x13 + && sig->sig_class <= 0x30 && sig->keyid[0] == kid[0] && sig->keyid[1] == kid[1] && sig->version > 3 ) { @@ -660,7 +660,7 @@ merge_keys_and_selfsig( KBNODE keyblock ) } else if( (pk || sk ) && k->pkt->pkttype == PKT_SIGNATURE && (sig=k->pkt->pkt.signature)->sig_class >= 0x10 - && sig->sig_class <= 0x13 && sig->version > 3 + && sig->sig_class <= 0x30 && sig->version > 3 && sig->keyid[0] == kid[0] && sig->keyid[1] == kid[1] ) { /* okay this is (the first) self-signature which can be used * FIXME: We should only use this if the signature is valid |