Merge branch 'main' into 'main'

julian-klode · julian-klode · commit f26a15a3f9b0 · 2023-07-11T13:49:18.000Z
Do not fail on systems running in FIPSmode.

See merge request apt-team/apt!295
diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
@@ -330,6 +330,9 @@ class PrivateHashes {
 	    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
@@ -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],

Original file line number	Diff line number	Diff line change
`@@ -330,6 +330,9 @@ class PrivateHashes {`
`330`	`330`	`exit(2);`
`331`	`331`	`}`
`332`	`332`
	`333`	`+ // It is OK for apt to use MD5.`
	`334`	`+ gcry_control(GCRYCTL_NO_FIPS_MODE, 0);`
	`335`	`+`
`333`	`336`	`gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);`
`334`	`337`	`}`
`335`	`338`	`}`