Question about GRUB/GELI support

[Kris Moore]

Hey, quick question about GRUB's support for GELI. We are using it to
boot Free/PC-BSD with GELI v5, and it works great there. However FreeBSD
updated their geli implementation very slightly to v7, which only
changes which part of the master key is used for encrypt / decrypt.

https://github.com/freebsd/freebsd/commit/38de8ef1dd0e468ff1e3ec1c431f465e270beba3

I think the line in GRUB that needs tweaking is on or around 440 of
grub-core/disk/geli.c, where it calls grub_crypto_pbkdf2 (dev->hash.....
I'm having trouble figuring out which part of that would be the
equivalent of Freebsd's mkey -> ekey change, or if that data is even
exposed in GRUB's version. Any tips or pointers?

I'm also doing some other patches to GRUB so we can pass the GELI key as
a variable to the kernel, skipping the prompting at mount-root. That
seems to work well, but I wanted to see if I could knock out both fixes
at the same time. Once its done, I'll be happy to forward the patch for
upstream inclusion.

Thanks!

-- 
Kris Moore
PC-BSD Software
iXsystems