luc/zlevis
1
1
Fork 0
Code Issues Pull requests Releases 5 Wiki Activity

src/zlevis-encrypt: bug fix

Browse source 
Removed bug in parsing of pcr_cfg and removed bug in policy_options
parsing.
This commit is contained in:
Luc Bijl 2025-05-02 20:39:52 +02:00
parent f7af42f396
commit 8df4ff53a9
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/zlevis-encrypt
View file

@ -87,7 +87,7 @@ pcr_bank="$(printf "%s" "$cfg" | jose fmt -j- -Og pcr_bank -u-)" || {
pcr_cfg=$(printf "%s" "$cfg" | tr -d '[:space:]') pcr_cfg=$(printf "%s" "$cfg" | tr -d '[:space:]')
# Handle both string and JSON array formats for pcr_ids # Handle both string and JSON array formats for pcr_ids
if printf "%s" "$pcr_cfg" | jose fmt -j- -Og pcr_ids 2>/dev/null && ! pcr_ids="$(jose fmt -j- -Og pcr_ids -u- 2>/dev/null < "$tmp"/pcr_cfg)"; then if printf "%s" "$pcr_cfg" | jose fmt -j- -Og pcr_ids 2>/dev/null && ! pcr_ids="$(printf "%s" "$pcr_cfg" | jose fmt -j- -Og pcr_ids -u- 2>/dev/null)"; then
# Attempt to parse as a JSON array if string parsing fails # Attempt to parse as a JSON array if string parsing fails
if printf "%s" "$pcr_cfg" | jose fmt -j- -Og pcr_ids -A 2>/dev/null; then if printf "%s" "$pcr_cfg" | jose fmt -j- -Og pcr_ids -A 2>/dev/null; then
# Construct a comma-separated string from the array # Construct a comma-separated string from the array
@ -176,13 +176,13 @@ else
obj_attr="$obj_attr|userwithauth" obj_attr="$obj_attr|userwithauth"
fi fi
# Remove tmp_pcr_digest and tmp_pcr_policy # Remove tmp_pcr_digest
rm -f "$tmp_pcr_digest" "$tmp_pcr_policy" rm -f "$tmp_pcr_digest"
# Define and trap tmp jwk_pub and jwk_priv # Define and trap tmp jwk_pub and jwk_priv
tmp_jwk_pub="/tmp/jwk_pub.$$" tmp_jwk_pub="/tmp/jwk_pub.$$"
tmp_jwk_priv="/tmp/jwk_priv.$$" tmp_jwk_priv="/tmp/jwk_priv.$$"
trap 'rm -f "$tmp_primary_context" "$tmp_jwk_pub" "$tmp_jwk_priv"' EXIT trap 'rm -f "$tmp_primary_context" "$tmp_pcr_policy" "$tmp_jwk_pub" "$tmp_jwk_priv"' EXIT
# Create the TPM2 object for the JWK # Create the TPM2 object for the JWK
case "$tpm2tools_version" in case "$tpm2tools_version" in
@ -195,8 +195,8 @@ if [ -n "$fail" ]; then
fi fi
tpm2_flushcontext -t tpm2_flushcontext -t
# Remove tmp_primary_context # Remove tmp_primary_context and tmp_pcr_policy
rm -f "$tmp_primary_context" rm -f "$tmp_primary_context" "$tmp_pcr_policy"
# Encode the JWK public and private keys in Base64 # Encode the JWK public and private keys in Base64
if ! jwk_pub="$(jose b64 enc -I "$tmp_jwk_pub")"; then if ! jwk_pub="$(jose b64 enc -I "$tmp_jwk_pub")"; then