Merge branch 'master' into irclogirclog-v0.1.79

3 files changed, 35 insertions, 31 deletions

diff --git a/wasm/sha256.c b/wasm/sha256.c
index b6160af..3d6e9f1 100644
--- a/wasm/sha256.c
+++ b/wasm/sha256.c
@@ -15,7 +15,6 @@
 /*************************** HEADER FILES ***************************/
 #include "sha256.h"
 
-
 /****************************** MACROS ******************************/
 #define ROTLEFT(a,b) (((a) << (b)) | ((a) >> (32-(b))))
 #define ROTRIGHT(a,b) (((a) >> (b)) | ((a) << (32-(b))))
@@ -35,14 +34,14 @@
 
 /**************************** VARIABLES *****************************/
 static const WORD k[64] = {
-	0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5,0x3956c25b,0x59f111f1,0x923f82a4,0xab1c5ed5,
-	0xd807aa98,0x12835b01,0x243185be,0x550c7dc3,0x72be5d74,0x80deb1fe,0x9bdc06a7,0xc19bf174,
-	0xe49b69c1,0xefbe4786,0x0fc19dc6,0x240ca1cc,0x2de92c6f,0x4a7484aa,0x5cb0a9dc,0x76f988da,
-	0x983e5152,0xa831c66d,0xb00327c8,0xbf597fc7,0xc6e00bf3,0xd5a79147,0x06ca6351,0x14292967,
-	0x27b70a85,0x2e1b2138,0x4d2c6dfc,0x53380d13,0x650a7354,0x766a0abb,0x81c2c92e,0x92722c85,
-	0xa2bfe8a1,0xa81a664b,0xc24b8b70,0xc76c51a3,0xd192e819,0xd6990624,0xf40e3585,0x106aa070,
-	0x19a4c116,0x1e376c08,0x2748774c,0x34b0bcb5,0x391c0cb3,0x4ed8aa4a,0x5b9cca4f,0x682e6ff3,
-	0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208,0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2
+	0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
+	0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
+	0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
+	0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
+	0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
+	0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
+	0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
+	0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
 };
 
 /*********************** FUNCTION DEFINITIONS ***********************/
@@ -51,8 +50,10 @@ void sha256_transform(SHA256_CTX *ctx, const BYTE data[])
 	WORD a, b, c, d, e, f, g, h, i, j, t1, t2, m[64];
 
 	for (i = 0, j = 0; i < 16; ++i, j += 4)
-		m[i] = (data[j] << 24) | (data[j + 1] << 16) | (data[j + 2] << 8) | (data[j + 3]);
-	for ( ; i < 64; ++i)
+		m[i] =
+		    (data[j] << 24) | (data[j + 1] << 16) | (data[j + 2] << 8) |
+		    (data[j + 3]);
+	for (; i < 64; ++i)
 		m[i] = SIG1(m[i - 2]) + m[i - 7] + SIG0(m[i - 15]) + m[i - 16];
 
 	a = ctx->state[0];
