crypt.go: allow adding names to legacy keyslots #349
+152
−0
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
valentindavid
force-pushed
the
valentindavid/add-names-to-legacy-keys
branch
from
f4304ad to
74675a7
Compare
When reprovisioning with a newer snapd with old disks, we need to be able to convert old keyslots to new ones with names. Otherwise we cannot remove after reprovisioning is done.
valentindavid
force-pushed
the
valentindavid/add-names-to-legacy-keys
branch
from
74675a7 to
ae7dab0
Compare
|
This is used in canonical/snapd#14471 |
pedronis
reviewed
Jan 14, 2025
crypt.go
Outdated
| // KeyslotAlreadyHasAName may be returned bv | ||
| // NameLegacyLUKS2ContainerKey when trying to create a token for a | ||
| // keyslot that already used by a token. | ||
| var KeyslotAlreadyHasAName = errors.New("keyslot already has a name") |
There was a problem hiding this comment.
this needs to end in Err to be consistent with golang naming conventions
crypt.go
Outdated
| @@ -934,3 +934,60 @@ func RenameLUKS2ContainerKey(devicePath, oldName, newName string) error { | |||
|
|
|||
| return nil | |||
| } | |||
|
|
|||
| // KeyslotAlreadyHasAName may be returned bv | |||
|
Oh, I've approved this but just realized that the tests fail because the code doesn't build: https://github.com/canonical/secboot/actions/runs/12768290685/job/35588356655?pr=349#step:5:51 |
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.
When reprovisioning with a newer snapd with old disks, we need to be able to convert old keyslots to new ones with names. Otherwise we cannot remove after reprovisioning is done.