cryptenroll: don't try to use pcrlock in combination with signed PCR policy if both are available, because we don't actually support that right now #32635
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
the
please-review
|
/cc @DaanDeMeyer |
|
Important An -rc1 tag has been created and a release is being prepared, so please note that PRs introducing new features and APIs will be held back until the new version has been released. |
bluca
approved these changes
May 2, 2024
DaanDeMeyer
approved these changes
May 2, 2024
DaanDeMeyer
added
good-to-merge/waiting-for-ci 👍
|
TEST-70 looks very sad |
bluca
added
ci-fails/needs-rework 🔥
|
We really need |
|
The failing CIs seem to be caused by #32500 which was merged with TEST-70 failing, so now it fails everywhere. |
lol I thought it was a failing test, fixed by this PR |
github-actions
bot
added
tests
please-review
|
pushed commit to hopefully fix it |
|
Still fails here but works with the standalone workaround #32636 so there's still some issue with this PR |
bluca
added
needs-rebase
ci-fails/needs-rework 🔥
We currently do not support pcrlock policies and signed PCR policies in combination. Hence, when we auto-discover both, let's disable signed PCR policies if pcrlock is available too (simple because that covers more ground). Fixes: systemd#32565
…do TPM enrollments Otherwise we'll do work (and possibly generate fatal errors) where we really shouldn't.
As for the other fields let's check if the actual variable we serialize is set before serializing it. This shouldn't make any difference, since the pubkey and the PCR mask should always be set together or neither, but I think it's easier to grok this way, and makes the function nicely "dumb": it serializes what is specified, without trying to be smart by suppressng specified fields.
poettering
force-pushed
the
cryptenroll-no-pcrlock-conflict
branch
from
e824035
to
3f24021
Compare
github-actions
bot
added
util-lib
please-review
|
Here's another try. Let's see. |
bluca
approved these changes
May 6, 2024
bluca
added
good-to-merge/waiting-for-ci 👍
github-actions
bot
removed
the
good-to-merge/waiting-for-ci 👍
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #32565