@@ -65,8 +66,8 @@ void sha256_transform(SHA256_CTX *ctx, const BYTE data[])
 	h = ctx->state[7];
 
 	for (i = 0; i < 64; ++i) {
-		t1 = h + EP1(e) + CH(e,f,g) + k[i] + m[i];
-		t2 = EP0(a) + MAJ(a,b,c);
+		t1 = h + EP1(e) + CH(e, f, g) + k[i] + m[i];
+		t2 = EP0(a) + MAJ(a, b, c);
 		h = g;
 		g = f;
 		f = e;
@@ -127,8 +128,7 @@ void sha256_final(SHA256_CTX *ctx, BYTE hash[])
 		ctx->data[i++] = 0x80;
 		while (i < 56)
 			ctx->data[i++] = 0x00;
-	}
-	else {
+	} else {
 		ctx->data[i++] = 0x80;
 		while (i < 64)
 			ctx->data[i++] = 0x00;
@@ -151,9 +151,9 @@ void sha256_final(SHA256_CTX *ctx, BYTE hash[])
 	// Since this implementation uses little endian byte ordering and SHA uses big endian,
 	// reverse all the bytes when copying the final state to the output hash.
 	for (i = 0; i < 4; ++i) {
-		hash[i]      = (ctx->state[0] >> (24 - i * 8)) & 0x000000ff;
-		hash[i + 4]  = (ctx->state[1] >> (24 - i * 8)) & 0x000000ff;
-		hash[i + 8]  = (ctx->state[2] >> (24 - i * 8)) & 0x000000ff;
+		hash[i] = (ctx->state[0] >> (24 - i * 8)) & 0x000000ff;
+		hash[i + 4] = (ctx->state[1] >> (24 - i * 8)) & 0x000000ff;
+		hash[i + 8] = (ctx->state[2] >> (24 - i * 8)) & 0x000000ff;
 		hash[i + 12] = (ctx->state[3] >> (24 - i * 8)) & 0x000000ff;
 		hash[i + 16] = (ctx->state[4] >> (24 - i * 8)) & 0x000000ff;
 		hash[i + 20] = (ctx->state[5] >> (24 - i * 8)) & 0x000000ff;
diff --git a/wasm/sha256.h b/wasm/sha256.h
index ff07d85..bbf9abc 100644
--- a/wasm/sha256.h
+++ b/wasm/sha256.h
@@ -13,11 +13,11 @@
 #include <stddef.h>
 
 /****************************** MACROS ******************************/
-#define SHA256_BLOCK_SIZE 32            // SHA256 outputs a 32 byte digest
+#define SHA256_BLOCK_SIZE 32	// SHA256 outputs a 32 byte digest
 
 /**************************** DATA TYPES ****************************/
-typedef unsigned char BYTE;             // 8-bit byte
-typedef unsigned int  WORD;             // 32-bit word, change to "long" for 16-bit machines
+typedef unsigned char BYTE;	// 8-bit byte
+typedef unsigned int WORD;	// 32-bit word, change to "long" for 16-bit machines
 
 typedef struct {
 	BYTE data[64];
@@ -27,8 +27,8 @@ typedef struct {
 } SHA256_CTX;
 
 /*********************** FUNCTION DECLARATIONS **********************/
-void sha256_init(SHA256_CTX *ctx);
-void sha256_update(SHA256_CTX *ctx, const BYTE data[], size_t len);
-void sha256_final(SHA256_CTX *ctx, BYTE hash[]);
+void sha256_init(SHA256_CTX * ctx);
+void sha256_update(SHA256_CTX * ctx, const BYTE data[], size_t len);
+void sha256_final(SHA256_CTX * ctx, BYTE hash[]);
 
-#endif   // SHA256_H
+#endif				// SHA256_H
diff --git a/wasm/solver.c b/wasm/solver.c
index eb8647b..890a34c 100644
--- a/wasm/solver.c
+++ b/wasm/solver.c
@@ -6,7 +6,8 @@
 
 unsigned char challenge[32];
 
-char validate_hash(unsigned char *hash, unsigned char zero_bit_count) {
+char validate_hash(unsigned char *hash, unsigned char zero_bit_count)
+{
 	unsigned char q = zero_bit_count / 8;
 	unsigned char r = zero_bit_count % 8;
 
@@ -25,11 +26,13 @@ char validate_hash(unsigned char *hash, unsigned char zero_bit_count) {
 	return 1;
 }
 
-unsigned char *get_challenge_ptr() {
+unsigned char *get_challenge_ptr()
+{
 	return challenge;
 }
 
-unsigned long long solve(unsigned char difficulty) {
+unsigned long long solve(unsigned char difficulty)
+{
 	unsigned long long nonce;
 	SHA256_CTX context;
 
@@ -37,13 +40,14 @@ unsigned long long solve(unsigned char difficulty) {
 
 	nonce = 0;
 
-	while(1) {
+	while (1) {
 		sha256_init(&context);
 		sha256_update(&context, challenge, sizeof(challenge));
-		sha256_update(&context, (unsigned char*)(&nonce), sizeof(nonce));
+		sha256_update(&context, (unsigned char *)(&nonce),
+			      sizeof(nonce));
 		sha256_final(&context, hash);
 
-		if(validate_hash(hash, difficulty)) {
+		if (validate_hash(hash, difficulty)) {
 			break;
 		}