From fe8265751ed592cb53dc7c3a7ffd00bac8a19ef1 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Fri, 22 Oct 2010 12:31:08 +0300 Subject: [PATCH] Couple of enum craziness fixes to package.c - 0 is not a valid rpmSigTag, just use rpmTagVal instead - use int instead of pgpHashAlgo for temporary variables, the originating data is not "pure" enum --- lib/package.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/package.c b/lib/package.c index 90e4f9c..e1795dd 100644 --- a/lib/package.c +++ b/lib/package.c @@ -392,8 +392,8 @@ verifyinfo_exit: } /* fallthrough */ case RPMTAG_SHA1HEADER: { - pgpHashAlgo hashalgo = (info.tag == RPMTAG_SHA1HEADER) ? - PGPHASHALGO_SHA1 : dig->signature.hash_algo; + int hashalgo = (info.tag == RPMTAG_SHA1HEADER) ? + PGPHASHALGO_SHA1 : dig->signature.hash_algo; ildl[0] = htonl(ril); ildl[1] = (regionEnd - dataStart); ildl[1] = htonl(ildl[1]); @@ -548,7 +548,7 @@ static rpmRC rpmpkgRead(rpmKeyring keyring, rpmVSFlags vsflags, ssize_t count; rpmlead l = NULL; Header sigh = NULL; - rpmSigTag sigtag; + rpmTagVal sigtag; struct rpmtd_s sigtd; Header h = NULL; char * msg; @@ -662,8 +662,8 @@ static rpmRC rpmpkgRead(rpmKeyring keyring, rpmVSFlags vsflags, /* fallthrough */ case RPMSIGTAG_SHA1: { struct rpmtd_s utd; - pgpHashAlgo hashalgo = (sigtag == RPMSIGTAG_SHA1) ? - PGPHASHALGO_SHA1 : dig->signature.hash_algo; + int hashalgo = (sigtag == RPMSIGTAG_SHA1) ? + PGPHASHALGO_SHA1 : dig->signature.hash_algo; if (!headerGet(h, RPMTAG_HEADERIMMUTABLE, &utd, hgeflags)) break; -- 2.7.4