diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2008-05-23 13:01:47 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2008-05-23 17:07:35 +0300 |
| commit | 1e4e1a4bee41dee73b72ff93c2b7e9a5513bd030 (patch) | |
| tree | 9525603d76e8be6b668bdc34c15c5a0d5530b59d | |
| parent | e31d9e9e9449a31d96e98a8eb39304710e7c649e (diff) | |
| download | rpm-1e4e1a4bee41dee73b72ff93c2b7e9a5513bd030.tar.gz rpm-1e4e1a4bee41dee73b72ff93c2b7e9a5513bd030.tar.bz2 rpm-1e4e1a4bee41dee73b72ff93c2b7e9a5513bd030.zip | |
Convert getSignid() to new headerGet()
| -rw-r--r-- | lib/rpmchecksig.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c index 5a31962c0..cf6e5815e 100644 --- a/lib/rpmchecksig.c +++ b/lib/rpmchecksig.c @@ -111,22 +111,20 @@ exit: */ static int getSignid(Header sig, rpmSigTag sigtag, pgpKeyID_t signid) { - rpm_data_t pkt = NULL; - rpmTagType pkttyp = 0; - rpm_count_t pktlen = 0; + struct rpmtd_s pkt; int rc = 1; - if (headerGetEntry(sig, sigtag, &pkttyp, &pkt, &pktlen) && pkt != NULL) { + if (headerGet(sig, sigtag, &pkt, HEADERGET_DEFAULT) && pkt.data != NULL) { pgpDig dig = pgpNewDig(); - if (!pgpPrtPkts(pkt, pktlen, dig, 0)) { + if (!pgpPrtPkts(pkt.data, pkt.count, dig, 0)) { memcpy(signid, dig->signature.signid, sizeof(dig->signature.signid)); rc = 0; } dig = pgpFreeDig(dig); + rpmtdFreeData(&pkt); } - pkt = headerFreeData(pkt, pkttyp); return rc; } |