diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2024-02-28 16:52:33 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2024-02-28 18:22:01 +0100 |
| commit | 8a14c18c5b487139948dcb22abd37bffdd9cf5f4 (patch) | |
| tree | 5dd144ea620747dbc6c18b05ea27da56a076e111 | |
| parent | 50e3fee26ae843a812b1c9ec8531946931773fd3 (diff) | |
Rename 'weak digest algorithm' to 'weak algorithm'
This allows us to render public key algorithms as weak as well.
| -rw-r--r-- | methods/gpgv.cc | 2 | ||||
| -rwxr-xr-x | test/integration/test-method-gpgv | 4 | ||||
| -rwxr-xr-x | test/integration/test-releasefile-verification | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 8b365b6d4..20ef2861d 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -562,7 +562,7 @@ bool GPGVMethod::URIAcquire(std::string const &Message, FetchItem *Itm) { std::string msg; // TRANSLATORS: The second %s is the reason and is untranslated for repository owners. - strprintf(msg, _("Signature by key %s uses weak digest algorithm (%s)"), Signer.key.c_str(), Signer.note.c_str()); + strprintf(msg, _("Signature by key %s uses weak algorithm (%s)"), Signer.key.c_str(), Signer.note.c_str()); Warning(std::move(msg)); } } diff --git a/test/integration/test-method-gpgv b/test/integration/test-method-gpgv index 4fd72d256..0f014e3d1 100755 --- a/test/integration/test-method-gpgv +++ b/test/integration/test-method-gpgv @@ -71,10 +71,10 @@ testrun() { testgpgv 'Weak signed with long keyid' 'Good: GOODSIG 5A90D141DBAC8DAE' '34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE!' '[GNUPG:] GOODSIG 5A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) <joe@example.org> [GNUPG:] VALIDSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE 2016-09-01 1472742625 0 4 0 1 2 00 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE' - testsuccess grep '^Message: Signature by key 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE uses weak digest algorithm (SHA1)$' method.output + testsuccess grep '^Message: Signature by key 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE uses weak algorithm (SHA1)$' method.output testgpgv 'Weak signed with fingerprint' 'Good: GOODSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE' '34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE!' '[GNUPG:] GOODSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) <joe@example.org> [GNUPG:] VALIDSIG 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE 2016-09-01 1472742625 0 4 0 1 2 00 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE' - testsuccess grep '^Message: Signature by key 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE uses weak digest algorithm (SHA1)$' method.output + testsuccess grep '^Message: Signature by key 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE uses weak algorithm (SHA1)$' method.output testgpgv 'No Pubkey with long keyid' 'NoPubKey: NO_PUBKEY E8525D47528144E2' '' '[GNUPG:] ERRSIG E8525D47528144E2 1 11 00 1472744666 9 [GNUPG:] NO_PUBKEY E8525D47528144E2' diff --git a/test/integration/test-releasefile-verification b/test/integration/test-releasefile-verification index 5f873b82c..810427620 100755 --- a/test/integration/test-releasefile-verification +++ b/test/integration/test-releasefile-verification @@ -465,7 +465,7 @@ successfulaptgetupdate() { if [ -n "$1" ]; then testsuccess grep "$1" rootdir/tmp/testwarning.output fi - testsuccess grep 'uses weak digest algorithm' rootdir/tmp/testwarning.output + testsuccess grep 'uses weak algorithm' rootdir/tmp/testwarning.output } runtest3 'Weak' |