61 lines
1.6 KiB
Diff
61 lines
1.6 KiB
Diff
From 4e98b65c04b624888b39216c81da17b2d0aedfb8 Mon Sep 17 00:00:00 2001
|
|
From: Ondrej Kozina <okozina@redhat.com>
|
|
Date: Thu, 6 Jan 2022 14:28:36 +0100
|
|
Subject: [PATCH 15/28] Move requirement helpers for later changes.
|
|
|
|
---
|
|
lib/luks2/luks2_json_metadata.c | 30 +++++++++++++++---------------
|
|
1 file changed, 15 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/lib/luks2/luks2_json_metadata.c b/lib/luks2/luks2_json_metadata.c
|
|
index 6071b077..e45a9739 100644
|
|
--- a/lib/luks2/luks2_json_metadata.c
|
|
+++ b/lib/luks2/luks2_json_metadata.c
|
|
@@ -591,6 +591,21 @@ static bool validate_segment_intervals(struct crypt_device *cd,
|
|
return true;
|
|
}
|
|
|
|
+static int reqs_unknown(uint32_t reqs)
|
|
+{
|
|
+ return reqs & CRYPT_REQUIREMENT_UNKNOWN;
|
|
+}
|
|
+
|
|
+static int reqs_reencrypt(uint32_t reqs)
|
|
+{
|
|
+ return reqs & CRYPT_REQUIREMENT_OFFLINE_REENCRYPT;
|
|
+}
|
|
+
|
|
+static int reqs_reencrypt_online(uint32_t reqs)
|
|
+{
|
|
+ return reqs & CRYPT_REQUIREMENT_ONLINE_REENCRYPT;
|
|
+}
|
|
+
|
|
static int hdr_validate_segments(struct crypt_device *cd, json_object *hdr_jobj)
|
|
{
|
|
json_object *jobj_segments, *jobj_digests, *jobj_offset, *jobj_size, *jobj_type, *jobj_flags, *jobj;
|
|
@@ -1138,21 +1153,6 @@ int LUKS2_hdr_backup(struct crypt_device *cd, struct luks2_hdr *hdr,
|
|
return r;
|
|
}
|
|
|
|
-static int reqs_unknown(uint32_t reqs)
|
|
-{
|
|
- return reqs & CRYPT_REQUIREMENT_UNKNOWN;
|
|
-}
|
|
-
|
|
-static int reqs_reencrypt(uint32_t reqs)
|
|
-{
|
|
- return reqs & CRYPT_REQUIREMENT_OFFLINE_REENCRYPT;
|
|
-}
|
|
-
|
|
-static int reqs_reencrypt_online(uint32_t reqs)
|
|
-{
|
|
- return reqs & CRYPT_REQUIREMENT_ONLINE_REENCRYPT;
|
|
-}
|
|
-
|
|
int LUKS2_hdr_restore(struct crypt_device *cd, struct luks2_hdr *hdr,
|
|
const char *backup_file)
|
|
{
|
|
--
|
|
2.27.0
|
|
|