From e6e1028017d55c79b9dcbf74a968bc040f45beb6 Mon Sep 17 00:00:00 2001 From: XMRig Date: Sat, 23 May 2020 12:02:32 +0700 Subject: [PATCH 1/4] v5.11.3-dev --- src/version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/version.h b/src/version.h index c8ca562a..ce5ee4db 100644 --- a/src/version.h +++ b/src/version.h @@ -28,7 +28,7 @@ #define APP_ID "xmrig" #define APP_NAME "XMRig" #define APP_DESC "XMRig miner" -#define APP_VERSION "5.11.2" +#define APP_VERSION "5.11.3-dev" #define APP_DOMAIN "xmrig.com" #define APP_SITE "www.xmrig.com" #define APP_COPYRIGHT "Copyright (C) 2016-2020 xmrig.com" @@ -36,7 +36,7 @@ #define APP_VER_MAJOR 5 #define APP_VER_MINOR 11 -#define APP_VER_PATCH 2 +#define APP_VER_PATCH 3 #ifdef _MSC_VER # if (_MSC_VER >= 1920) From a28bddcbdf842148887a55bb0fec45ed8bb28482 Mon Sep 17 00:00:00 2001 From: Matt Smith Date: Sun, 7 Jun 2020 13:41:39 +0100 Subject: [PATCH 2/4] Stop linker from making stack executable Add .note.GNU-stack section to end of AstroBWT ASM. Signed-off-by: Matt Smith --- src/crypto/astrobwt/sha3_256_avx2.S | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/crypto/astrobwt/sha3_256_avx2.S b/src/crypto/astrobwt/sha3_256_avx2.S index 16dba72f..f1d4e3ee 100644 --- a/src/crypto/astrobwt/sha3_256_avx2.S +++ b/src/crypto/astrobwt/sha3_256_avx2.S @@ -51,3 +51,7 @@ KeccakF1600_AVX2_ASM: lea r10,[rip+rndc] #include "sha3_256_keccakf1600_avx2.inc" + +#if defined(__linux__) && defined(__ELF__) +.section .note.GNU-stack,"",%progbits +#endif From 75c57f7563b974060088a868bdde1f70fc6dcf82 Mon Sep 17 00:00:00 2001 From: SChernykh Date: Sun, 7 Jun 2020 16:23:17 +0200 Subject: [PATCH 3/4] Fixed GCC 10.1 issues - Fixed uninitialized `state->x` warning - Fixed broken code with `-O3` or `-Ofast` --- src/crypto/cn/c_jh.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/crypto/cn/c_jh.c b/src/crypto/cn/c_jh.c index 728f3bbe..9e4e7efd 100644 --- a/src/crypto/cn/c_jh.c +++ b/src/crypto/cn/c_jh.c @@ -213,16 +213,17 @@ static void E8(hashState *state) /*The compression function F8 */ static void F8(hashState *state) { - uint64 i; + uint64_t* x = (uint64_t*)state->x; + const uint64_t* buf = (uint64*)state->buffer; /*xor the 512-bit message with the fist half of the 1024-bit hash state*/ - for (i = 0; i < 8; i++) state->x[i >> 1][i & 1] ^= ((uint64*)state->buffer)[i]; + for (int i = 0; i < 8; ++i) x[i] ^= buf[i]; /*the bijective function E8 */ E8(state); /*xor the 512-bit message with the second half of the 1024-bit hash state*/ - for (i = 0; i < 8; i++) state->x[(8+i) >> 1][(8+i) & 1] ^= ((uint64*)state->buffer)[i]; + for (int i = 0; i < 8; ++i) x[i + 8] ^= buf[i]; } /*before hashing a message, initialize the hash state as H0 */ @@ -240,6 +241,7 @@ static HashReturn Init(hashState *state, int hashbitlen) case 224: memcpy(state->x,JH224_H0,128); break; case 256: memcpy(state->x,JH256_H0,128); break; case 384: memcpy(state->x,JH384_H0,128); break; + default: case 512: memcpy(state->x,JH512_H0,128); break; } From d30bf207e9f038600055fad82c12b01cfabe0575 Mon Sep 17 00:00:00 2001 From: xmrig Date: Mon, 8 Jun 2020 02:00:22 +0700 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 67d7e6f6..6e503a6b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# v5.11.3 +- [#1718](https://github.com/xmrig/xmrig/pull/1718) Fixed, linker on Linux was marking entire executable as having an executable stack. +- [#1720](https://github.com/xmrig/xmrig/pull/1720) Fixed broken CryptoNight algorithms family with gcc 10.1. + # v5.11.2 - [#1664](https://github.com/xmrig/xmrig/pull/1664) Improved JSON config error reporting. - [#1668](https://github.com/xmrig/xmrig/pull/1668) Optimized RandomX dataset initialization.