Blame SOURCES/volume_key-0.3.11-support_LUKS_all.patch
|
 |
ed0ec4 |
From d0aa966c014d8301371e693966dcac3d9e9c0ccd Mon Sep 17 00:00:00 2001
|
|
|
ed0ec4 |
From: Vojtech Trefny <vtrefny@redhat.com>
|
|
|
ed0ec4 |
Date: Mon, 10 Sep 2018 13:07:41 +0200
|
|
|
ed0ec4 |
Subject: [PATCH] Add suppport for opening LUKS2 devices
|
|
|
ed0ec4 |
|
|
|
ed0ec4 |
---
|
|
|
ed0ec4 |
lib/volume_luks.c | 6 +++++-
|
|
|
ed0ec4 |
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
ed0ec4 |
|
|
|
ed0ec4 |
diff --git a/lib/volume_luks.c b/lib/volume_luks.c
|
|
|
ed0ec4 |
index f4bf2c8..d1c5d47 100644
|
|
|
ed0ec4 |
--- a/lib/volume_luks.c
|
|
|
ed0ec4 |
+++ b/lib/volume_luks.c
|
|
|
ed0ec4 |
@@ -30,6 +30,10 @@ Author: Miloslav Trmač <mitr@redhat.com> */
|
|
|
ed0ec4 |
#include "volume.h"
|
|
|
ed0ec4 |
#include "volume_luks.h"
|
|
|
ed0ec4 |
|
|
|
ed0ec4 |
+#ifndef CRYPT_LUKS
|
|
|
ed0ec4 |
+#define CRYPT_LUKS NULL
|
|
|
ed0ec4 |
+#endif
|
|
|
ed0ec4 |
+
|
|
|
ed0ec4 |
/* LUKS - specific code */
|
|
|
ed0ec4 |
|
|
|
ed0ec4 |
/* Return an error message for ERR_NO, for g_free (). */
|
|
|
ed0ec4 |
@@ -105,7 +109,7 @@ open_crypt_device (const char *path, char **last_log_entry, GError **error)
|
|
|
ed0ec4 |
if (r < 0)
|
|
|
ed0ec4 |
goto err;
|
|
|
ed0ec4 |
crypt_set_log_callback(cd, record_cryptsetup_log_entry, last_log_entry);
|
|
|
ed0ec4 |
- r = crypt_load (cd, CRYPT_LUKS1, NULL);
|
|
|
ed0ec4 |
+ r = crypt_load (cd, CRYPT_LUKS, NULL);
|
|
|
ed0ec4 |
if (r < 0)
|
|
|
ed0ec4 |
goto err_cd;
|
|
|
ed0ec4 |
return cd;
|
|
|
ed0ec4 |
--
|
|
|
ed0ec4 |
2.17.1
|
|
|
ed0ec4 |
|