summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2023-10-04 14:52:29 +0200
committerJulian Andres Klode <julian.klode@canonical.com>2023-10-04 14:52:29 +0200
commitb92934a1904cd6dd1dfdab283d27cd34ca2dbe44 (patch)
tree6efb24d6056c7b549d8fc5de14be51742710483b
parentb24d6a1f3aff12f32f6a7024aac6961089f99719 (diff)
Revert "Do not fail on systems running in FIPSmode."
This reverts commit 668451def296afeb0c358a7d80ff39dc546defab.
-rw-r--r--apt-pkg/contrib/hashes.cc3
-rw-r--r--debian/control2
2 files changed, 1 insertions, 4 deletions
diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
index 80b9bbf3f..313b1d37d 100644
--- a/apt-pkg/contrib/hashes.cc
+++ b/apt-pkg/contrib/hashes.cc
@@ -330,9 +330,6 @@ 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 440b17afb..ddd11b07b 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 (>=1.10.0),
+ libgcrypt20-dev,
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],