diff --git a/lib/luks2/luks2.h b/lib/luks2/luks2.h index bf2e4c2a..32cf4f87 100644 --- a/lib/luks2/luks2.h +++ b/lib/luks2/luks2.h @@ -130,7 +130,6 @@ struct luks2_keyslot_params { } area; }; -crypt_reencrypt_info LUKS2_reenc_status(struct luks2_hdr *hdr); /* * Supportable header sizes (hdr_disk + JSON area) * Also used as offset for the 2nd header. @@ -419,6 +418,8 @@ int LUKS2_reencrypt_locked_recovery_by_passphrase(struct crypt_device *cd, void LUKS2_reencrypt_free(struct crypt_device *cd, struct luks2_reenc_context *rh); +crypt_reencrypt_info LUKS2_reencrypt_status(struct luks2_hdr *hdr); + crypt_reencrypt_info LUKS2_reencrypt_get_params(struct luks2_hdr *hdr, struct crypt_params_reencrypt *params); diff --git a/lib/luks2/luks2_json_metadata.c b/lib/luks2/luks2_json_metadata.c index 017da296..1ac751ee 100644 --- a/lib/luks2/luks2_json_metadata.c +++ b/lib/luks2/luks2_json_metadata.c @@ -1779,7 +1779,7 @@ uint64_t LUKS2_get_data_offset(struct luks2_hdr *hdr) crypt_reencrypt_info ri; json_object *jobj; - ri = LUKS2_reenc_status(hdr); + ri = LUKS2_reencrypt_status(hdr); if (ri == CRYPT_REENCRYPT_CLEAN || ri == CRYPT_REENCRYPT_CRASH) { jobj = LUKS2_get_segment_by_flag(hdr, "backup-final"); if (jobj) @@ -1807,7 +1807,7 @@ const char *LUKS2_get_cipher(struct luks2_hdr *hdr, int segment) return json_segment_get_cipher(jobj_segment) ?: "null"; } -crypt_reencrypt_info LUKS2_reenc_status(struct luks2_hdr *hdr) +crypt_reencrypt_info LUKS2_reencrypt_status(struct luks2_hdr *hdr) { uint32_t reqs; diff --git a/lib/luks2/luks2_reencrypt.c b/lib/luks2/luks2_reencrypt.c index 67ca5b71..7af68210 100644 --- a/lib/luks2/luks2_reencrypt.c +++ b/lib/luks2/luks2_reencrypt.c @@ -2629,7 +2629,7 @@ static int reencrypt_load(struct crypt_device *cd, struct luks2_hdr *hdr, { int r; struct luks2_reenc_context *tmp = NULL; - crypt_reencrypt_info ri = LUKS2_reenc_status(hdr); + crypt_reencrypt_info ri = LUKS2_reencrypt_status(hdr); if (ri == CRYPT_REENCRYPT_CLEAN) r = reencrypt_load_clean(cd, hdr, device_size, &tmp, params); @@ -2720,7 +2720,7 @@ static int reencrypt_lock_and_verify(struct crypt_device *cd, struct luks2_hdr * crypt_reencrypt_info ri; struct crypt_lock_handle *h; - ri = LUKS2_reenc_status(hdr); + ri = LUKS2_reencrypt_status(hdr); if (ri == CRYPT_REENCRYPT_INVALID) { log_err(cd, _("Failed to get reencryption state.")); return -EINVAL; @@ -2746,7 +2746,7 @@ static int reencrypt_lock_and_verify(struct crypt_device *cd, struct luks2_hdr * return r; } - ri = LUKS2_reenc_status(hdr); + ri = LUKS2_reencrypt_status(hdr); if (ri == CRYPT_REENCRYPT_CLEAN) { *reencrypt_lock = h; return 0; @@ -2948,7 +2948,7 @@ static int reencrypt_recovery_by_passphrase(struct crypt_device *cd, return r; } - ri = LUKS2_reenc_status(hdr); + ri = LUKS2_reencrypt_status(hdr); if (ri == CRYPT_REENCRYPT_INVALID) { LUKS2_reencrypt_unlock(cd, reencrypt_lock); return -EINVAL; @@ -3001,7 +3001,7 @@ static int reencrypt_init_by_passphrase(struct crypt_device *cd, if (r) return r; - ri = LUKS2_reenc_status(hdr); + ri = LUKS2_reencrypt_status(hdr); if (ri == CRYPT_REENCRYPT_INVALID) { device_write_unlock(cd, crypt_metadata_device(cd)); return -EINVAL; @@ -3341,7 +3341,7 @@ int crypt_reencrypt(struct crypt_device *cd, hdr = crypt_get_hdr(cd, CRYPT_LUKS2); - ri = LUKS2_reenc_status(hdr); + ri = LUKS2_reencrypt_status(hdr); if (ri > CRYPT_REENCRYPT_CLEAN) { log_err(cd, _("Cannot proceed with reencryption. Unexpected reencryption status.")); return -EINVAL; @@ -3430,7 +3430,7 @@ err: */ int LUKS2_reencrypt_data_offset(struct luks2_hdr *hdr, bool blockwise) { - crypt_reencrypt_info ri = LUKS2_reenc_status(hdr); + crypt_reencrypt_info ri = LUKS2_reencrypt_status(hdr); uint64_t data_offset = LUKS2_get_data_offset(hdr); if (ri == CRYPT_REENCRYPT_CLEAN && reencrypt_direction(hdr) == CRYPT_REENCRYPT_FORWARD) @@ -3535,7 +3535,7 @@ crypt_reencrypt_info LUKS2_reencrypt_get_params(struct luks2_hdr *hdr, { crypt_reencrypt_info ri; - ri = LUKS2_reenc_status(hdr); + ri = LUKS2_reencrypt_status(hdr); if (ri == CRYPT_REENCRYPT_NONE || ri == CRYPT_REENCRYPT_INVALID || !params) return ri; diff --git a/lib/setup.c b/lib/setup.c index 3b176cfa..07402dfd 100644 --- a/lib/setup.c +++ b/lib/setup.c @@ -3919,7 +3919,7 @@ static int _open_all_keys(struct crypt_device *cd, { int r, segment; struct volume_key *_vks = NULL; - crypt_reencrypt_info ri = LUKS2_reenc_status(hdr); + crypt_reencrypt_info ri = LUKS2_reencrypt_status(hdr); segment = (flags & CRYPT_ACTIVATE_ALLOW_UNBOUND_KEY) ? CRYPT_ANY_SEGMENT : CRYPT_DEFAULT_SEGMENT; @@ -3987,7 +3987,7 @@ static int _open_and_activate_reencrypt_device(struct crypt_device *cd, if ((r = crypt_load(cd, CRYPT_LUKS2, NULL))) goto err; - ri = LUKS2_reenc_status(hdr); + ri = LUKS2_reencrypt_status(hdr); if (ri == CRYPT_REENCRYPT_CRASH) { r = LUKS2_reencrypt_locked_recovery_by_passphrase(cd, keyslot, @@ -3998,7 +3998,7 @@ static int _open_and_activate_reencrypt_device(struct crypt_device *cd, } keyslot = r; - ri = LUKS2_reenc_status(hdr); + ri = LUKS2_reencrypt_status(hdr); } /* recovery finished reencryption or it's already finished */ @@ -4053,7 +4053,7 @@ static int _open_and_activate_luks2(struct crypt_device *cd, int r; struct luks2_hdr *hdr = &cd->u.luks2.hdr; - ri = LUKS2_reenc_status(hdr); + ri = LUKS2_reencrypt_status(hdr); if (ri == CRYPT_REENCRYPT_INVALID) return -EINVAL;