pkcs12: use der::BmpString for KDF
#1209
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
Uses the `BmpString` type to implement transcoding from UTF-8 to BMP/UCS-2. This type notably restricts the use of UTF-16 surrogate pairs, something the previous implementation was not doing correctly. This entailed making the methods which transcode UTF-8 fallible, since we need to handle the error case that they encode characters outside BMP/UCS-2.
tarcieri
commented
Aug 29, 2023
Comment on lines
162
to
+172
| const PASS_SHORT: &str = "🔥"; | ||
| const SALT_INC: [u8; 8] = [0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8]; | ||
|
|
||
| assert_eq!( | ||
| derive_key_utf8::<sha2::Sha256>( | ||
| PASS_SHORT, | ||
| &SALT_INC, | ||
| Pkcs12KeyType::EncryptionKey, | ||
| 100, | ||
| 32 | ||
| ), | ||
| hex!("d01e72a940b4b1a7a5707fc8264a60cb7606ff9051dedff90930687d2513c006") | ||
| ); | ||
| assert!(derive_key_utf8::<sha2::Sha256>( | ||
| PASS_SHORT, | ||
| &SALT_INC, | ||
| Pkcs12KeyType::EncryptionKey, | ||
| 100, | ||
| 32 | ||
| ) | ||
| .is_err()); // Emoji is not in the Basic Multilingual Plane |
There was a problem hiding this comment.
Note: now errors on the emoji test. I believe this is the correct behavior since the emoji is not valid BMP/UCS-2
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.
Uses the
BmpStringtype to implement transcoding from UTF-8 to BMP/UCS-2.This type notably restricts the use of UTF-16 surrogate pairs, something the previous implementation was not doing correctly. This entailed making the methods which transcode UTF-8 fallible, since we need to handle the error case that they encode characters outside BMP/UCS-2.
cc @xemwebe