Skip to content

Commit 24d8574

Browse files
committed
shell-completion: add new Argon2id TPM2 parameters for systemd-cryptenroll
Add --tpm2-argon2id-memory, --tpm2-argon2id-iterations, --tpm2-argon2id-parallelism, --tpm2-argon2id-iter-time options. Update --tpm2-with-pin completions to include the new "direct" value.
1 parent 86d0884 commit 24d8574

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

shell-completion/bash/systemd-cryptenroll

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ _systemd_cryptenroll() {
6262
--tpm2-device
6363
--tpm2-device-key
6464
--tpm2-seal-key-handle
65+
--tpm2-argon2id-memory
66+
--tpm2-argon2id-iter-time
67+
--tpm2-argon2id-iterations
68+
--tpm2-argon2id-parallelism
6569
--tpm2-pcrs
6670
--tpm2-public-key
6771
--tpm2-public-key-pcrs
@@ -95,7 +99,7 @@ _systemd_cryptenroll() {
9599
comps="auto list $(__get_fido2_devices)"
96100
;;
97101
--fido2-parameters-in-header|--fido2-with-client-pin|--fido2-with-user-presence|--fido2-with-user-verification|--tpm2-with-pin)
98-
comps='yes no'
102+
comps='yes no direct'
99103
;;
100104
--tpm2-device)
101105
comps="auto list $(__get_tpm2_devices)"

shell-completion/zsh/_systemd-cryptenroll

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,14 @@ _arguments -s \
6565
"($enroll)--tpm2-device=[Enroll a TPM2 device or list them]:TPM2 device:_systemd-cryptenroll_tpm2_device auto list" \
6666
"($enroll)--tpm2-device-key=[Enroll a TPM2 device using its public key]:public key file:_files" \
6767
'--tpm2-seal-key-handle=[Specify handle of key to use for sealing]:handle:' \
68+
'--tpm2-argon2id-memory=[Argon2id memory cost]:memory (bytes):' \
69+
'--tpm2-argon2id-iter-time=[Target time for Argon2id benchmark]:time (s):' \
70+
'--tpm2-argon2id-iterations=[Argon2id iterations]:iterations:' \
71+
'--tpm2-argon2id-parallelism=[Argon2id parallelism]:threads:' \
6872
'--tpm2-pcrs=[Specify TPM2 PCRs to seal against]:PCRs:' \
6973
'--tpm2-public-key=[Enroll signed TPM2 PCR policy against PEM public key]:public key file:_files' \
7074
'--tpm2-public-key-pcrs=[Enroll signed TPM2 PCR policy for specified TPM2 PCRs]:PCRs:' \
7175
'--tpm2-signature=[Validate public key enrollment works with JSON signature file]:signature file:_files' \
7276
'--tpm2-pcrlock=[Specify pcrlock policy to lock against]:pcrlock file:_files' \
73-
'--tpm2-with-pin=[Whether to require entering a PIN to unlock the volume]:boolean:(yes no)' \
77+
'--tpm2-with-pin=[Whether to require entering a PIN to unlock the volume]:mode:(yes no direct)' \
7478
'*::block device:_systemd-cryptenroll_devices'

0 commit comments

Comments
 (0)