Skip to content

security(scrypt): Force Scrypt parameters to have all n, p, r values #4680

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

Merged
sergei-boiko-trustwallet merged 9 commits into from
Mar 6, 2026
Merged

security(scrypt): Force Scrypt parameters to have all n, p, r values #4680

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
df0e139
security(scrypt): Force Scrypt parameters to have all n, p, r values
sergei-boiko-trustwallet Feb 25, 2026
3dcff12
Merge branch 'master' into fix/scrypt-deserialize
sergei-boiko-trustwallet Feb 25, 2026
7d09b12
security(twdata): Add missing assignments
sergei-boiko-trustwallet Feb 25, 2026
cf1c3b8
Merge remote-tracking branch 'origin/fix/scrypt-deserialize' into fix…
sergei-boiko-trustwallet Feb 25, 2026
a8bc545
security(twdata): Add missing include
sergei-boiko-trustwallet Feb 25, 2026
ab08837
security(twdata): Add `toString(ScryptValidationError)`
sergei-boiko-trustwallet Feb 25, 2026
51b3cf6
security(scrypt): Force Scrypt parameters to have `salt` and `dklen` …
sergei-boiko-trustwallet Mar 2, 2026
444891d
security(scrypt): Add max salt length
sergei-boiko-trustwallet Mar 2, 2026
3eac7fa
security(twdata): Add salt min length
sergei-boiko-trustwallet Mar 2, 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
16 changes: 10 additions & 6 deletions src/Keystore/ScryptParameters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,16 @@ static const auto r = "r";
ScryptParameters::ScryptParameters(const nlohmann::json& json) {
salt = parse_hex(json[CodingKeys::SP::salt].get<std::string>());
desiredKeyLength = json[CodingKeys::SP::desiredKeyLength];
if (json.count(CodingKeys::SP::n) != 0)
n = json[CodingKeys::SP::n];
if (json.count(CodingKeys::SP::n) != 0)
p = json[CodingKeys::SP::p];
if (json.count(CodingKeys::SP::n) != 0)
r = json[CodingKeys::SP::r];
if (json.count(CodingKeys::SP::n) == 0
|| json.count(CodingKeys::SP::p) == 0
|| json.count(CodingKeys::SP::r) == 0) {
throw std::invalid_argument("Missing required scrypt parameters n, p, or r");
}
if (const auto error = validate()) {
std::stringstream ss;
ss << "Invalid scrypt parameters: " << static_cast<int>(*error);
throw std::invalid_argument(ss.str());
}
}

/// Saves `this` as a JSON object.
Expand Down
Loading
⚡