V8.00.000.2025.06.17

Signed-off-by: Marc S. Weidner <msw@coresecret.dev>

func/partitioning/3210_benchmarking_encryption.sh

@@ -13,15 +13,41 @@
 guard_sourcing
 
 #######################################
-# Benchmark cryptsetup KDF to determine pbkdf-memory and pbkdf-force-iterations
+# Benchmark cryptsetup KDF to determine pbkdf-memory and pbkdf-force-iterations for given pbkdf-threads.
+# Globals:
+#   VAR_ITER_TIME
+#   VAR_KDF_ITERATIONS
+#   VAR_KDF_MEMORY
+#   VAR_KDF_THREADS
+#   VAR_RECIPE_STRING
+#   VAR_SETUP_PART
 # Arguments:
 #   None
 # Returns:
 #   0: on success
 #######################################
 benchmarking_encryption() {
+  declare var_result=""
+  # shellcheck disable=SC2155
+  declare -girx VAR_KDF_THREADS=$(yq_val ".recipe.${VAR_RECIPE_STRING}.control.kdf.threads" "${VAR_SETUP_PART}")
+  # shellcheck disable=SC2155
+  declare -girx VAR_ITER_TIME=$(yq_val ".recipe.${VAR_RECIPE_STRING}.control.kdf.time"      "${VAR_SETUP_PART}")
+
+  echo "BENCHMARK CRYPTSETUP ARGON2ID KDF PARAMETER"
+  # shellcheck disable=SC2312
+  var_result=$(cryptsetup benchmark --pbkdf argon2id --iter-time "${VAR_ITER_TIME:-3000}" --pbkdf-parallel "${VAR_KDF_THREADS:-1}" 2>/dev/null \
+    | grep -E '^argon2id[[:space:]]+[0-9]+[[:space:]]+iterations')
+
+  echo "${var_result}"
+
+  do_log "info" "file_only" "3210() [cryptsetup benchmark --pbkdf argon2id --iter-time ${VAR_ITER_TIME:-3000} --pbkdf-parallel ${VAR_KDF_THREADS:-1}]."
+  do_log "info" "file_only" "3210() Results: [${var_result}]."
+
+  # shellcheck disable=SC2155
+  declare -girx VAR_KDF_ITERATIONS=$(awk '{print $2}' <<<"${var_result}")
+  # shellcheck disable=SC2155
+  declare -girx VAR_KDF_MEMORY=$(awk -F'[ ,]+' '{print $4}' <<<"${var_result}")
 
-  :
   return 0
 }
 # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh

func/partitioning/3220_partition_encryption.sh

@@ -17,12 +17,18 @@ guard_sourcing
 # Globals:
 #   DIR_BAK
 #   DIR_CNF
+#   DIR_LOG
 #   HMP_EPHEMERAL_DEV
 #   HMP_EPHEMERAL_ENCLABEL
 #   HMP_EPHEMERAL_FS_LABEL
 #   HMP_PATH_ENCLABEL
 #   HMP_PATH_LUKSUUID
+#   VAR_CRYPT_RECOVERY
 #   VAR_CRYPT_ROOT
+#   VAR_ITER_TIME
+#   VAR_KDF_ITERATIONS
+#   VAR_KDF_MEMORY
+#   VAR_KDF_THREADS
 #   VAR_RECIPE_STRING
 #   VAR_SETUP_PART
 # Arguments:
@@ -35,7 +41,7 @@ partition_encryption() {
   declare -Ag HMP_EPHEMERAL_DEV HMP_EPHEMERAL_ENCLABEL HMP_EPHEMERAL_FS_LABEL HMP_PATH_LUKSUUID HMP_PATH_ENCLABEL
   declare var_dev var_part \
     var_encryption_enable var_encryption_ephemeral var_encryption_integrity var_encryption_cipher \
-    var_encryption_hash var_encryption_iter var_encryption_key var_encryption_label var_encryption_meta var_encryption_cores \
+    var_encryption_hash var_encryption_key var_encryption_label var_encryption_meta \
     var_encryption_slot var_encryption_pbkdf var_encryption_rng var_filesystem_label var_mount_path var_uuid var_fs
   declare -a ary_devs=() ary_parts=() ary_luks_opts=()
 
@@ -58,12 +64,10 @@ partition_encryption() {
       var_encryption_integrity=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.encryption.integrity" "${VAR_SETUP_PART}")
       var_encryption_cipher=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.encryption.cipher"       "${VAR_SETUP_PART}")
       var_encryption_hash=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.encryption.hash"           "${VAR_SETUP_PART}")
-      var_encryption_iter=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.encryption.itertime"       "${VAR_SETUP_PART}")
       var_encryption_key=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.encryption.key"             "${VAR_SETUP_PART}")
       var_encryption_slot=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.encryption.keyslotssize"   "${VAR_SETUP_PART}")
       var_encryption_meta=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.encryption.metadatasize"   "${VAR_SETUP_PART}")
       var_encryption_pbkdf=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.encryption.pbkdf"         "${VAR_SETUP_PART}")
-      var_encryption_cores=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.encryption.pbkdfparallel" "${VAR_SETUP_PART}")
       var_encryption_rng=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.encryption.rng"             "${VAR_SETUP_PART}")
       var_fs=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.version"                     "${VAR_SETUP_PART}")
       var_mount_path=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.mount.path"                     "${VAR_SETUP_PART}")
@@ -78,19 +82,23 @@ partition_encryption() {
         ary_luks_opts=( --key-file "${DIR_CNF}/password_luks_boot.txt" )
       else
         ary_luks_opts=( --key-file "${DIR_CNF}/password_luks_common.txt" )
+        ary_luks_opts+=(
+          --pbkdf-parallel "${VAR_KDF_THREADS:-1}"
+          --pbkdf-memory "${VAR_KDF_MEMORY:-4}"
+        )
       fi
 
       ary_luks_opts+=(
         --type luks2
         --cipher "${var_encryption_cipher:-aes-xts-plain64}"
         --hash "${var_encryption_hash:-sha512}"
-        --iter-time "${var_encryption_iter:-3000}"
+        --iter-time "${VAR_ITER_TIME:-3000}"
         --key-size "${var_encryption_key:-512}"
         --label "${var_encryption_label}"
         --luks2-keyslots-size "${var_encryption_slot:-16777216}"
         --luks2-metadata-size "${var_encryption_meta:-4194304}"
         --pbkdf "${var_encryption_pbkdf:-argon2id}"
-        --pbkdf-parallel "${var_encryption_cores:-1}"
+        --pbkdf-force-iterations "${VAR_KDF_ITERATIONS:-4}"
         "--${var_encryption_rng}"
         --batch-mode
         --verbose

func/partitioning/3290_uuid_logger.sh

@@ -25,27 +25,29 @@ guard_sourcing
 #   0: on success
 #######################################
 uuid_logger() {
-  declare var_key var_mountpoint var_uuid
-  printf 'UUID Partition:\n' >> "${LOG_UID}"
+  declare var_key="" var_mountpoint="" var_uuid=""
+
+  printf 'PARTITION UUID Partition:\n' >> "${LOG_UID}"
   for var_key in "${!HMP_PATH_PARTUUID[@]}"; do
-    ### Remove Prefix "UUID_"
+    ### Remove Prefix "PARTUUID_"
+    var_mountpoint="${var_key#PARTUUID_}"
+    var_uuid="${HMP_PATH_PARTUUID[${var_key}]}"
+    ### Left-aligned field width 63; "UUID=" starts directly after column 64.
+    printf '%-63sUUID=%s\n' "${var_mountpoint}:" "${var_uuid}" >> "${LOG_UID}"
+  done
+
+  printf '\n' >> "${LOG_UID}"
+  printf 'LUKS CONTAINER UUID:\n' >> "${LOG_UID}"
+  for var_key in "${!HMP_PATH_LUKSUUID[@]}"; do
+    ### Remove Prefix "PARTUUID_"
     var_mountpoint="${var_key#UUID_}"
-    var_uuid="${HMP_PATH_PARTUUID[${var_key}]}"
+    var_uuid="${HMP_PATH_LUKSUUID[${var_key}]}"
     ### Left-aligned field width 63; "UUID=" starts directly after column 64.
     printf '%-63sUUID=%s\n' "${var_mountpoint}:" "${var_uuid}" >> "${LOG_UID}"
   done
 
   printf '\n' >> "${LOG_UID}"
-  printf 'UUID LUKS Container:\n' >> "${LOG_UID}"
-  for var_key in "${!HMP_PATH_ENCLABEL[@]}"; do
-    var_mountpoint="${HMP_PATH_ENCLABEL[${var_key}]}"
-    var_uuid="${HMP_PATH_PARTUUID[${var_key}]}"
-    ### Left-aligned field width 63; "UUID=" starts directly after column 64.
-    printf '%-63sUUID=%s\n' "${var_mountpoint}:" "${var_uuid}" >> "${LOG_UID}"
-  done
-
-  printf '\n' >> "${LOG_UID}"
-  printf 'UUID Filesystem:\n' >> "${LOG_UID}"
+  printf 'FILESYSTEM UUID:\n' >> "${LOG_UID}"
   for var_key in "${!HMP_PATH_FSUUID[@]}"; do
     ### Remove Prefix "UUID_"
     var_mountpoint="${var_key#UUID_}"