Merge pull request #121 from apertussolutions/dmcrypt-update

part2: update dm-crypt parameters

Author: crogers1

part2/stages/Functions/install-main

@@ -222,7 +222,9 @@ install_dom0()
     #
     # config
     #
-    cryptsetup -q -i 600 --cipher=aes-xts-plain64 luksFormat ${config_lv} ${RECOVERY_KEY} >&2 || {
+    cryptsetup -q --cipher=aes-xts-plain64 --hash sha512 \
+               --pbkdf pbkdf2 --pbkdf-force-iterations $(( 1000 * 1000 )) \
+               --type luks2 luksFormat ${config_lv} ${RECOVERY_KEY} >&2 || {
         rm -f ${RECOVERY_KEY}
         set +x
         return 1
@@ -254,12 +256,13 @@ install_dom0()
     # prepare lvm directory to store lvm metadata backups.
     do_cmd mkdir -p -m 755 ${DOM0_MOUNT}/config/etc/lvm     >&2 || return 1
 
+    local CIPHER="--cipher=aes-xts-plain64 --key-size=512"
     #
     # log
     #
     set -x
     local LOG_KEY=$(gen_log_key ${DOM0_MOUNT})
-    cryptsetup -q -d ${LOG_KEY} create log /dev/xenclient/log >&2 || {
+    cryptsetup -q -d ${LOG_KEY} ${CIPHER} create log /dev/xenclient/log >&2 || {
         set +x
         return 1
     }
@@ -268,10 +271,11 @@ install_dom0()
     # cores
     #
     local CORES_KEY=$(gen_cores_key ${DOM0_MOUNT})
-    cryptsetup -q -d ${CORES_KEY} create cores /dev/xenclient/cores >&2 || {
+    cryptsetup -q -d ${CORES_KEY} ${CIPHER} create cores /dev/xenclient/cores >&2 || {
         set +x
         return 1
     }
+    unset CIPHER
 
     # device key (used to tie encrypted disks to this host)
     local DEVICE_KEY=$(gen_device_key ${DOM0_MOUNT})