diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2024-12-04 09:56:58 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2024-12-04 10:14:44 +0100 |
| commit | 48e5af8b5df391e62657b604b2b54885f7ce1c02 (patch) | |
| tree | 45a9dd463e425b0318e1f51cbdf006210a9b0b07 /test | |
| parent | 8f317d97c9fb821e839342ae445c824207678eb7 (diff) | |
gpgv: Merge all keyrings into a single one again
gpgv is quite picky, it takes at most 40 keyrings but it also doesn't
even take keyrings with : in the name, generating an ERROR message
instead.
So instead let's always merge the configured keyrings for the source
into a single one.
While we are at it, since we are merging now, let's also add some
rudimentary error checking to what we write into the merged keyring:
If copying into it fails, we should abort.
Reported-by: SuShY on IRC
Diffstat (limited to 'test')
| -rwxr-xr-x | test/integration/test-releasefile-verification | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/integration/test-releasefile-verification b/test/integration/test-releasefile-verification index 0109f2954..171792a10 100755 --- a/test/integration/test-releasefile-verification +++ b/test/integration/test-releasefile-verification @@ -231,13 +231,14 @@ runtest() { msgmsg 'Good warm archive signed by' 'Rex Expired' prepare "${PKGFILE}-new" - cp keys/rexexpired.pub rootdir/etc/apt/trusted.gpg.d/rexexpired.gpg + # Use a colon here to test weird filenames too + cp keys/rexexpired.pub rootdir/etc/apt/trusted.gpg.d/rex:expired.gpg signreleasefiles 'Rex Expired' updatewithwarnings '^W: .* EXPKEYSIG' testsuccessequal "$(cat "${PKGFILE}") " aptcache show apt installaptold - rm rootdir/etc/apt/trusted.gpg.d/rexexpired.gpg + rm rootdir/etc/apt/trusted.gpg.d/rex:expired.gpg msgmsg 'Good warm archive signed by' 'Joe Sixpack' prepare "${PKGFILE}-new" |