diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2022-02-07 13:41:59 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2022-02-11 15:09:08 +0200 |
| commit | 9b8f573566a3a35d784642aa14cadb8fc440bdf2 (patch) | |
| tree | b3cb9c7c00addb55823204f5bfc7279365fe11a2 /sign/rpmsignfiles.c | |
| parent | 64a688eb01a97fbbcfbae08d169f08983ba5d5ac (diff) | |
| download | rpm-9b8f573566a3a35d784642aa14cadb8fc440bdf2.tar.gz | |
Revert whack-a-mole attempts to fix IMA as broken
This reverts commits a79d7ae0f0996815d18cdf11226817900b875765 and
31e9daf823f7052135d1decc0802b6fa775a88c5 which are still dangerously
flawed.
Diffstat (limited to 'sign/rpmsignfiles.c')
| -rw-r--r-- | sign/rpmsignfiles.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sign/rpmsignfiles.c b/sign/rpmsignfiles.c index 6f39db6be..b143c5b9b 100644 --- a/sign/rpmsignfiles.c +++ b/sign/rpmsignfiles.c @@ -98,9 +98,8 @@ rpmRC rpmSignFiles(Header sigh, Header h, const char *key, char *keypass) td.count = 1; while (rpmfiNext(fi) >= 0) { - uint32_t slen; digest = rpmfiFDigest(fi, NULL, NULL); - signature = signFile(algoname, digest, diglen, key, keypass, &slen); + signature = signFile(algoname, digest, diglen, key, keypass, &siglen); if (!signature) { rpmlog(RPMLOG_ERR, _("signFile failed\n")); goto exit; @@ -111,8 +110,6 @@ rpmRC rpmSignFiles(Header sigh, Header h, const char *key, char *keypass) goto exit; } signature = _free(signature); - if (slen > siglen) - siglen = slen; } if (siglen > 0) { |