1 files changed, 0 insertions, 74 deletions
diff --git a/debian/patches/Check-for-physical-memory-available-also-in-PBKDF-benchma.patch b/debian/patches/Check-for-physical-memory-available-also-in-PBKDF-benchma.patch
deleted file mode 100644
index 2032283..0000000
--- a/debian/patches/Check-for-physical-memory-available-also-in-PBKDF-benchma.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From: Milan Broz <gmazyland@gmail.com>
-Date: Mon, 3 Apr 2023 13:31:16 +0200
-Subject: Check for physical memory available also in PBKDF benchmark.
-
-Origin: https://gitlab.com/cryptsetup/cryptsetup/-/commit/7893c33d71cde09e240234c484c6c468f22c2fe7
-Bug: https://gitlab.com/cryptsetup/cryptsetup/-/issues/802#note_1328592911
-Bug-Debian: https://bugs.debian.org/1028250
----
- lib/internal.h        | 1 +
- lib/utils_benchmark.c | 9 +++++++++
- lib/utils_pbkdf.c     | 4 ++--
- 3 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/lib/internal.h b/lib/internal.h
-index 98095fa..f261cae 100644
---- a/lib/internal.h
-+++ b/lib/internal.h
-@@ -89,6 +89,7 @@ int crypt_benchmark_pbkdf_internal(struct crypt_device *cd,
- 				   struct crypt_pbkdf_type *pbkdf,
- 				   size_t volume_key_size);
- const char *crypt_get_cipher_spec(struct crypt_device *cd);
-+uint32_t pbkdf_adjusted_phys_memory_kb(void);
- 
- /* Device backend */
- struct device;
-diff --git a/lib/utils_benchmark.c b/lib/utils_benchmark.c
-index 728e4df..a0326ce 100644
---- a/lib/utils_benchmark.c
-+++ b/lib/utils_benchmark.c
-@@ -101,6 +101,7 @@ int crypt_benchmark_pbkdf(struct crypt_device *cd,
- {
- 	int r, priority;
- 	const char *kdf_opt;
-+	uint32_t memory_kb;
- 
- 	if (!pbkdf || (!password && password_size))
- 		return -EINVAL;
-@@ -113,6 +114,14 @@ int crypt_benchmark_pbkdf(struct crypt_device *cd,
- 
- 	log_dbg(cd, "Running %s(%s) benchmark.", pbkdf->type, kdf_opt);
- 
-+	memory_kb = pbkdf_adjusted_phys_memory_kb();
-+	if (memory_kb < pbkdf->max_memory_kb) {
-+		log_dbg(cd, "Not enough physical memory detected, "
-+			"PBKDF max memory decreased from %dkB to %dkB.",
-+			pbkdf->max_memory_kb, memory_kb);
-+		pbkdf->max_memory_kb = memory_kb;
-+	}
-+
- 	crypt_process_priority(cd, &priority, true);
- 	r = crypt_pbkdf_perf(pbkdf->type, pbkdf->hash, password, password_size,
- 			     salt, salt_size, volume_key_size, pbkdf->time_ms,
-diff --git a/lib/utils_pbkdf.c b/lib/utils_pbkdf.c
-index d8f41c7..b2d4fa0 100644
---- a/lib/utils_pbkdf.c
-+++ b/lib/utils_pbkdf.c
-@@ -61,7 +61,7 @@ const struct crypt_pbkdf_type *crypt_get_pbkdf_type_params(const char *pbkdf_typ
- 	return NULL;
- }
- 
--static uint32_t adjusted_phys_memory(void)
-+uint32_t pbkdf_adjusted_phys_memory_kb(void)
- {
- 	uint64_t free_kb, memory_kb = crypt_getphysmemory_kb();
- 
-@@ -258,7 +258,7 @@ int init_pbkdf_type(struct crypt_device *cd,
- 	}
- 
- 	if (cd_pbkdf->max_memory_kb) {
--		memory_kb = adjusted_phys_memory();
-+		memory_kb = pbkdf_adjusted_phys_memory_kb();
- 		if (cd_pbkdf->max_memory_kb > memory_kb) {
- 			log_dbg(cd, "Not enough physical memory detected, "
- 				"PBKDF max memory decreased from %dkB to %dkB.",