folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix (ie eliminate) rpmSigTag uses in rpmchecksig 

- The sigtags originating from headers are not enums but integers
- 0 is not a valid rpmSigTag value while the other cases would be in
  bestSig() and friends
This commit is contained in:
Panu Matilainen 2010-10-22 12:39:04 +03:00
parent 41e311c91d
commit 3d8ce81423
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/rpmchecksig.c
View File

@ -166,9 +166,9 @@ static rpmRC parsePGP(rpmtd sigtd, const char *fn, pgpDig dig)
* Figure best available signature. * Figure best available signature.
* XXX TODO: Similar detection in rpmReadPackageFile(), unify these. * XXX TODO: Similar detection in rpmReadPackageFile(), unify these.
*/ */
static rpmSigTag bestSig(Header sigh, int nosignatures, int nodigests) static rpmTagVal bestSig(Header sigh, int nosignatures, int nodigests)
{ {
rpmSigTag sigtag = 0; rpmTagVal sigtag = 0;
if (sigtag == 0 && !nosignatures) { if (sigtag == 0 && !nosignatures) {
if (headerIsEntry(sigh, RPMSIGTAG_DSA)) if (headerIsEntry(sigh, RPMSIGTAG_DSA))
sigtag = RPMSIGTAG_DSA; sigtag = RPMSIGTAG_DSA;
@ -188,7 +188,7 @@ static rpmSigTag bestSig(Header sigh, int nosignatures, int nodigests)
return sigtag; return sigtag;
} }
static const char *sigtagname(rpmSigTag sigtag, int upper) static const char *sigtagname(rpmTagVal sigtag, int upper)
{ {
const char *n = NULL; const char *n = NULL;
@ -231,7 +231,7 @@ static const char *sigtagname(rpmSigTag sigtag, int upper)
* if misssing/untrusted key it's uppercase in parenthesis * if misssing/untrusted key it's uppercase in parenthesis
* and stash the key id as <SIGTYPE>#<keyid>. Pfft. * and stash the key id as <SIGTYPE>#<keyid>. Pfft.
*/ */
static void formatResult(rpmSigTag sigtag, rpmRC sigres, const char *result, static void formatResult(rpmTagVal sigtag, rpmRC sigres, const char *result,
int havekey, char **keyprob, char **buf) int havekey, char **keyprob, char **buf)
{ {
char *msg = NULL; char *msg = NULL;
@ -263,7 +263,7 @@ static int rpmpkgVerifySigs(rpmKeyring keyring, rpmQueryFlags flags,
char *missingKeys = NULL; char *missingKeys = NULL;
char *untrustedKeys = NULL; char *untrustedKeys = NULL;
struct rpmtd_s sigtd; struct rpmtd_s sigtd;
rpmSigTag sigtag; rpmTagVal sigtag;
pgpDig dig = NULL; pgpDig dig = NULL;
pgpDigParams sigp; pgpDigParams sigp;
Header sigh = NULL; Header sigh = NULL;