Remove 'hash1' argument from sha256_{cryptopp,c}

cpu-miner.c

@@ -585,7 +585,7 @@ static void *miner_thread(void *userdata)
 		switch (opt_algo) {
 		case ALGO_C:
 			rc = scanhash_c(thr_id, work.midstate, work.data + 64,
-				        work.hash1, work.hash, work.target,
+				        work.hash, work.target,
 					max_nonce, &hashes_done);
 			break;
 
@@ -621,7 +621,7 @@ static void *miner_thread(void *userdata)
 #endif
 		case ALGO_CRYPTOPP:
 			rc = scanhash_cryptopp(thr_id, work.midstate, work.data + 64,
-				        work.hash1, work.hash, work.target,
+				        work.hash, work.target,
 					max_nonce, &hashes_done);
 			break;
 

miner.h

@@ -158,12 +158,10 @@ extern bool scanhash_via(int, unsigned char *data_inout,
 	uint32_t max_nonce, unsigned long *hashes_done);
 
 extern bool scanhash_c(int, const unsigned char *midstate, unsigned char *data,
-	      unsigned char *hash1, unsigned char *hash,
-	      const unsigned char *target,
+	      unsigned char *hash, const unsigned char *target,
 	      uint32_t max_nonce, unsigned long *hashes_done);
 extern bool scanhash_cryptopp(int, const unsigned char *midstate,unsigned char *data,
-	      unsigned char *hash1, unsigned char *hash,
-	      const unsigned char *target,
+	      unsigned char *hash, const unsigned char *target,
 	      uint32_t max_nonce, unsigned long *hashes_done);
 extern bool scanhash_asm32(int, const unsigned char *midstate,unsigned char *data,
 	      unsigned char *hash1, unsigned char *hash,

sha256_cryptopp.c

@@ -94,8 +94,7 @@ static void runhash(void *state, const void *input, const void *init)
 
 /* suspiciously similar to ScanHash* from bitcoin */
 bool scanhash_cryptopp(int thr_id, const unsigned char *midstate,
-		unsigned char *data,
-	        unsigned char *hash1, unsigned char *hash,
+		unsigned char *data, unsigned char *hash,
 		const unsigned char *target,
 	        uint32_t max_nonce, unsigned long *hashes_done)
 {
@@ -107,6 +106,8 @@ bool scanhash_cryptopp(int thr_id, const unsigned char *midstate,
 	work_restart[thr_id].restart = 0;
 
 	while (1) {
+		unsigned char hash1[32];
+
 		n++;
 		*nonce = n;
 
@@ -579,8 +580,7 @@ static void runhash32(void *state, const void *input, const void *init)
 
 /* suspiciously similar to ScanHash* from bitcoin */
 bool scanhash_asm32(int thr_id, const unsigned char *midstate,
-		unsigned char *data,
-	        unsigned char *hash1, unsigned char *hash,
+		unsigned char *data, unsigned char *hash,
 		const unsigned char *target,
 	        uint32_t max_nonce, unsigned long *hashes_done)
 {
@@ -592,6 +592,8 @@ bool scanhash_asm32(int thr_id, const unsigned char *midstate,
 	work_restart[thr_id].restart = 0;
 
 	while (1) {
+		unsigned char hash1[32];
+
 		n++;
 		*nonce = n;
 

sha256_generic.c

@@ -240,8 +240,7 @@ const uint32_t sha256_init_state[8] = {
 
 /* suspiciously similar to ScanHash* from bitcoin */
 bool scanhash_c(int thr_id, const unsigned char *midstate, unsigned char *data,
-	        unsigned char *hash1, unsigned char *hash,
-		const unsigned char *target,
+	        unsigned char *hash, const unsigned char *target,
 	        uint32_t max_nonce, unsigned long *hashes_done)
 {
 	uint32_t *hash32 = (uint32_t *) hash;
@@ -252,6 +251,8 @@ bool scanhash_c(int thr_id, const unsigned char *midstate, unsigned char *data,
 	work_restart[thr_id].restart = 0;
 
 	while (1) {
+		unsigned char hash1[32];
+
 		n++;
 		*nonce = n;