GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-10 23:08:07 +00:00
Code Issues Releases Wiki Activity

Pass ostate values around in scrypt to be able to extract full hashes if needed later on.

Browse Source
This commit is contained in:
Con Kolivas 2012-12-01 21:47:27 +11:00
parent 0ae02c6ec4
commit 33c9faae11
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
miner.h
View File

@ -945,7 +945,7 @@ struct work {
unsigned char target[32]; unsigned char target[32];
unsigned char hash[32]; unsigned char hash[32];
uint32_t outputhash; uint64_t outputhash;
int rolls; int rolls;

26
scrypt.c
View File

@ -250,11 +250,10 @@ PBKDF2_SHA256_80_128(const uint32_t * passwd, uint32_t * buf)
} }
static inline uint32_t static inline void
PBKDF2_SHA256_80_128_32(const uint32_t * passwd, const uint32_t * salt) PBKDF2_SHA256_80_128_32(const uint32_t * passwd, const uint32_t * salt, uint32_t *ostate)
{ {
uint32_t tstate[8]; uint32_t tstate[8];
uint32_t ostate[8];
uint32_t ihash[8]; uint32_t ihash[8];
uint32_t i; uint32_t i;
@ -292,8 +291,6 @@ PBKDF2_SHA256_80_128_32(const uint32_t * passwd, const uint32_t * salt)
/* Feed the inner hash to the outer SHA256 operation. */ /* Feed the inner hash to the outer SHA256 operation. */
SHA256_Transform(ostate, pad, 0); SHA256_Transform(ostate, pad, 0);
/* Finish the outer SHA256 operation. */
return be32toh(ostate[7]);
} }
@ -359,7 +356,7 @@ salsa20_8(uint32_t B[16], const uint32_t Bx[16])
/* cpu and memory intensive function to transform a 80 byte buffer into a 32 byte output /* cpu and memory intensive function to transform a 80 byte buffer into a 32 byte output
scratchpad size needs to be at least 63 + (128 * r * p) + (256 * r + 64) + (128 * r * N) bytes scratchpad size needs to be at least 63 + (128 * r * p) + (256 * r + 64) + (128 * r * N) bytes
*/ */
static uint32_t scrypt_1024_1_1_256_sp(const uint32_t* input, char* scratchpad) static void scrypt_1024_1_1_256_sp(const uint32_t* input, char* scratchpad, uint32_t *ostate)
{ {
uint32_t * V; uint32_t * V;
uint32_t X[32]; uint32_t X[32];
@ -402,32 +399,34 @@ static uint32_t scrypt_1024_1_1_256_sp(const uint32_t* input, char* scratchpad)
salsa20_8(&X[16], &X[0]); salsa20_8(&X[16], &X[0]);
} }
return PBKDF2_SHA256_80_128_32(input, X); PBKDF2_SHA256_80_128_32(input, X, ostate);
} }
void scrypt_outputhash(struct work *work) void scrypt_outputhash(struct work *work)
{ {
uint32_t data[20]; uint32_t data[20], ohash[8];
char *scratchbuf; char *scratchbuf;
uint32_t *nonce = (uint32_t *)(work->data + 76); uint32_t *nonce = (uint32_t *)(work->data + 76);
be32enc_vect(data, (const uint32_t *)work->data, 19); be32enc_vect(data, (const uint32_t *)work->data, 19);
data[19] = htobe32(*nonce); data[19] = htobe32(*nonce);
scratchbuf = alloca(131584); scratchbuf = alloca(131584);
work->outputhash = scrypt_1024_1_1_256_sp(data, scratchbuf); scrypt_1024_1_1_256_sp(data, scratchbuf, ohash);
work->outputhash = be32toh(ohash[7]);
} }
/* Used externally as confirmation of correct OCL code */ /* Used externally as confirmation of correct OCL code */
bool scrypt_test(unsigned char *pdata, const unsigned char *ptarget, uint32_t nonce) bool scrypt_test(unsigned char *pdata, const unsigned char *ptarget, uint32_t nonce)
{ {
uint32_t tmp_hash7, Htarg = ((const uint32_t *)ptarget)[7]; uint32_t tmp_hash7, Htarg = ((const uint32_t *)ptarget)[7];
uint32_t data[20], ohash[8];
char *scratchbuf; char *scratchbuf;
uint32_t data[20];
be32enc_vect(data, (const uint32_t *)pdata, 19); be32enc_vect(data, (const uint32_t *)pdata, 19);
data[19] = htobe32(nonce); data[19] = htobe32(nonce);
scratchbuf = alloca(131584); scratchbuf = alloca(131584);
tmp_hash7 = scrypt_1024_1_1_256_sp(data, scratchbuf); scrypt_1024_1_1_256_sp(data, scratchbuf, ohash);
tmp_hash7 = be32toh(ohash[7]);
return (tmp_hash7 <= Htarg); return (tmp_hash7 <= Htarg);
} }
@ -453,9 +452,12 @@ bool scanhash_scrypt(struct thr_info *thr, const unsigned char __maybe_unused *p
} }
while(1) { while(1) {
uint32_t ostate[8];
*nonce = ++n; *nonce = ++n;
data[19] = n; data[19] = n;
tmp_hash7 = scrypt_1024_1_1_256_sp(data, scratchbuf); scrypt_1024_1_1_256_sp(data, scratchbuf, ostate);
tmp_hash7 = be32toh(ostate[7]);
if (unlikely(tmp_hash7 <= Htarg)) { if (unlikely(tmp_hash7 <= Htarg)) {
((uint32_t *)pdata)[19] = htobe32(n); ((uint32_t *)pdata)[19] = htobe32(n);