diff options
| author | Sam Bingner <sam@bingner.com> | 2019-12-26 15:19:05 -1000 |
|---|---|---|
| committer | Sam Bingner <sam@bingner.com> | 2019-12-26 15:24:16 -1000 |
| commit | 713b65be84830af1a57148b44dc1d1d4010ece3e (patch) | |
| tree | 7656452774b4ce333d514cc0d1ce303a7f9ac997 /methods | |
| parent | 8d1277b777045f45ffae210edea608c27587d7a2 (diff) | |
Revert "Treat SHA1 as Weak rather than untrusted. Add hardcoded exceptions for Modmyi/Zodttd/Bigboss to silence errors"
This reverts commit 0a4d0898091e9a6ff584f14d310a13f61fb3d9a3.
Diffstat (limited to 'methods')
| -rw-r--r-- | methods/gpgv.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/methods/gpgv.cc b/methods/gpgv.cc index e9f3c9d07..f66e3356f 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -68,7 +68,7 @@ struct Digest { static constexpr Digest Digests[] = { {Digest::State::Untrusted, "Invalid digest"}, {Digest::State::Untrusted, "MD5"}, - {Digest::State::Weak, "SHA1"}, + {Digest::State::Untrusted, "SHA1"}, {Digest::State::Untrusted, "RIPE-MD/160"}, {Digest::State::Trusted, "Reserved digest"}, {Digest::State::Trusted, "Reserved digest"}, @@ -233,13 +233,6 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, auto const sig = tokens[0]; // Reject weak digest algorithms Digest digest = FindDigest(tokens[7]); - if (sig == "CFC100B9AA5CDC6430F2E9B5AA011AC1718BABDF" || //ZodTTD - sig == "EB22AD483B83E9A7460D86F387F92E166197E890" || //ModMyi - sig == "A9C96A37115894A23B894107694D17D38764B4F4"){ //BigBoss - if (tokens[7] == "2"){ - digest = {Digest::State::Trusted, "SHA1"}; - } - } switch (digest.getState()) { case Digest::State::Weak: // Treat them like an expired key: For that a message about expiry |