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

Eliminate redundant NULL-checks in lower level sigchecking functions 

- sigtd->data and dig checking (where needed) is done at
  rpmVerifySignature() level, dont bother double-checking
- Hash context is dup'ed, which CAN fail, so while we dont need
  to check the argument for non-null, the dup result needs to
  be checked for digests. For actual signatures the dup happens
  elsewhere, we dont need to check the argument for non-null here.
This commit is contained in:
Panu Matilainen 2011-10-06 12:56:13 +03:00
parent 9718ede792
commit a2e5918027
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/signature.c
View File

@ -398,7 +398,7 @@ verifyMD5Digest(rpmtd sigtd, DIGEST_CTX md5ctx, char **msg)
*msg = NULL;
DIGEST_CTX ctx = rpmDigestDup(md5ctx);
if (ctx == NULL || sigtd->data == NULL) {
if (ctx == NULL) {
rasprintf(msg, "%s %s\n", title, rpmSigString(res));
goto exit;
}
@ -438,7 +438,7 @@ verifySHA1Digest(rpmtd sigtd, DIGEST_CTX sha1ctx, char **msg)
*msg = NULL;
DIGEST_CTX ctx = rpmDigestDup(sha1ctx);
if (ctx == NULL || sigtd->data == NULL) {
if (ctx == NULL) {
rasprintf(msg, "%s %s\n", title, rpmSigString(res));
goto exit;
}
@ -471,21 +471,15 @@ static rpmRC
verifySignature(rpmKeyring keyring, pgpDig dig, DIGEST_CTX hashctx, int isHdr,
char **msg)
{
pgpDigParams sigp = dig ? &dig->signature : NULL;
rpmRC res = RPMRC_FAIL; /* assume failure */
char *sigid = NULL;
*msg = NULL;
if (hashctx == NULL) {
goto exit;
}
/* Call verify even if we dont have a key for a basic sanity check */
(void) rpmKeyringLookup(keyring, dig);
res = pgpVerifySig(dig, hashctx);
exit:
sigid = pgpIdentItem(sigp);
sigid = pgpIdentItem(&dig->signature);
rasprintf(msg, "%s%s: %s\n", isHdr ? _("Header ") : "", sigid,
rpmSigString(res));
free(sigid);