diff options
| author | NIIBE Yutaka <[email protected]> | 2023-05-11 09:51:33 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2023-05-11 09:51:33 +0000 |
| commit | 3274893224d6ef9ae2480ae724243d5574273b38 (patch) | |
| tree | 42c3b5a0f2deb53690477e555be04be1cec4be4e /g10/pkclist.c | |
| parent | dirmngr: Remove casting which is not needed any more. (diff) | |
| parent | Prepare new development cycle (diff) | |
| download | gnupg-gniibe/t6275.tar.gz gnupg-gniibe/t6275.zip | |
Merge branch 'master' into gniibe/t6275gniibe/t6275
Diffstat (limited to 'g10/pkclist.c')
| -rw-r--r-- | g10/pkclist.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/g10/pkclist.c b/g10/pkclist.c index 2e8932b9c..42e124e9e 100644 --- a/g10/pkclist.c +++ b/g10/pkclist.c @@ -417,7 +417,11 @@ do_we_trust( PKT_public_key *pk, unsigned int trustlevel ) if(trustlevel & TRUST_FLAG_REVOKED || trustlevel & TRUST_FLAG_SUB_REVOKED || (trustlevel & TRUST_MASK) == TRUST_EXPIRED) - BUG(); + { + if (opt.ignore_expiration) + return 0; + BUG (); + } if( opt.trust_model==TM_ALWAYS ) { |