mirror of
https://github.com/ibm-s390-linux/s390-tools.git
synced 2026-08-05 02:14:52 +00:00
For supporting integrity protected volumes with dm-integrity, cryptsetup of version 2.8.2 or later is required. Make cryptsetup of version 2.8.2 a build requirement for zkey, not only for zkey-cryptsetup. Although zkey could be built with an older cryptsetup version, the commands that it generates might not work with older cryptsetup versions. This makes the compile switch HAVE_LUKS2_SUPPORT superfluous, since cryptsetup v2.8.2 always includes LUKS2 support. Remove the ifdefs from the code and update the man pages to not mention LUKS2 support. Also, starting with cryptsetup version 2.5.0 the luksFormat command accepts option '--volume-key-file' to specify the volume key file instead of --master-key-file'. Thus, use '--volume-key-file' in cryptsetup commands generated by zkey. Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com> Reviewed-by: Finn Callies <fcallies@linux.ibm.com> Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
4.8 KiB
4.8 KiB