fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged branch master into master

Browse source
This commit is contained in:
BenDroid 2017-12-26 23:09:29 +01:00
commit 2bcccf6cc3
2 changed files with 8 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -216,6 +216,7 @@ BTC: `1P7ujsXeX7GxQwHNnJsRMgAdNkFZmNVqJT`
## Contacts xmrigCC ## Contacts xmrigCC
* ben [at] graef.in * ben [at] graef.in
* Telegram: @BenDr0id
* [reddit](https://www.reddit.com/user/BenDr0id/) * [reddit](https://www.reddit.com/user/BenDr0id/)
## Contacts xmrig ## Contacts xmrig

19
src/crypto/CryptoNight.cpp
View file

@ -64,7 +64,6 @@ static void cryptonight_av4_softaes_double(const void *input, size_t size, void
} }
#ifndef XMRIG_NO_AEON
static void cryptonight_lite_av1_aesni(const void *input, size_t size, void *output, cryptonight_ctx *ctx) { static void cryptonight_lite_av1_aesni(const void *input, size_t size, void *output, cryptonight_ctx *ctx) {
# if !defined(XMRIG_ARMv7) # if !defined(XMRIG_ARMv7)
cryptonight_hash<0x40000, MEMORY_LITE, 0xFFFF0, false>(input, size, output, ctx); cryptonight_hash<0x40000, MEMORY_LITE, 0xFFFF0, false>(input, size, output, ctx);
@ -98,14 +97,6 @@ void (*cryptonight_variations[8])(const void *input, size_t size, void *output,
cryptonight_lite_av3_softaes, cryptonight_lite_av3_softaes,
cryptonight_lite_av4_softaes_double cryptonight_lite_av4_softaes_double
}; };
#else
void (*cryptonight_variations[4])(const void *input, size_t size, void *output, cryptonight_ctx *ctx) = {
cryptonight_av1_aesni,
cryptonight_av2_aesni_double,
cryptonight_av3_softaes,
cryptonight_av4_softaes_double
};
#endif
void CryptoNight::hash(const uint8_t* input, size_t size, uint8_t* output, cryptonight_ctx* ctx) void CryptoNight::hash(const uint8_t* input, size_t size, uint8_t* output, cryptonight_ctx* ctx)
@ -127,15 +118,15 @@ bool CryptoNight::init(int algo, int variant)
int index = 0; int index = 0;
if (variant == 3 || variant == 4)
{
index = 4;
}
if (algo == Options::ALGO_CRYPTONIGHT_LITE) { if (algo == Options::ALGO_CRYPTONIGHT_LITE) {
index += 4; index += 4;
} }
if (variant == 3 || variant == 4)
{
index += 2;
}
cryptonight_hash_ctx_s = cryptonight_variations[index]; cryptonight_hash_ctx_s = cryptonight_variations[index];
cryptonight_hash_ctx_d = cryptonight_variations[index+1]; cryptonight_hash_ctx_d = cryptonight_variations[index+1];