summaryrefslogtreecommitdiffstats
path: root/xmrstak/backend/cpu/crypto/cryptonight_aesni.h
diff options
context:
space:
mode:
authorfireice-uk <fireice-uk@users.noreply.github.com>2018-04-18 21:28:09 +0100
committerGitHub <noreply@github.com>2018-04-18 21:28:09 +0100
commit26a5d65f12b2f19a0a3ece39a2bc64718796367b (patch)
treeb0132803b520fed0dcb2ea42ba5ab8f0a464fc12 /xmrstak/backend/cpu/crypto/cryptonight_aesni.h
parente10e8e67492cf3118af8b7d7609937e85e572305 (diff)
parent27da3b0831e047a247f78ec299ba74b04f45bd5a (diff)
downloadxmr-stak-2.4.3.zip
xmr-stak-2.4.3.tar.gz
Merge pull request #1459 from fireice-uk/dev2.4.3
release 2.4.3
Diffstat (limited to 'xmrstak/backend/cpu/crypto/cryptonight_aesni.h')
-rw-r--r--xmrstak/backend/cpu/crypto/cryptonight_aesni.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/xmrstak/backend/cpu/crypto/cryptonight_aesni.h b/xmrstak/backend/cpu/crypto/cryptonight_aesni.h
index 5203de8..7562de1 100644
--- a/xmrstak/backend/cpu/crypto/cryptonight_aesni.h
+++ b/xmrstak/backend/cpu/crypto/cryptonight_aesni.h
@@ -43,7 +43,7 @@ extern "C"
{
void keccak(const uint8_t *in, int inlen, uint8_t *md, int mdlen);
void keccakf(uint64_t st[25], int rounds);
- extern void(*const extra_hashes[4])(const void *, size_t, char *);
+ extern void(*const extra_hashes[4])(const void *, uint32_t, char *);
}
// This will shift and xor tmp1 into itself as 4 32-bit vals such as
@@ -429,7 +429,7 @@ inline void cryptonight_monero_tweak(uint64_t* mem_out, __m128i tmp)
tmp = _mm_castps_si128(_mm_movehl_ps(_mm_castsi128_ps(tmp), _mm_castsi128_ps(tmp)));
uint64_t vh = _mm_cvtsi128_si64(tmp);
- uint8_t x = vh >> 24;
+ uint8_t x = static_cast<uint8_t>(vh >> 24);
static const uint16_t table = 0x7531;
const uint8_t index = (((x >> 3) & 6) | (x & 1)) << 1;
vh ^= ((table >> index) & 0x3) << 28;
OpenPOWER on IntegriCloud