summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanno Böck <hanno@gentoo.org>2022-05-17 13:22:45 +0200
committerHanno Böck <hanno@gentoo.org>2022-05-17 13:22:45 +0200
commitfeb6620ced74acd651e5c2442860bcfc73c0210d (patch)
tree4cc144667596c5bed2aefabf88b4d2e48ceb1b19 /sys-auth/pam_mount/files/pam_mount-2.16-crypto-Add-support-for-LUKS2.patch
parentnet-im/gajim: Version bump (diff)
downloadgentoo-feb6620ced74acd651e5c2442860bcfc73c0210d.tar.gz
gentoo-feb6620ced74acd651e5c2442860bcfc73c0210d.tar.bz2
gentoo-feb6620ced74acd651e5c2442860bcfc73c0210d.zip
sys-auth/pam_mount: Remove old versions
Closes: https://bugs.gentoo.org/837983 Signed-off-by: Hanno Böck <hanno@gentoo.org> Package-Manager: Portage-3.0.30, Repoman-3.0.3
Diffstat (limited to 'sys-auth/pam_mount/files/pam_mount-2.16-crypto-Add-support-for-LUKS2.patch')
-rw-r--r--sys-auth/pam_mount/files/pam_mount-2.16-crypto-Add-support-for-LUKS2.patch52
1 files changed, 0 insertions, 52 deletions
diff --git a/sys-auth/pam_mount/files/pam_mount-2.16-crypto-Add-support-for-LUKS2.patch b/sys-auth/pam_mount/files/pam_mount-2.16-crypto-Add-support-for-LUKS2.patch
deleted file mode 100644
index 437f359277d5..000000000000
--- a/sys-auth/pam_mount/files/pam_mount-2.16-crypto-Add-support-for-LUKS2.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From d4434c05e7c0cf05d87089404cfa2deedc60811a Mon Sep 17 00:00:00 2001
-From: Ingo Franzki <ifranzki@linux.ibm.com>
-Date: Mon, 29 Oct 2018 16:47:40 +0100
-Subject: [PATCH] crypto: Add support for LUKS2
-
-Cryptsetup version 2.0 added support for LUKS2.
-This patch adds support for mounting LUKS2 volumes with
-pam_mount.
-
-Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
----
- src/crypto-dmc.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/crypto-dmc.c b/src/crypto-dmc.c
-index d0ab6ca..abd0358 100644
---- a/src/crypto-dmc.c
-+++ b/src/crypto-dmc.c
-@@ -21,6 +21,12 @@
- #include "libcryptmount.h"
- #include "pam_mount.h"
-
-+#ifndef CRYPT_LUKS
-+ #define CRYPT_LUKS NULL /* Passing NULL to crypt_load will
-+ default to LUKS(1) on older
-+ libcryptsetup versions. */
-+#endif
-+
- /**
- * dmc_is_luks - check if @path points to a LUKS volume (cf. normal dm-crypt)
- * @path: path to the crypto container
-@@ -48,7 +54,7 @@ EXPORT_SYMBOL int ehd_is_luks(const char *path, bool blkdev)
-
- ret = crypt_init(&cd, device);
- if (ret == 0) {
-- ret = crypt_load(cd, CRYPT_LUKS1, NULL);
-+ ret = crypt_load(cd, CRYPT_LUKS, NULL);
- if (ret == -EINVAL)
- ret = false;
- else if (ret == 0)
-@@ -106,7 +112,7 @@ static bool dmc_run(const struct ehd_mount_request *req,
- #endif
- }
-
-- ret = crypt_load(cd, CRYPT_LUKS1, NULL);
-+ ret = crypt_load(cd, CRYPT_LUKS, NULL);
- if (ret == 0) {
- ret = crypt_activate_by_passphrase(cd, mt->crypto_name,
- CRYPT_ANY_SLOT, req->key_data, req->key_size, flags);
---
-2.21.0
-