diff options
| author | Julian Andres Klode <jak@debian.org> | 2023-07-11 13:49:18 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2023-07-11 13:49:18 +0000 |
| commit | f26a15a3f9b020dcd5c5203bd73133c8d647c99c (patch) | |
| tree | 7efb07f6b8924f3269413ead0a15a6dafefadca5 | |
| parent | 7bb2b81090b1a5bd9ebb49a0d9fd5cfd9ddab95f (diff) | |
| parent | 668451def296afeb0c358a7d80ff39dc546defab (diff) | |
Merge branch 'main' into 'main'
Do not fail on systems running in FIPSmode.
See merge request apt-team/apt!295
| -rw-r--r-- | apt-pkg/contrib/hashes.cc | 3 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc index 313b1d37d..80b9bbf3f 100644 --- a/apt-pkg/contrib/hashes.cc +++ b/apt-pkg/contrib/hashes.cc @@ -330,6 +330,9 @@ public: exit(2); } + // It is OK for apt to use MD5. + gcry_control(GCRYCTL_NO_FIPS_MODE, 0); + gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0); } } diff --git a/debian/control b/debian/control index 5768d7301..c831e45bb 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: cmake (>= 3.4), libbz2-dev, libdb-dev, libgnutls28-dev (>= 3.4.6), - libgcrypt20-dev, + libgcrypt20-dev (>=1.10.0), liblz4-dev (>= 0.0~r126), liblzma-dev, libseccomp-dev (>= 2.4.2) [amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x hppa powerpc powerpcspe ppc64 x32], |