Skip to content

fix(crypto): tolerate unparseable EncStrings across FFI boundary #1462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
quexten wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix(crypto): tolerate unparseable EncStrings across FFI boundary #1462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c0e6b0
feat(crypto): tolerate unparseable EncStrings while parsing
quexten Sep 9, 2026
e037e43
feat: add nfallible from string conversions for encstring
quexten Sep 9, 2026
e6b7ca5
fix test and parse strict in account cryptographic state
quexten Sep 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions crates/bitwarden-core/src/key_management/account_cryptographic_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,10 @@ impl TryFrom<&PrivateKeysResponseModel> for WrappedAccountCryptographicState {
type Error = AccountKeysResponseParseError;

fn try_from(response: &PrivateKeysResponseModel) -> Result<Self, Self::Error> {
let private_key: EncString =
require!(&response.public_key_encryption_key_pair.wrapped_private_key)
.parse()
.map_err(|_| AccountKeysResponseParseError::MalformedField)?;
let private_key: EncString = EncString::parse_strict(require!(
&response.public_key_encryption_key_pair.wrapped_private_key
))
.map_err(|_| AccountKeysResponseParseError::MalformedField)?;

let is_v2_encryption = matches!(private_key, EncString::Cose_Encrypt0_B64 { .. });

Expand All @@ -161,9 +161,9 @@ impl TryFrom<&PrivateKeysResponseModel> for WrappedAccountCryptographicState {
.as_ref()
.ok_or(AccountKeysResponseParseError::InconsistentState)?;

let signing_key: EncString = require!(&signature_key_pair.wrapped_signing_key)
.parse()
.map_err(|_| AccountKeysResponseParseError::MalformedField)?;
let signing_key: EncString =
EncString::parse_strict(require!(&signature_key_pair.wrapped_signing_key))
.map_err(|_| AccountKeysResponseParseError::MalformedField)?;

let signed_public_key: Option<SignedPublicKey> = response
.public_key_encryption_key_pair
Expand Down
7 changes: 4 additions & 3 deletions crates/bitwarden-core/src/key_management/master_password.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,10 @@ impl TryFrom<&MasterPasswordUnlockResponseModel> for MasterPasswordUnlockData {
KdfType::__Unknown(_) => return Err(MasterPasswordError::KdfMalformed),
};

let master_key_wrapped_user_key = require!(&response.master_key_encrypted_user_key)
.parse()
.map_err(|_| MasterPasswordError::EncryptionKeyMalformed)?;
let master_key_wrapped_user_key =
EncString::parse_strict(require!(&response.master_key_encrypted_user_key))
.map_err(|_| MasterPasswordError::EncryptionKeyMalformed)?;

let salt = require!(&response.salt).clone();
let contained_key_id = response
.contained_key_id
Expand Down
Loading
Loading