Merge pull request #1858 from SChernykh/dev

RandomX: removed duplicate constants in Blake2b
This commit is contained in:
xmrig 2020-09-27 16:51:03 +07:00 committed by GitHub
commit dfab81e9fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 6 deletions

View file

@ -39,7 +39,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "crypto/randomx/blake2/blake2.h" #include "crypto/randomx/blake2/blake2.h"
#include "crypto/randomx/blake2/blake2-impl.h" #include "crypto/randomx/blake2/blake2-impl.h"
static const uint64_t blake2b_IV[8] = { const uint64_t blake2b_IV[8] = {
UINT64_C(0x6a09e667f3bcc908), UINT64_C(0xbb67ae8584caa73b), UINT64_C(0x6a09e667f3bcc908), UINT64_C(0xbb67ae8584caa73b),
UINT64_C(0x3c6ef372fe94f82b), UINT64_C(0xa54ff53a5f1d36f1), UINT64_C(0x3c6ef372fe94f82b), UINT64_C(0xa54ff53a5f1d36f1),
UINT64_C(0x510e527fade682d1), UINT64_C(0x9b05688c2b3e6c1f), UINT64_C(0x510e527fade682d1), UINT64_C(0x9b05688c2b3e6c1f),

View file

@ -50,11 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "blake2b-round.h" #include "blake2b-round.h"
static const uint64_t blake2b_IV[8] = { extern const uint64_t blake2b_IV[8];
UINT64_C(0x6a09e667f3bcc908), UINT64_C(0xbb67ae8584caa73b),
UINT64_C(0x3c6ef372fe94f82b), UINT64_C(0xa54ff53a5f1d36f1),
UINT64_C(0x510e527fade682d1), UINT64_C(0x9b05688c2b3e6c1f),
UINT64_C(0x1f83d9abfb41bd6b), UINT64_C(0x5be0cd19137e2179) };
static const uint8_t blake2b_sigma_sse41[12][16] = { static const uint8_t blake2b_sigma_sse41[12][16] = {