On Fri, Dec 04, 2020 at 10:43:43AM -0600, Glenn Washburn wrote: > Reviewed-by: Daniel Kiper <daniel.ki...@oracle.com> > Signed-off-by: Glenn Washburn <developm...@efficientek.com>
Reviewed-by: Patrick Steinhardt <p...@pks.im>
> ---
> grub-core/disk/luks2.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c
> index 499c9330b..2335ded77 100644
> --- a/grub-core/disk/luks2.c
> +++ b/grub-core/disk/luks2.c
> @@ -282,8 +282,8 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k,
> grub_luks2_digest_t *d, grub_luks2_s
> {
> if (grub_json_getchild (&digest, &digests, i) ||
> grub_json_getuint64 (&d->json_slot_key, &digest, NULL) ||
> - grub_json_getchild (&digest, &digest, 0) ||
> - luks2_parse_digest (d, &digest))
> + grub_json_getchild (&digest, &digest, 0) ||
> + luks2_parse_digest (d, &digest))
> return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse digest index
> %"PRIuGRUB_SIZE, i);
>
> if ((d->keyslots & (1 << k->json_slot_key)))
> @@ -301,7 +301,7 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k,
> grub_luks2_digest_t *d, grub_luks2_s
> if (grub_json_getchild (&segment, &segments, i) ||
> grub_json_getuint64 (&s->json_slot_key, &segment, NULL) ||
> grub_json_getchild (&segment, &segment, 0) ||
> - luks2_parse_segment (s, &segment))
> + luks2_parse_segment (s, &segment))
> return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse segment
> index %"PRIuGRUB_SIZE, i);
>
> if ((d->segments & (1 << s->json_slot_key)))
> @@ -625,7 +625,7 @@ luks2_recover_key (grub_disk_t source,
> {
> grub_dprintf ("luks2", "Ignoring keyslot \"%"PRIuGRUB_UINT64_T"\" due
> to priority\n", keyslot.json_slot_key);
> continue;
> - }
> + }
>
> grub_dprintf ("luks2", "Trying keyslot \"%"PRIuGRUB_UINT64_T"\"\n",
> keyslot.json_slot_key);
>
> --
> 2.27.0
>
signature.asc
Description: PGP signature
_______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel
