]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
shell-completion: add new Argon2id TPM2 parameters for systemd-cryptenroll 41859/head
authorfuldeka <260289618+fuldeka@users.noreply.github.com>
Fri, 3 Jul 2026 22:02:18 +0000 (00:02 +0200)
committerfuldeka <260289618+fuldeka@users.noreply.github.com>
Sun, 12 Jul 2026 21:31:29 +0000 (23:31 +0200)
shell-completion/bash/systemd-cryptenroll
shell-completion/zsh/_systemd-cryptenroll

index a24d99780281ad750844779a90829996bae704d9..1c8bfee102672a9cbabad12514a8b6b04e56dbd9 100644 (file)
@@ -62,6 +62,10 @@ _systemd_cryptenroll() {
                --tpm2-device
                --tpm2-device-key
                --tpm2-seal-key-handle
+               --tpm2-argon2id-memory
+               --tpm2-argon2id-iter-time
+               --tpm2-argon2id-iterations
+               --tpm2-argon2id-parallelism
                --tpm2-pcrs
                --tpm2-public-key
                --tpm2-public-key-pcrs
@@ -95,7 +99,7 @@ _systemd_cryptenroll() {
                 comps="auto list $(__get_fido2_devices)"
                 ;;
             --fido2-parameters-in-header|--fido2-with-client-pin|--fido2-with-user-presence|--fido2-with-user-verification|--tpm2-with-pin)
-                comps='yes no'
+                comps='yes no direct'
                 ;;
             --tpm2-device)
                 comps="auto list $(__get_tpm2_devices)"
index e41b67ffdcc0113c4f7337d703984ce273cc4b90..87b701e2313e1b9434329d161e920278c202c37a 100644 (file)
@@ -65,10 +65,14 @@ _arguments -s \
     "($enroll)--tpm2-device=[Enroll a TPM2 device or list them]:TPM2 device:_systemd-cryptenroll_tpm2_device auto list" \
     "($enroll)--tpm2-device-key=[Enroll a TPM2 device using its public key]:public key file:_files" \
     '--tpm2-seal-key-handle=[Specify handle of key to use for sealing]:handle:' \
+    '--tpm2-argon2id-memory=[Argon2id memory cost]:memory (bytes):' \
+    '--tpm2-argon2id-iter-time=[Target time for Argon2id benchmark]:time (s):' \
+    '--tpm2-argon2id-iterations=[Argon2id iterations]:iterations:' \
+    '--tpm2-argon2id-parallelism=[Argon2id parallelism]:threads:' \
     '--tpm2-pcrs=[Specify TPM2 PCRs to seal against]:PCRs:' \
     '--tpm2-public-key=[Enroll signed TPM2 PCR policy against PEM public key]:public key file:_files' \
     '--tpm2-public-key-pcrs=[Enroll signed TPM2 PCR policy for specified TPM2 PCRs]:PCRs:' \
     '--tpm2-signature=[Validate public key enrollment works with JSON signature file]:signature file:_files' \
     '--tpm2-pcrlock=[Specify pcrlock policy to lock against]:pcrlock file:_files' \
-    '--tpm2-with-pin=[Whether to require entering a PIN to unlock the volume]:boolean:(yes no)' \
+    '--tpm2-with-pin=[Whether to require entering a PIN to unlock the volume]:mode:(yes no direct)' \
     '*::block device:_systemd-cryptenroll_devices'