eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-13 20:00:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename LUKS2_reencrypt_status to LUKS2_reencrypt_get_params to avoid confusion.

Browse Source
This commit is contained in:
Milan Broz
2020-07-04 12:23:07 +02:00
parent 3e0e5bac2a
commit d95472e757
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/luks2/luks2.h
View File

@@ -419,7 +419,7 @@ int LUKS2_reencrypt_locked_recovery_by_passphrase(struct crypt_device *cd,
void LUKS2_reencrypt_free(struct crypt_device *cd, void LUKS2_reencrypt_free(struct crypt_device *cd,
struct luks2_reenc_context *rh); struct luks2_reenc_context *rh);
crypt_reencrypt_info LUKS2_reencrypt_status(struct crypt_device *cd, crypt_reencrypt_info LUKS2_reencrypt_get_params(struct luks2_hdr *hdr,
struct crypt_params_reencrypt *params); struct crypt_params_reencrypt *params);
int LUKS2_reencrypt_lock(struct crypt_device *cd, int LUKS2_reencrypt_lock(struct crypt_device *cd,

4
lib/luks2/luks2_reencrypt.c
View File

@@ -3530,10 +3530,10 @@ err:
return r < 0 ? r : keyslot; return r < 0 ? r : keyslot;
} }
crypt_reencrypt_info LUKS2_reencrypt_status(struct crypt_device *cd, struct crypt_params_reencrypt *params) crypt_reencrypt_info LUKS2_reencrypt_get_params(struct luks2_hdr *hdr,
struct crypt_params_reencrypt *params)
{ {
crypt_reencrypt_info ri; crypt_reencrypt_info ri;
struct luks2_hdr *hdr = crypt_get_hdr(cd, CRYPT_LUKS2);
ri = LUKS2_reenc_status(hdr); ri = LUKS2_reenc_status(hdr);
if (ri == CRYPT_REENCRYPT_NONE || ri == CRYPT_REENCRYPT_INVALID || !params) if (ri == CRYPT_REENCRYPT_NONE || ri == CRYPT_REENCRYPT_INVALID || !params)

2
lib/setup.c
View File

@@ -6039,7 +6039,7 @@ crypt_reencrypt_info crypt_reencrypt_status(struct crypt_device *cd,
if (_onlyLUKS2(cd, CRYPT_CD_QUIET, CRYPT_REQUIREMENT_ONLINE_REENCRYPT)) if (_onlyLUKS2(cd, CRYPT_CD_QUIET, CRYPT_REQUIREMENT_ONLINE_REENCRYPT))
return CRYPT_REENCRYPT_INVALID; return CRYPT_REENCRYPT_INVALID;
return LUKS2_reencrypt_status(cd, params); return LUKS2_reencrypt_get_params(&cd->u.luks2.hdr, params);
} }
static void __attribute__((destructor)) libcryptsetup_exit(void) static void __attribute__((destructor)) libcryptsetup_exit(void)