Skip to content
Snippets Groups Projects
Unverified Commit c5f0505d authored by fireice-uk's avatar fireice-uk Committed by GitHub
Browse files

Merge pull request #1726 from fireice-uk/dev 

release 2.4.7
parents 64961dab 24573207
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
xmrstak/backend/amd/amd_gpu/opencl/wolf-aes.cl
+ 7
− 7
View file @ c5f0505d
...@@ -77,13 +77,13 @@ static const __constant uint AES0_C[256] = ...@@ -77,13 +77,13 @@ static const __constant uint AES0_C[256] =
inline uint4 AES_Round_bittube2(const __local uint *AES0, const __local uint *AES1, const __local uint *AES2, const __local uint *AES3, uint4 x, uint4 k) inline uint4 AES_Round_bittube2(const __local uint *AES0, const __local uint *AES1, const __local uint *AES2, const __local uint *AES3, uint4 x, uint4 k)
{ {
x = ~x; x = ~x;
k[0] ^= AES0[BYTE(x[0], 0)] ^ AES1[BYTE(x[1], 1)] ^ AES2[BYTE(x[2], 2)] ^ AES3[BYTE(x[3], 3)]; k.s0 ^= AES0[BYTE(x.s0, 0)] ^ AES1[BYTE(x.s1, 1)] ^ AES2[BYTE(x.s2, 2)] ^ AES3[BYTE(x.s3, 3)];
x[0] ^= k[0]; x.s0 ^= k.s0;
k[1] ^= AES0[BYTE(x[1], 0)] ^ AES1[BYTE(x[2], 1)] ^ AES2[BYTE(x[3], 2)] ^ AES3[BYTE(x[0], 3)]; k.s1 ^= AES0[BYTE(x.s1, 0)] ^ AES1[BYTE(x.s2, 1)] ^ AES2[BYTE(x.s3, 2)] ^ AES3[BYTE(x.s0, 3)];
x[1] ^= k[1]; x.s1 ^= k.s1;
k[2] ^= AES0[BYTE(x[2], 0)] ^ AES1[BYTE(x[3], 1)] ^ AES2[BYTE(x[0], 2)] ^ AES3[BYTE(x[1], 3)]; k.s2 ^= AES0[BYTE(x.s2, 0)] ^ AES1[BYTE(x.s3, 1)] ^ AES2[BYTE(x.s0, 2)] ^ AES3[BYTE(x.s1, 3)];
x[2] ^= k[2]; x.s2 ^= k.s2;
k[3] ^= AES0[BYTE(x[3], 0)] ^ AES1[BYTE(x[0], 1)] ^ AES2[BYTE(x[1], 2)] ^ AES3[BYTE(x[2], 3)]; k.s3 ^= AES0[BYTE(x.s3, 0)] ^ AES1[BYTE(x.s0, 1)] ^ AES2[BYTE(x.s1, 2)] ^ AES3[BYTE(x.s2, 3)];
return k; return k;
} }
......
xmrstak/version.cpp
+ 2
− 4
View file @ c5f0505d
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#endif #endif
#define XMR_STAK_NAME "xmr-stak" #define XMR_STAK_NAME "xmr-stak"
#define XMR_STAK_VERSION "2.4.6" #define XMR_STAK_VERSION "2.4.7"
#if defined(_WIN32) #if defined(_WIN32)
#define OS_TYPE "win" #define OS_TYPE "win"
...@@ -32,12 +32,10 @@ ...@@ -32,12 +32,10 @@
#define OS_TYPE "unk" #define OS_TYPE "unk"
#endif #endif
#define COIN_TYPE "aeon-cryptonight-monero"
#define XMRSTAK_PP_TOSTRING1(str) #str #define XMRSTAK_PP_TOSTRING1(str) #str
#define XMRSTAK_PP_TOSTRING(str) XMRSTAK_PP_TOSTRING1(str) #define XMRSTAK_PP_TOSTRING(str) XMRSTAK_PP_TOSTRING1(str)
#define VERSION_LONG XMR_STAK_NAME "/" XMR_STAK_VERSION "/" XMRSTAK_PP_TOSTRING(GIT_COMMIT_HASH) "/" XMRSTAK_PP_TOSTRING(GIT_BRANCH) "/" OS_TYPE "/" XMRSTAK_PP_TOSTRING(BACKEND_TYPE) "/" COIN_TYPE "/" #define VERSION_LONG XMR_STAK_NAME "/" XMR_STAK_VERSION "/" XMRSTAK_PP_TOSTRING(GIT_COMMIT_HASH) "/" XMRSTAK_PP_TOSTRING(GIT_BRANCH) "/" OS_TYPE "/" XMRSTAK_PP_TOSTRING(BACKEND_TYPE) "/"
#define VERSION_SHORT XMR_STAK_NAME " " XMR_STAK_VERSION " " XMRSTAK_PP_TOSTRING(GIT_COMMIT_HASH) #define VERSION_SHORT XMR_STAK_NAME " " XMR_STAK_VERSION " " XMRSTAK_PP_TOSTRING(GIT_COMMIT_HASH)
#define VERSION_HTML "v" XMR_STAK_VERSION "-" XMRSTAK_PP_TOSTRING(GIT_COMMIT_HASH) #define VERSION_HTML "v" XMR_STAK_VERSION "-" XMRSTAK_PP_TOSTRING(GIT_COMMIT_HASH)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment