mirrors/xmrig
1
0
Fork 1
mirror of https://github.com/xmrig/xmrig.git synced 2025-12-11 01:22:45 -05:00
Code Issues Projects Releases Wiki Activity

Resolved conflict between argon2 implementations.

Browse Source
This commit is contained in:
XMRig
2019-08-16 03:18:35 +07:00
parent 0c25424a3e
commit 043989e8ee
45 changed files with 160 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/crypto/randomx/aes_hash.cpp
View File

@@ -26,8 +26,8 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "soft_aes.h"
#include "randomx.h"
#include "crypto/randomx/soft_aes.h"
#include "crypto/randomx/randomx.h"
#define AES_HASH_1R_STATE0 0xd7983aad, 0xcc82db47, 0x9fa856de, 0x92b52c0d
#define AES_HASH_1R_STATE1 0xace78057, 0xf59e125a, 0x15c7b798, 0x338d996e