lukechilds
/
ethminer
mirror of https://github.com/lukechilds/ethminer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Switched r and p

cl-refactor
Vitalik Buterin 10 years ago
parent
422be5eb46
commit
9ba9536f73
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      libdevcrypto/SecretStore.cpp

6
libdevcrypto/SecretStore.cpp
View File

@ -206,13 +206,13 @@ std::string SecretStore::encrypt(bytes const& _v, std::string const& _pass, KDF
{ {
js::mObject params; js::mObject params;
params["n"] = (int64_t)iterations; params["n"] = (int64_t)iterations;
params["p"] = (int)p;
params["r"] = (int)r; params["r"] = (int)r;
params["p"] = (int)p;
params["dklen"] = (int)dklen; params["dklen"] = (int)dklen;
params["salt"] = toHex(salt); params["salt"] = toHex(salt);
ret["kdfparams"] = params; ret["kdfparams"] = params;
} }
derivedKey = scrypt(_pass, salt, iterations, p, r, dklen); derivedKey = scrypt(_pass, salt, iterations, r, p, dklen);
} }
else else
{ {
@ -280,7 +280,7 @@ bytes SecretStore::decrypt(std::string const& _v, std::string const& _pass)
else if (o["kdf"].get_str() == "scrypt") else if (o["kdf"].get_str() == "scrypt")
{ {
auto p = o["kdfparams"].get_obj(); auto p = o["kdfparams"].get_obj();
derivedKey = scrypt(_pass, fromHex(p["salt"].get_str()), p["n"].get_int(), p["p"].get_int(), p["r"].get_int(), p["dklen"].get_int()); derivedKey = scrypt(_pass, fromHex(p["salt"].get_str()), p["n"].get_int(), p["r"].get_int(), p["p"].get_int(), p["dklen"].get_int());
} }
else else
{ {

Write Preview
Loading…
Cancel
Save