diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2009-05-08 15:01:15 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2009-05-08 15:15:41 +0300 |
| commit | 97b7dfca8c6fc2992f41e169c8daeea877b92bf1 (patch) | |
| tree | c6b0db24eab0c1d2aacfbc9797579ad77b752ae0 | |
| parent | b2b6737b34dd59902c3717ff3f178cc61c4ef3bf (diff) | |
| download | rpm-97b7dfca8c6fc2992f41e169c8daeea877b92bf1.tar.gz | |
Fix parsing of pubkey signature packets. Ick.
- busted all the way from commit bcb226480d0b60a8667eade77d81c29de4c3d6c9
(cherry picked from commit 5023d0a4e84e2877e3c715b57bd362f95f12ef06)
| -rw-r--r-- | rpmio/rpmpgp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c index 47cc764de..fb2b5a434 100644 --- a/rpmio/rpmpgp.c +++ b/rpmio/rpmpgp.c @@ -644,13 +644,13 @@ static int pgpPrtSigParams(pgpTag tag, uint8_t pubkey_algo, uint8_t sigtype, return 0; } -static int pgpPrtSig(pgpTag tag, const uint8_t *h, size_t hlen, pgpDig _dig) +static int pgpPrtSig(pgpTag tag, const uint8_t *h, size_t hlen, + pgpDig _dig, pgpDigParams _digp) { uint8_t version = h[0]; uint8_t * p; size_t plen; int rc; - pgpDigParams _digp = _dig ? &_dig->signature : NULL; switch (version) { case 3: @@ -1176,7 +1176,7 @@ static int pgpPrtPkt(const uint8_t *pkt, size_t pleft, h = pkt + 1 + plen; switch (tag) { case PGPTAG_SIGNATURE: - rc = pgpPrtSig(tag, h, hlen, _dig); + rc = pgpPrtSig(tag, h, hlen, _dig, _digp); break; case PGPTAG_PUBLIC_KEY: /* Get the public key fingerprint. */ |