Change default retry timeout

26Uncle · May 16, 2014 · c1f737f · c1f737f
1 parent 3a9fc0e
commit c1f737f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/cpu-miner.c b/cpu-miner.c
@@ -137,7 +137,7 @@ bool use_syslog = false;
 static bool opt_background = false;
 static bool opt_quiet = false;
 static int opt_retries = -1;
-static int opt_fail_pause = 30;
+static int opt_fail_pause = 10;
 static int jsonrpc_2 = false;
 int opt_timeout = 0;
 static int opt_scantime = 5;

diff --git a/crypto/oaes_lib.c b/crypto/oaes_lib.c
@@ -266,10 +266,8 @@ static OAES_RET oaes_sub_byte( uint8_t * byte )
 	if( unlikely(NULL == byte) )
 		return OAES_RET_ARG1;
 
-	_x = _y = *byte;
+	_y = ((_x = *byte) >> 4) & 0x0f;
 	_x &= 0x0f;
-	_y &= 0xf0;
-	_y >>= 4;
 	*byte = oaes_sub_byte_value[_y][_x];
 
 	return OAES_RET_SUCCESS;
@@ -373,11 +371,9 @@ static OAES_RET oaes_inv_shift_rows( uint8_t block[OAES_BLOCK_SIZE] )
 static uint8_t oaes_gf_mul(uint8_t left, uint8_t right)
 {
 	size_t _x, _y;
-	
-	_x = _y = left;
+
+	_y = ((_x = left) >> 4) & 0x0f;
 	_x &= 0x0f;
-	_y &= 0xf0;
-	_y >>= 4;
 
 	switch( right )
 	{