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
s='right' method='get' action='/guix/log/gnu/packages/books.scm'>
<input type='hidden' name='id' value='9eac01173c0664659d73a134fe6489289af0e3d5'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=9eac01173c0664659d73a134fe6489289af0e3d5'>root</a>/<a href='/guix/log/gnu?id=9eac01173c0664659d73a134fe6489289af0e3d5'>gnu</a>/<a href='/guix/log/gnu/packages?id=9eac01173c0664659d73a134fe6489289af0e3d5'>packages</a>/<a href='/guix/log/gnu/packages/books.scm?id=9eac01173c0664659d73a134fe6489289af0e3d5'>books.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/books.scm?id=9eac01173c0664659d73a134fe6489289af0e3d5&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-07-20 12:12:15 +0200'>2024-07-20</span></td><td><a href='/guix/commit/gnu/packages/books.scm?id=3518c01cb01452f753b20872c339206c14019065'>gnu: book-sparc: Update to 2.1.0.</a><span class='msg-avail'>...</span></td><td>Artyom V. Poptsov</td></tr>
<tr><td><span title='2024-01-25 21:34:37 +0000'>2024-01-25</span></td><td><a href='/guix/commit/gnu/packages/books.scm?id=9b657bab84be02935d66483da1ebbe4bc78c52fb'>gnu: Sort inputs in (gnu packages books) alphabetically.</a><span class='msg-avail'>...</span></td><td>Sharlatan Hellseher</td></tr>
<tr><td><span title='2024-01-25 21:34:27 +0000'>2024-01-25</span></td><td><a href='/guix/commit/gnu/packages/books.scm?id=d1951037b4cf424058849f122fa54a4c2de83160'>gnu: book-sparc: Update to 2.0.0.</a><span class='msg-avail'>...</span></td><td>Artyom V. Poptsov</td></tr>
<tr><td><span title='2023-11-23 14:21:00 +0000'>2023-11-23</span></td><td><a href='/guix/commit/gnu/packages/books.scm?id=8960eb027834be3e2d415b584aa74b9d8d9251dd'>gnu: book-sparc: Update to 1.1.0.</a><span class='msg-avail'>...</span></td><td>Artyom V. Poptsov</td></tr>