Implement parsing for all EncString ciphers #213
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
|
No New Or Fixed Issues Found |
# Conflicts: # crates/bitwarden/src/crypto/enc_string.rs
Hinton
reviewed
Sep 4, 2023
Comment on lines
107
to
113
| ("5" | "6", 1) => { | ||
| let data = from_b64_vec(parts[0])?; | ||
| if enc_type == "5" { | ||
| Ok(EncString::Rsa2048_OaepSha256_HmacSha256_B64 { data }) | ||
| } else { | ||
| Ok(EncString::Rsa2048_OaepSha1_HmacSha256_B64 { data }) | ||
| } |
There was a problem hiding this comment.
Is this cleaner than just writing?
("5", 1) => {
Ok(EncString::Rsa2048_OaepSha256_HmacSha256_B64 { data: from_b64_vec(parts[0])? })
}
("6", 1) => {
Ok(EncString::Rsa2048_OaepSha1_HmacSha256_B64 { data: from_b64_vec(parts[0])? })
}(Same also applies for ("3" | "4", 1))
There was a problem hiding this comment.
I kept it like it was previoulsy, but it's definitely not very useful now that most of the match branches are very short with the from_b64_vec. We could even split ("1" | "2", 3) as well, as it's only three lines now.
Hinton
reviewed
Sep 4, 2023
Hinton
previously approved these changes
Sep 4, 2023
Hinton
approved these changes
Sep 4, 2023
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.
Type of change
Objective
Implement converting an EncString to and from a base64 encoded string and a buffer for all the ciphers we support. Added support for legacy EncStrings without a type header, just like the rest of the clients.
Marked RSA with HMAC as deprecated like the other clients. Also removed their mac fields, the other clients don't check them either.