diff options
| author | David Shaw <[email protected]> | 2002-08-23 20:59:48 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2002-08-23 20:59:48 +0000 |
| commit | 7e3e9bf357793aad8d604c9c32b1bb25c19b98bf (patch) | |
| tree | 26d3a22e89978ba1e2dc25d73c451e3defe7afde /g10/sig-check.c | |
| parent | * faq.raw: Updated. New Maintainer is David D. Scribner. (diff) | |
| download | gnupg-7e3e9bf357793aad8d604c9c32b1bb25c19b98bf.tar.gz gnupg-7e3e9bf357793aad8d604c9c32b1bb25c19b98bf.zip | |
* sig-check.c (do_check, do_check_messages): Emit the usual sig warnings
even for cached sigs. This also serves to protect against missing a sig
expiring while cached.
* getkey.c (merge_selfsigs_main): Don't check UID self-sigs twice.
Diffstat (limited to 'g10/sig-check.c')
| -rw-r--r-- | g10/sig-check.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/g10/sig-check.c b/g10/sig-check.c index 8dce3cbe9..29a035203 100644 --- a/g10/sig-check.c +++ b/g10/sig-check.c @@ -205,14 +205,9 @@ cmp_help( void *opaque, MPI result ) #endif } - static int -do_check( PKT_public_key *pk, PKT_signature *sig, MD_HANDLE digest, - int *r_expired ) +do_check_messages( PKT_public_key *pk, PKT_signature *sig, int *r_expired ) { - MPI result = NULL; - int rc=0; - struct cmp_help_context_s ctx; u32 cur_time; *r_expired = 0; @@ -259,7 +254,20 @@ do_check( PKT_public_key *pk, PKT_signature *sig, MD_HANDLE digest, *r_expired = 1; } + return 0; +} + +static int +do_check( PKT_public_key *pk, PKT_signature *sig, MD_HANDLE digest, + int *r_expired ) +{ + MPI result = NULL; + int rc=0; + struct cmp_help_context_s ctx; + + if( (rc=do_check_messages(pk,sig,r_expired)) ) + return rc; if( (rc=check_digest_algo(sig->digest_algo)) ) return rc; if( (rc=check_pubkey_algo(sig->pubkey_algo)) ) @@ -436,6 +444,8 @@ check_key_signature2( KBNODE root, KBNODE node, int *is_selfsig, if( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1] ) *is_selfsig = 1; } + if((rc=do_check_messages(pk,sig,r_expired))) + return rc; return sig->flags.valid? 0 : G10ERR_BAD_SIGN; } } @@ -532,5 +542,3 @@ check_key_signature2( KBNODE root, KBNODE node, int *is_selfsig, return rc; } - - |