popov/cpuminer-opt-gpu
1
0
Fork 0
mirror of https://github.com/JayDDee/cpuminer-opt.git synced 2025-09-17 23:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

v3.6.3

Browse Source
This commit is contained in:
Jay D Dee
2017-04-17 14:35:18 -04:00
parent 53259692eb
commit 0155cd1bfe
14 changed files with 33 additions and 2293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
algo/m7m.c
View File

@@ -14,7 +14,7 @@
#include "algo/tiger/sph_tiger.h"
#include "algo/whirlpool/sph_whirlpool.h"
#include "algo/ripemd/sph_ripemd.h"
#if defined (SHA_NI)
#if defined __SHA__
#include <openssl/sha.h>
#endif
@@ -133,20 +133,13 @@ typedef struct {
sph_ripemd160_context ripemd;
} m7m_ctx_holder;
#if defined __SHA__
SHA256_CTX m7m_ctx_final_sha256
#else
sph_sha256_context m7m_ctx_final_sha256;
#endif
m7m_ctx_holder m7m_ctx;
void init_m7m_ctx()
{
#if defined __SHA__
SHA256_Init( &m7m_ctx_final_sha256 );
SHA256_Init( &m7m_ctx.sha256 );
#else
sph_sha256_init( &m7m_ctx_final_sha256 );
sph_sha256_init( &m7m_ctx.sha256 );
#endif
sph_sha512_init( &m7m_ctx.sha512 );
@@ -185,11 +178,10 @@ int scanhash_m7m_hash( int thr_id, struct work* work,
m7m_ctx_holder ctx1, ctx2 __attribute__ ((aligned (64)));
memcpy( &ctx1, &m7m_ctx, sizeof(m7m_ctx) );
#if defined __SHA__
SHA256_CTX ctx_fsha256;
SHA256_CTX ctxf_sha256;
#else
sph_sha256_context ctxf_sha256;
#endif
memcpy( &ctxf_sha256, &m7m_ctx_final_sha256, sizeof(ctxf_sha256) );
memcpy(data, pdata, 80);
@@ -270,9 +262,11 @@ int scanhash_m7m_hash( int thr_id, struct work* work,
mpz_export((void *)bdata, NULL, -1, 1, 0, 0, product);
#if defined __SHA__
SHA256_Update( &ctxf_sha256, bdata_p64, bytes );
SHA256_Init( &ctxf_sha256 );
SHA256_Update( &ctxf_sha256, bdata, bytes );
SHA256_Final( (unsigned char*) hash, &ctxf_sha256 );
#else
sph_sha256_init( &ctxf_sha256 );
sph_sha256( &ctxf_sha256, bdata, bytes );
sph_sha256_close( &ctxf_sha256, (void*)(hash) );
#endif
@@ -310,9 +304,11 @@ int scanhash_m7m_hash( int thr_id, struct work* work,
mpz_export(bdata, NULL, -1, 1, 0, 0, product);
#if defined __SHA__
SHA256_Init( &ctxf_sha256 );
SHA256_Update( &ctxf_sha256, bdata, bytes );
SHA256_Final( (unsigned char*) hash, &ctxf_sha256 );
#else
sph_sha256_init( &ctxf_sha256 );
sph_sha256( &ctxf_sha256, bdata, bytes );
sph_sha256_close( &ctxf_sha256, (void*)(hash) );
#endif