fix(aes): Fix AESParameters deserialization for AES-128-CBC and improve error handling for unsupported ciphers#4694
Open
sergei-boiko-trustwallet wants to merge 4 commits intomasterfrom
Open
Conversation
…unsupported ciphers
Contributor
There was a problem hiding this comment.
Pull request overview
Refactors keystore AES cipher selection to recognize AES-128-CBC and to fail fast with a descriptive error when an unknown cipher string is encountered, instead of silently defaulting to AES-128-CTR.
Changes:
- Added
aes-128-cbchandling ingetCipher(). - Replaced the previous default-to-CTR behavior with a thrown
std::invalid_argumentfor unsupported ciphers. - Refactored the conditional structure in
getCipher()for readability.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Binary size comparison➡️ aarch64-apple-ios: 14.34 MB ➡️ aarch64-apple-ios-sim: 14.34 MB ➡️ aarch64-linux-android: 18.77 MB ➡️ armv7-linux-androideabi: 16.20 MB ➡️ wasm32-unknown-emscripten: 13.68 MB |
AESParameters deserialization for AES-128-CBC and improve error handling for unsupported ciphers
This file contains hidden or 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
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.
This pull request refactors the
getCipherfunction inAESParameters.cppto improve error handling and add support for an additional cipher. The most important changes include switching from chainedelse ifstatements to separateifblocks, adding support for thegAes128Cbccipher, and throwing an exception for unsupported ciphers instead of defaulting.Cipher support and error handling improvements:
gAes128Cbccipher in thegetCipherfunction.std::invalid_argumentexception with a descriptive message when an unsupported cipher is provided, instead of defaulting toTWStoredKeyEncryptionAes128Ctr.Code style refactoring:
else ifstatements with individualifstatements for clarity and maintainability in thegetCipherfunction.