attic/btcollider
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed several problems and warnings

Browse source
This commit is contained in:
armin 2018-04-28 21:27:40 +02:00
parent dfdeb5e52c
commit bda6330fbb
8 changed files with 51 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bfclient/src/bf/libs/ec_pubkey_fast.c
View file

@ -24,8 +24,6 @@
#include "vendor/secp256k1/src/ecmult.h"
#include "vendor/secp256k1/src/eckey_impl.h"
static int secp256k1_eckey_pubkey_parse(secp256k1_ge_t *elem, const unsigned char *pub, int size);
#include "mmapf.h"
#undef ASSERT
@ -424,7 +422,7 @@ int secp256k1_scalar_add_b32(void * out, void * a, void *b) {
return 0;
}
inline static void _priv_add(unsigned char *priv, unsigned char add, int p) {
inline static void priv_add(unsigned char *priv, unsigned char add, int p) {
priv[p] += add;
if (priv[p] < add) {
priv[--p] += 1;
@ -439,13 +437,13 @@ inline static void _priv_add(unsigned char *priv, unsigned char add, int p) {
}
void priv_add_uint8(unsigned char *priv, unsigned char add) {
_priv_add(priv, add, 31);
priv_add(priv, add, 31);
}
void priv_add_uint32(unsigned char *priv, unsigned int add) {
int p = 31;
while (add) {
_priv_add(priv, add & 255, p--);
priv_add(priv, add & 255, p--);
add >>= 8;
}
}

41
bfclient/src/bf/libs/ripemd160_256.c
View file

@ -153,31 +153,32 @@ static const uint32_t KR[5] = {
0x00000000u /* Round 5: 0 */
};
static inline void byteswap32(uint32_t *v)
{
union { uint32_t w; uint8_t b[4]; } x, y;
static inline void byteswap32(uint32_t *v) {
union {
uint32_t w;
uint8_t b[4];
} x, y;
x.w = *v;
y.b[0] = x.b[3];
y.b[1] = x.b[2];
y.b[2] = x.b[1];
y.b[3] = x.b[0];
*v = y.w;
x.w = *v;
y.b[0] = x.b[3];
y.b[1] = x.b[2];
y.b[2] = x.b[1];
y.b[3] = x.b[0];
*v = y.w;
/* Wipe temporary variables */
x.w = y.w = 0;
/* Wipe temporary variables */
x.w = y.w = 0;
}
static inline void byteswap_digest(uint32_t *p)
{
unsigned int i;
static inline void byteswap_digest(uint32_t *p) { // @suppress("Unused static function")
unsigned int i;
for (i = 0; i < 4; i++) {
byteswap32(p++);
byteswap32(p++);
byteswap32(p++);
byteswap32(p++);
}
for (i = 0; i < 4; i++) {
byteswap32(p++);
byteswap32(p++);
byteswap32(p++);
byteswap32(p++);
}
}
/* The RIPEMD160 compression function. */

4
bfclient/src/util/bytestr.cpp
View file

@ -59,9 +59,7 @@ void bytestr::set(const byte* fromBytes, int len) {
}
}
bool bytestr::isEmpty(void){
return bytes.empty();
}
bool bytestr::isEmpty(void) { return (bytes.empty()); }
const byte& bytestr::operator[](const int index) const {
return (bytes[index]);

10
cnc/src/main/java/org/btcollider/cnc/comm/ClientWorker.java
View file

@ -42,7 +42,7 @@ public class ClientWorker implements Runnable {
try {
cmd = in.readLine();
} catch (IOException e) {
log.error("Couldn't read command from communication channel");
log.error("Couldn't read command from communication channel", e);
closeCommChannel();
return;
}
@ -101,7 +101,13 @@ public class ClientWorker implements Runnable {
private void retrieveResult() {
try {
String[] result = in.readLine().split(" "); // TODO: null check for in.readLine()
String tmpRes = in.readLine();
if (tmpRes == null) {
log.warn("Couldn't read result from {}", clientSocket.getRemoteSocketAddress());
return;
}
String[] result = tmpRes.split(" ");
KeyRange kr = new KeyRange(Long.parseLong(result[0], 16), Long.parseLong(result[1], 16));
synchronized (keyServer) {

6
cnc/src/main/java/org/btcollider/cnc/comm/CommServer.java
View file

@ -28,10 +28,10 @@ public class CommServer {
ExecutorService es = Executors.newCachedThreadPool();
while (true) {
while (true) { // NOSONAR
try {
Socket socket = serverSocket.accept();
log.debug("Got connection from " + socket.getInetAddress());
log.debug("Got connection from {}", socket.getInetAddress());
es.execute(new ClientWorker(socket, keyServer));
} catch (IOException e) {
@ -52,7 +52,7 @@ public class CommServer {
this.serverSocket = new ServerSocket(port);
} catch (IOException e) {
log.error("Couldn't allocate server socket", e);
throw new CommException(e);
}
}

4
cnc/src/main/java/org/btcollider/cnc/dto/KeyRange.java
View file

@ -29,9 +29,7 @@ public class KeyRange {
public Long getTotal() {
// asserted that <= MAX_BITS, first long contains all significant bits
Long total = getEnd() - getStart() + 1; // +1 bc start is included too
return total;
return (getEnd() - getStart() + 1); // +1 bc start is included too
}
@Override

17
cnc/src/main/java/org/btcollider/cnc/keysrv/impl/keytree/KeyTreeServer.java
View file

@ -32,7 +32,8 @@ public class KeyTreeServer implements KeyServer {
prune(pruneKey);
if (maxWorkSpan > 0) {
log.info("Starting KeyTree concierge");
log.info("Starting KeyTree concierge with timeout {}s",
TimeUnit.MILLISECONDS.toSeconds(maxWorkSpan));
ScheduledExecutorService es = Executors.newSingleThreadScheduledExecutor();
es.scheduleWithFixedDelay(new KTConcierge(root, maxWorkSpan), 0, 30, TimeUnit.SECONDS);
} else {
@ -51,9 +52,7 @@ public class KeyTreeServer implements KeyServer {
keyEnd.or(keyStart); // set keyEnd to keyStart
keyEnd.flip(0, index + 1 - depth); // reverse last bits
KeyRange kr = new KeyRange(keyStart, keyEnd);
return kr;
return new KeyRange(keyStart, keyEnd);
}
public void setSearched(Long from, Long to) {
@ -81,7 +80,7 @@ public class KeyTreeServer implements KeyServer {
}
public String printDot() {
StringBuffer buffer = new StringBuffer();
StringBuilder buffer = new StringBuilder();
buffer.append("strict graph { \n");
Queue<KeyTree> frontier = new LinkedList<>();
@ -233,12 +232,10 @@ public class KeyTreeServer implements KeyServer {
private KeyTree generateKeyTree(int depth) {
assert depth > 0;
KeyTree root = new KeyTree(true, null);
log.info("Starting recGenTree");
recGenKeyTree(root, depth - 1);
log.info("Ending recGenTree");
KeyTree genRoot = new KeyTree(true, null);
recGenKeyTree(genRoot, depth - 1);
return root;
return genRoot;
}
private void recGenKeyTree(KeyTree kt, int depth) {

18
cnc/src/test/java/org/btcollider/cnc/keysrv/KeyServerTest.java
View file

@ -1,21 +1,17 @@
package org.btcollider.cnc.keysrv;
import static org.junit.jupiter.api.Assertions.*;
import java.util.concurrent.TimeUnit;
import org.btcollider.cnc.dto.KeyRange;
import org.btcollider.cnc.keysrv.impl.keytree.KeyTreeServer;
import org.junit.jupiter.api.Test;
class KeyServerTest {
@Test
void testMultiStagedServer() {
KeyServer ks = KSFactory.build(40, 30, 0, TimeUnit.SECONDS);
KeyRange kr = ks.getRange();
ks.setInWork(kr);
ks.setSearched(kr);
}
@Test
void testMultiStagedServer() {
KeyServer ks = KSFactory.build(40, 30, 0, TimeUnit.SECONDS);
KeyRange kr = ks.getRange();
ks.setInWork(kr);
ks.setSearched(kr);
}
}