From f5dd1cd5cf882925d1ff8565b85e79efe3c008e8 Mon Sep 17 00:00:00 2001 From: sebastianstolzenberg Date: Fri, 16 Mar 2018 22:24:59 +0100 Subject: [PATCH] Removed unused code (#68) --- src/crypto/CryptoNight_arm.h | 1 - src/crypto/CryptoNight_monero.h | 57 --------------------------------- src/crypto/CryptoNight_x86.h | 1 - 3 files changed, 59 deletions(-) delete mode 100644 src/crypto/CryptoNight_monero.h diff --git a/src/crypto/CryptoNight_arm.h b/src/crypto/CryptoNight_arm.h index 4316ab98..dd3699f9 100644 --- a/src/crypto/CryptoNight_arm.h +++ b/src/crypto/CryptoNight_arm.h @@ -36,7 +36,6 @@ #include "crypto/CryptoNight.h" -#include "crypto/CryptoNight_monero.h" #include "crypto/soft_aes.h" diff --git a/src/crypto/CryptoNight_monero.h b/src/crypto/CryptoNight_monero.h deleted file mode 100644 index 504b9b9d..00000000 --- a/src/crypto/CryptoNight_monero.h +++ /dev/null @@ -1,57 +0,0 @@ -/* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2018 Lee Clagett - * Copyright 2016-2018 XMRig , - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __CRYPTONIGHT_MONERO_H__ -#define __CRYPTONIGHT_MONERO_H__ - -// VARIANT ALTERATIONS -#define VARIANT1_INIT(part) \ - const uint8_t version##part = static_cast(input)[part * size]; \ - uint64_t tweak1_2_##part = 0; \ - /*if (MONERO)*/ { \ - if (version##part > 6) { \ - tweak1_2_##part = (*reinterpret_cast(reinterpret_cast(input) + 35 + part * size) ^ \ - *(reinterpret_cast(ctx->state[part]) + 24)); \ - } \ - } - -#define VARIANT1_1(p, part) \ - /*if (MONERO)*/ { \ - if (version##part > 6) { \ - const uint8_t tmp = reinterpret_cast(p)[11]; \ - static const uint32_t table = 0x75310; \ - const uint8_t index = (((tmp >> 3) & 6) | (tmp & 1)) << 1; \ - ((uint8_t*)(p))[11] = tmp ^ ((table >> index) & 0x30); \ - } \ - } - -#define VARIANT1_2(p, part) \ - /*if (MONERO)*/ { \ - if (version##part > 6) { \ - (p) ^= tweak1_2_##part; \ - } \ - } - - -#endif /* __CRYPTONIGHT_MONERO_H__ */ diff --git a/src/crypto/CryptoNight_x86.h b/src/crypto/CryptoNight_x86.h index 1eeb9365..c14c0172 100644 --- a/src/crypto/CryptoNight_x86.h +++ b/src/crypto/CryptoNight_x86.h @@ -36,7 +36,6 @@ #include "crypto/CryptoNight.h" -#include "crypto/CryptoNight_monero.h" #include "crypto/soft_aes.h"