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

Sanitize rpmVerifySignature() a bit 

- Hash context is required for everything, require non-NULL ctx
  in rpmVerifySignature() already
- pgpDig is only relevant for true signature, digest checking doesn't
  need it - dont require dummy dig to be passed for digests.
- Treat unknown signatures as a case of bad parameters: we're the
  only caller of rpmVerifySignature() so it'd be us screwing up if
  we ask for unknown signature to be verified.
- Treat bad parameters as a hard failure instead of "not found",
  bad parameters mean we cannot verify the signature which really
  equals FAIL.
This commit is contained in:
Panu Matilainen 2011-10-06 12:49:18 +03:00
parent d9932aa63c
commit 9718ede792
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/signature.c
View File

@ -497,11 +497,10 @@ rpmVerifySignature(rpmKeyring keyring, rpmtd sigtd, pgpDig dig, DIGEST_CTX ctx,
{
rpmRC res = RPMRC_NOTFOUND;
char *msg = NULL;
int hdrsig = 0;
if (sigtd->data == NULL || sigtd->count <= 0 || dig == NULL) {
rasprintf(&msg, _("Verify signature: BAD PARAMETERS\n"));
if (sigtd->data == NULL || sigtd->count <= 0 || ctx == NULL)
goto exit;
}
switch (sigtd->tag) {
case RPMSIGTAG_MD5:
@ -512,19 +511,26 @@ rpmVerifySignature(rpmKeyring keyring, rpmtd sigtd, pgpDig dig, DIGEST_CTX ctx,
break;
case RPMSIGTAG_RSA:
case RPMSIGTAG_DSA:
res = verifySignature(keyring, dig, ctx, 1, &msg);
break;
hdrsig = 1;
/* fallthrough */
case RPMSIGTAG_PGP5: /* XXX legacy */
case RPMSIGTAG_PGP:
case RPMSIGTAG_GPG:
res = verifySignature(keyring, dig, ctx, 0, &msg);
if (dig != NULL)
res = verifySignature(keyring, dig, ctx, hdrsig, &msg);
break;
default:
rasprintf(&msg, _("Signature: UNKNOWN (%d)\n"), sigtd->tag);
break;
}
exit:
if (res == RPMRC_NOTFOUND) {
rasprintf(&msg,
_("Verify signature: BAD PARAMETERS (%d %p %d %p %p)\n"),
sigtd->tag, sigtd->data, sigtd->count, ctx, dig);
res = RPMRC_FAIL;
}
if (result) {
*result = msg;
} else {