From faafe09bd0f8a1e416e0a5d9e8e18f7b02abce9a Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Fri, 29 Nov 2019 15:45:32 +0100 Subject: [PATCH] Use crypt_volume_key_next where appropriate. --- lib/luks2/luks2_reencrypt.c | 2 +- lib/setup.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/luks2/luks2_reencrypt.c b/lib/luks2/luks2_reencrypt.c index 9cb0b3fc..36f5799a 100644 --- a/lib/luks2/luks2_reencrypt.c +++ b/lib/luks2/luks2_reencrypt.c @@ -3405,7 +3405,7 @@ int LUKS2_reencrypt_locked_recovery_by_passphrase(struct crypt_device *cd, r = LUKS2_volume_key_load_in_keyring_by_digest(cd, hdr, vk, crypt_volume_key_get_id(vk)); if (r < 0) goto err; - vk = vk->next; + vk = crypt_volume_key_next(vk); } if (luks2_check_device_size(cd, hdr, minimal_size, &device_size, true, false)) diff --git a/lib/setup.c b/lib/setup.c index fb79eb11..09d58794 100644 --- a/lib/setup.c +++ b/lib/setup.c @@ -3831,7 +3831,7 @@ static int load_all_keys(struct crypt_device *cd, struct luks2_hdr *hdr, struct r = LUKS2_volume_key_load_in_keyring_by_digest(cd, hdr, vk, crypt_volume_key_get_id(vk)); if (r < 0) return r; - vk = vk->next; + vk = crypt_volume_key_next(vk); } return 0;