mirrors/xmrig
1
0
Fork 1
mirror of https://github.com/xmrig/xmrig.git synced 2025-12-11 09:22:48 -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

10
src/crypto/randomx/blake2_generator.cpp
View File

@@ -27,9 +27,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <stddef.h>
#include "blake2/blake2.h"
#include "blake2/endian.h"
#include "blake2_generator.hpp"
#include "crypto/randomx/blake2/blake2.h"
#include "crypto/randomx/blake2/endian.h"
#include "crypto/randomx/blake2_generator.hpp"
namespace randomx {
@@ -55,8 +55,8 @@ namespace randomx {
void Blake2Generator::checkData(const size_t bytesNeeded) {
if (dataIndex + bytesNeeded > sizeof(data)) {
blake2b(data, sizeof(data), data, sizeof(data), nullptr, 0);
rx_blake2b(data, sizeof(data), data, sizeof(data), nullptr, 0);
dataIndex = 0;
}
}
}
}