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

Avoid stpcpy() to static sized buffer in verifySHA1Signature()

This commit is contained in:
Panu Matilainen 2008-04-07 14:55:36 +03:00
parent 5ef8b53108
commit 5a0880a5de
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/signature.c
View File

@ -1034,7 +1034,7 @@ exit:
/**
* Verify header immutable region SHA1 digest.
* @param ts transaction set
* @retval msg rbose success/failure text
* @retval msg verbose success/failure text
* @param sha1ctx
* @return RPMRC_OK on success
*/
@ -1042,23 +1042,21 @@ static rpmRC
verifySHA1Signature(const rpmts ts, char ** msg,
DIGEST_CTX sha1ctx)
{
rpm_constdata_t sig = rpmtsSig(ts);
const char *sig = rpmtsSig(ts);
#ifdef NOTYET
size_t siglen = rpmtsSiglen(ts);
#endif
pgpDig dig = rpmtsDig(ts);
rpmRC res;
char * SHA1 = NULL;
char *t;
const char *title = _("Header SHA1 digest:");
*msg = xmalloc(BUFSIZ); /* XXX FIXME, calculate string size instead */
t = *msg;
t = stpcpy(t, _("Header SHA1 digest: "));
assert(msg != NULL);
*msg = NULL;
if (sha1ctx == NULL || sig == NULL || dig == NULL) {
res = RPMRC_NOKEY;
t = stpcpy(t, rpmSigString(res));
rasprintf(msg, "%s %s\n", title, rpmSigString(res));
goto exit;
}
@ -1069,22 +1067,15 @@ verifySHA1Signature(const rpmts ts, char ** msg,
if (SHA1 == NULL || strlen(SHA1) != strlen(sig) || strcmp(SHA1, sig)) {
res = RPMRC_FAIL;
t = stpcpy(t, rpmSigString(res));
t = stpcpy(t, " Expected(");
t = stpcpy(t, sig);
t = stpcpy(t, ") != (");
rasprintf(msg, "%s %s Expected(%s) != (%s)\n", title,
rpmSigString(res), sig, SHA1 ? SHA1 : "(nil)");
} else {
res = RPMRC_OK;
t = stpcpy(t, rpmSigString(res));
t = stpcpy(t, " (");
rasprintf(msg, "%s %s (%s)\n", title, rpmSigString(res), SHA1);
}
if (SHA1)
t = stpcpy(t, SHA1);
t = stpcpy(t, ")");
exit:
SHA1 = _free(SHA1);
t = stpcpy(t, "\n");
return res;
}