diff --git a/ChangeLog b/ChangeLog index 99cbc0ab1..cdf079ce9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-02-01 Vladimir Serbinenko + + * grub-core/fs/zfs/zfscrypt.c: Add link to documentation. + 2012-02-01 Vladimir Serbinenko * grub-core/commands/videotest.c (grub_cmd_videotest): Fix subset diff --git a/grub-core/fs/zfs/zfscrypt.c b/grub-core/fs/zfs/zfscrypt.c index 63380f66a..f8815c918 100644 --- a/grub-core/fs/zfs/zfscrypt.c +++ b/grub-core/fs/zfs/zfscrypt.c @@ -44,6 +44,11 @@ GRUB_MOD_LICENSE ("GPLv3+"); +/* + Mostly based on following article: + https://blogs.oracle.com/darren/entry/zfs_encryption_what_is_on + */ + enum grub_zfs_algo { GRUB_ZFS_ALGO_CCM,