From 59e39e484a6bbf78ab53217d191a1add77b6a79e Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Thu, 6 Jan 2022 12:21:23 +0100 Subject: [PATCH] Rename LUKS2_keyslot_reencrypt_create function. The function never writes on-disk. Also removed validation function call-in since it will be called later before writing on-disk and metadata does not have to be complete at the moment of LUKS2_keyslot_reencrypt_allocate call. --- lib/luks2/luks2_internal.h | 2 +- lib/luks2/luks2_keyslot.c | 5 +---- lib/luks2/luks2_reencrypt.c | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/luks2/luks2_internal.h b/lib/luks2/luks2_internal.h index b76b3ae1..de9ba05d 100644 --- a/lib/luks2/luks2_internal.h +++ b/lib/luks2/luks2_internal.h @@ -234,7 +234,7 @@ int LUKS2_keyslot_reencrypt_store(struct crypt_device *cd, const void *buffer, size_t buffer_length); -int LUKS2_keyslot_reencrypt_create(struct crypt_device *cd, +int LUKS2_keyslot_reencrypt_allocate(struct crypt_device *cd, struct luks2_hdr *hdr, int keyslot, const struct crypt_params_reencrypt *params); diff --git a/lib/luks2/luks2_keyslot.c b/lib/luks2/luks2_keyslot.c index 79a8ccaa..e2699c4d 100644 --- a/lib/luks2/luks2_keyslot.c +++ b/lib/luks2/luks2_keyslot.c @@ -605,7 +605,7 @@ int LUKS2_keyslot_open(struct crypt_device *cd, return r; } -int LUKS2_keyslot_reencrypt_create(struct crypt_device *cd, +int LUKS2_keyslot_reencrypt_allocate(struct crypt_device *cd, struct luks2_hdr *hdr, int keyslot, const struct crypt_params_reencrypt *params) @@ -634,9 +634,6 @@ int LUKS2_keyslot_reencrypt_create(struct crypt_device *cd, return r; } - if (LUKS2_hdr_validate(cd, hdr->jobj, hdr->hdr_size - LUKS2_HDR_BIN_LEN)) - return -EINVAL; - return 0; } diff --git a/lib/luks2/luks2_reencrypt.c b/lib/luks2/luks2_reencrypt.c index 946a5b4c..49ed14b9 100644 --- a/lib/luks2/luks2_reencrypt.c +++ b/lib/luks2/luks2_reencrypt.c @@ -2474,7 +2474,7 @@ static int reencrypt_init(struct crypt_device *cd, goto out; } - r = LUKS2_keyslot_reencrypt_create(cd, hdr, reencrypt_keyslot, + r = LUKS2_keyslot_reencrypt_allocate(cd, hdr, reencrypt_keyslot, params); if (r < 0) goto out;