diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-03-06 08:41:02 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-03-06 08:41:02 +0200 |
| commit | c102c49da5015592d2a2fedf0ae348495ec382df (patch) | |
| tree | ba6f9a6ccc7e9d112ac2e305eac0160da2bdcbdf /src/cryptonote_basic | |
| parent | 0d150aca5ca8fdfdb91da3161c7f863c811a34e6 (diff) | |
| parent | e136bc6b8a480426f7565b721ca2ccf75547af62 (diff) | |
| download | monzero-core-c102c49da5015592d2a2fedf0ae348495ec382df.tar.gz monzero-core-c102c49da5015592d2a2fedf0ae348495ec382df.tar.xz monzero-core-c102c49da5015592d2a2fedf0ae348495ec382df.zip | |
Merge pull request #3253
e136bc6b tweaks to the monerov1 cryptonight algorithm (Lee Clagett)
d58c9ec9 slow-hash: optimized version (SChernykh)
608fd6f1 Monero Cryptonight variants, and add one for v7 (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_basic')
| -rw-r--r-- | src/cryptonote_basic/cryptonote_format_utils.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cryptonote_basic/cryptonote_format_utils.cpp b/src/cryptonote_basic/cryptonote_format_utils.cpp index f462d1ca9..a10772424 100644 --- a/src/cryptonote_basic/cryptonote_format_utils.cpp +++ b/src/cryptonote_basic/cryptonote_format_utils.cpp @@ -1022,7 +1022,8 @@ namespace cryptonote return true; } blobdata bd = get_block_hashing_blob(b); - crypto::cn_slow_hash(bd.data(), bd.size(), res); + const int cn_variant = b.major_version >= 7 ? b.major_version - 6 : 0; + crypto::cn_slow_hash(bd.data(), bd.size(), res, cn_variant); return true; } //--------------------------------------------------------------- |