Revert "Use HOTP TPM counter instead of Heads when signing, if present"

This reverts commit c42084406d.
This commit is contained in:
Kyle Rankin 2018-06-19 16:28:37 -07:00
parent c42084406d
commit 7dde5c2aca
No known key found for this signature in database
GPG Key ID: 555577116BFA74B9

View File

@ -78,15 +78,8 @@ update_checksums()
# sign and auto-roll config counter
extparam=
if [ "$CONFIG_TPM" = "y" ]; then
if [ -x /bin/libremkey_hotp_verification ]; then
check_tpm_counter /boot/kexec_hotp_counter hotp \
|| die "Unable to find/create TPM counter"
counter="$TPM_COUNTER"
extparam="-c $counter"
else
extparam=-u
fi
fi
kexec-sign-config -p /boot $extparam \
|| die "Failed to sign default config"
@ -248,6 +241,9 @@ while true; do
|| die "Unable to find/create tpm counter"
counter="$TPM_COUNTER"
increment_tpm_counter $counter \
|| die "Unable to increment tpm counter"
sha256sum /tmp/counter-$counter > /boot/kexec_rollback.txt \
|| die "Unable to create rollback file"
mount -o ro,remount /boot