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

Removed direct substitution in encrypt and decrypt scripts.

Browse source
This commit is contained in:
Luc Bijl 2024-12-14 12:32:34 +01:00
parent 94105c2c49
commit 7ab23985e1
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/zlevis-decrypt
View file

@ -55,9 +55,10 @@ trap 'on_exit' EXIT
# Read the JWE protected header # Read the JWE protected header
read -r -d . hdr read -r -d . hdr
echo "$hdr" > "$tmp"/hdr
# Decode the JWE protected header # Decode the JWE protected header
if ! jhd="$(jose b64 dec -i- < <(echo "$hdr"))"; then if ! jhd="$(jose b64 dec -i- < "$tmp"/hdr)"; then
echo "Error decoding JWE protected header" >&2 echo "Error decoding JWE protected header" >&2
exit 1 exit 1
fi fi

8
src/zlevis-encrypt
View file

@ -233,8 +233,8 @@ fi
jwe="$(jose fmt -j "$jwe" -g protected -g clevis -g tpm2 -q "$jwk_pub" -s jwk_pub -UUUUo-)" jwe="$(jose fmt -j "$jwe" -g protected -g clevis -g tpm2 -q "$jwk_pub" -s jwk_pub -UUUUo-)"
jwe="$(jose fmt -j "$jwe" -g protected -g clevis -g tpm2 -q "$jwk_priv" -s jwk_priv -UUUUo-)" jwe="$(jose fmt -j "$jwe" -g protected -g clevis -g tpm2 -q "$jwk_priv" -s jwk_priv -UUUUo-)"
# Clean up the temporary directory at the end of the script
[ -d "${tmp}" ] && rm -rf "${tmp}"
# Output the final JWE # Output the final JWE
exec jose jwe enc -i- -k- -I- -c < <(echo -n "$jwe$jwk"; /bin/cat) (echo "$jwe$jwk"; /bin/cat) | jose jwe enc -i- -k- -I- -c
# Exit with the status of the last command
exit $?