diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2017-03-01 07:36:54 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2017-03-08 13:36:37 +0200 |
| commit | 6ef52f6fe5e4d81fa64ba9055e1d2169fb49a07b (patch) | |
| tree | 7bfca063a18bb88d1c271da3d164ee631414aaab | |
| parent | 8f509d669b9ae79c86dd510c5a4bc5109f60d733 (diff) | |
| download | rpm-6ef52f6fe5e4d81fa64ba9055e1d2169fb49a07b.tar.gz | |
Switch signing code to use the new ID-based digest API
| -rw-r--r-- | sign/rpmgensig.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sign/rpmgensig.c b/sign/rpmgensig.c index 96781ee05..986b8f7f2 100644 --- a/sign/rpmgensig.c +++ b/sign/rpmgensig.c @@ -604,16 +604,16 @@ static rpmRC includeFileSignatures(FD_t fd, const char *rpm, } /* Start MD5 calculation */ - fdInitDigest(fd, PGPHASHALGO_MD5, 0); + fdInitDigestID(fd, PGPHASHALGO_MD5, RPMSIGTAG_MD5, 0); /* Write header to rpm and recalculate SHA1 */ - fdInitDigest(fd, PGPHASHALGO_SHA1, 0); + fdInitDigestID(fd, PGPHASHALGO_SHA1, RPMSIGTAG_SHA1, 0); rc = headerWrite(fd, *hdrp, HEADER_MAGIC_YES); if (rc != RPMRC_OK) { rpmlog(RPMLOG_ERR, _("headerWrite failed\n")); goto exit; } - fdFiniDigest(fd, PGPHASHALGO_SHA1, (void **)&SHA1, &sha1len, 1); + fdFiniDigest(fd, RPMSIGTAG_SHA1, (void **)&SHA1, &sha1len, 1); /* Copy archive from temp file */ if (Fseek(ofd, 0, SEEK_SET) < 0) { @@ -630,7 +630,7 @@ static rpmRC includeFileSignatures(FD_t fd, const char *rpm, unlink(trpm); sigTargetSize = Ftell(fd) - headerStart; - fdFiniDigest(fd, PGPHASHALGO_MD5, (void **)&MD5, &md5len, 0); + fdFiniDigest(fd, RPMSIGTAG_MD5, (void **)&MD5, &md5len, 0); if (headerGet(*sigp, RPMSIGTAG_MD5, &osigtd, HEADERGET_DEFAULT)) { memcpy(o_md5, osigtd.data, 16); |