diff options
| author | Julian Andres Klode <jak@debian.org> | 2016-03-14 13:49:25 +0100 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2016-03-14 13:49:25 +0100 |
| commit | 0cbb7e29c5dad2178896d8eaf41ad616bb0111da (patch) | |
| tree | 835796e9b0ceef4668b427c474ac6d7bb8604595 /test/integration | |
| parent | 493a813e8a743cfe763bf5eb18073ef9f51dabc2 (diff) | |
test: Move --weak-digest initialization to the right place
This was wrong and caused some issues because apt-key invoked
host apt-config with our library.
Gbp-Dch: ignore
Diffstat (limited to 'test/integration')
| -rw-r--r-- | test/integration/framework | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/test/integration/framework b/test/integration/framework index 2b7f3f967..b65b0b86f 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -389,9 +389,6 @@ EOF echo "Acquire::https::CaInfo \"${TMPWORKINGDIRECTORY}/rootdir/etc/webserver.pem\";" > rootdir/etc/apt/apt.conf.d/99https echo "Apt::Cmd::Disable-Script-Warning \"1\";" > rootdir/etc/apt/apt.conf.d/apt-binary echo 'Acquire::Connect::AddrConfig "false";' > rootdir/etc/apt/apt.conf.d/connect-addrconfig - if aptkey verify --weak-digest SHA1 --help 2>/dev/null >/dev/null; then - echo 'Acquire::gpgv::Options { "--weak-digest"; "sha1"; };' > rootdir/etc/apt/apt.conf.d/no-sha1 - fi configcompression '.' 'gz' #'bz2' 'lzma' 'xz' confighashes 'SHA256' # these are tests, not security best-practices @@ -411,6 +408,12 @@ EOF unset LANGUAGE APT_CONFIG unset GREP_OPTIONS DEB_BUILD_PROFILES unset http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy + + # If gpgv supports --weak-digest, pass it to make sure we can disable SHA1 + if aptkey verify --weak-digest SHA1 --help 2>/dev/null >/dev/null; then + echo 'Acquire::gpgv::Options { "--weak-digest"; "sha1"; };' > rootdir/etc/apt/apt.conf.d/no-sha1 + fi + msgdone "info" } |