summaryrefslogtreecommitdiffstats
path: root/methods
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 10:18:18 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 10:18:18 +0000
commit8f0b97043bf4c0dde04805ded9ba11fd923419ca (patch)
tree71ed941d427ca5077b761de4cff106d23611e0e9 /methods
parentAdding upstream version 2.7.14. (diff)
downloadapt-8f0b97043bf4c0dde04805ded9ba11fd923419ca.tar.xz
apt-8f0b97043bf4c0dde04805ded9ba11fd923419ca.zip
Adding upstream version 2.9.0.upstream/2.9.0
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'methods')
-rw-r--r--methods/gpgv.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index e465c35..20ef286 100644
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -253,7 +253,14 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
auto const asserted = atoi(tokens[1].c_str());
auto const pkstr = tokens[2];
if (not asserted)
- Signers.SoonWorthless.push_back({fpr, pkstr});
+ {
+ std::string reason;
+ strprintf(reason, _("untrusted public key algorithm: %s"), pkstr.c_str());
+ Signers.Worthless.push_back({fpr, reason});
+ Signers.Good.erase(std::remove_if(Signers.Good.begin(), Signers.Good.end(), [&](std::string const &goodsig)
+ { return IsTheSameKey(fpr, goodsig); }),
+ Signers.Good.end());
+ }
}
else if (strncmp(buffer, GNUPGGOODSIG, sizeof(GNUPGGOODSIG)-1) == 0)
PushEntryWithKeyID(Signers.Good, buffer, Debug);