diff options
| author | jbj <devnull@localhost> | 2002-07-24 16:21:23 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2002-07-24 16:21:23 +0000 |
| commit | ede1f445e09895daee8bce8a2ddc9200839ee5de (patch) | |
| tree | 66738dfcfd86d2c355b5f2ead53fb556999c2e71 /rpmio | |
| parent | 6540da425629bf45020047214b81e156c62c7d7b (diff) | |
| download | rpm-ede1f445e09895daee8bce8a2ddc9200839ee5de.tar.gz rpm-ede1f445e09895daee8bce8a2ddc9200839ee5de.tar.bz2 rpm-ede1f445e09895daee8bce8a2ddc9200839ee5de.zip | |
- verify signatures/digests retrieved through rpmdbNextIterator().
- imbue %ghost with missingok attribute with --verify (#68933).
CVS patchset: 5568
CVS date: 2002/07/24 16:21:23
Diffstat (limited to 'rpmio')
| -rw-r--r-- | rpmio/rpmio_internal.h | 4 | ||||
| -rw-r--r-- | rpmio/rpmpgp.c | 20 |
2 files changed, 18 insertions, 6 deletions
diff --git a/rpmio/rpmio_internal.h b/rpmio/rpmio_internal.h index 1a760b717..de2dd21e7 100644 --- a/rpmio/rpmio_internal.h +++ b/rpmio/rpmio_internal.h @@ -68,6 +68,10 @@ struct pgpDig_s { /*@only@*/ /*@null@*/ DIGEST_CTX md5ctx; /*!< (rsa) md5 hash context. */ +#ifdef NOTYET +/*@only@*/ /*@null@*/ + DIGEST_CTX hdrmd5ctx; /*!< (rsa) header md5 hash context. */ +#endif /*@only@*/ /*@null@*/ void * md5; /*!< (rsa) V3 signature hash. */ size_t md5len; /*!< (rsa) V3 signature hash length. */ diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c index 3fa0195d9..31ab41da2 100644 --- a/rpmio/rpmpgp.c +++ b/rpmio/rpmpgp.c @@ -1059,12 +1059,6 @@ pgpDig pgpFreeDig(/*@only@*/ /*@null@*/ pgpDig dig) pgpCleanDig(dig); /*@-branchstate@*/ - if (dig->md5ctx != NULL) - (void) rpmDigestFinal(dig->md5ctx, NULL, NULL, 0); - /*@=branchstate@*/ - dig->md5ctx = NULL; - - /*@-branchstate@*/ if (dig->hdrsha1ctx != NULL) (void) rpmDigestFinal(dig->hdrsha1ctx, NULL, NULL, 0); /*@=branchstate@*/ @@ -1084,6 +1078,20 @@ pgpDig pgpFreeDig(/*@only@*/ /*@null@*/ pgpDig dig) mp32nfree(&dig->r); mp32nfree(&dig->s); +#ifdef NOTYET + /*@-branchstate@*/ + if (dig->hdrmd5ctx != NULL) + (void) rpmDigestFinal(dig->hdrmd5ctx, NULL, NULL, 0); + /*@=branchstate@*/ + dig->hdrmd5ctx = NULL; +#endif + + /*@-branchstate@*/ + if (dig->md5ctx != NULL) + (void) rpmDigestFinal(dig->md5ctx, NULL, NULL, 0); + /*@=branchstate@*/ + dig->md5ctx = NULL; + mp32bfree(&dig->rsa_pk.n); mp32nfree(&dig->rsa_pk.e); mp32nfree(&dig->m); |