Convert SlotId and AlgorithmId into enums #44
Merged
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
This matches the C code behaviour.
3DES also has an algorithm ID, but it is completely disjoint from the key algorithms, and can be handled separately later.
str4d
commented
Nov 30, 2019
src/yubikey.rs
Outdated
| // TODO: Decide whether to add it or not. | ||
| // match key { | ||
| // SlotId::CardManagement => return Err(Error::KeyError), | ||
| // } |
There was a problem hiding this comment.
I think we should exclude it, because I think it is disjoint from the key algorithms and instead is tied to 3DES.
There was a problem hiding this comment.
Yeah, go ahead and delete it
tarcieri
reviewed
Nov 30, 2019
src/key.rs
Outdated
|
|
||
| fn try_from(value: u8) -> Result<Self, Self::Error> { | ||
| match value { | ||
| YKPIV_KEY_RETIRED1 => Ok(RetiredSlotId::R1), |
There was a problem hiding this comment.
In other places (e.g. StatusWords, and throughout the yubihsm crate) I've eliminated these constants in favor of using the literal codes for these conversions between the u8 representation and the enum variants.
I guess it helps statically assert they're the same for the same labels, since you have to write them twice.
I really like the idea of getting rid of a consts.rs eventually (there's nothing like it in the yubihsm crate)
We will handle the CardManagement slot separately.
Merged
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.
Also includes a minor fix for
Key::list.