Commit a614823fa7891bef6bfa3e4b44f40a22ce557cef
2010-11-25T01:02:53
Remove unused OpenSSL dependency. Also, turn a few strings into #define'd constants.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114
diff --git a/Makefile.am b/Makefile.am
index d19a3dc..8032eec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,5 +7,5 @@ EXTRA_DIST = sha256_generic.c
minerd_SOURCES = cpu-miner.c
minerd_LDFLAGS = -pthread
-minerd_LDADD = @CRYPTO_LIBS@ @LIBCURL@ @JANSSON_LIBS@
+minerd_LDADD = @LIBCURL@ @JANSSON_LIBS@
diff --git a/README b/README
index ce34b75..6d8caa7 100644
--- a/README
+++ b/README
@@ -6,7 +6,6 @@ License: GPLv2. See COPYING for details.
Dependencies:
libcurl http://curl.haxx.se/libcurl/
jansson http://www.digip.org/jansson/
- OpenSSL libcrypto http://www.openssl.org/
Basic build instructions:
./autogen.sh
diff --git a/configure.ac b/configure.ac
index 1cb3712..7ae9888 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,6 @@ AM_PROG_CC_C_O
dnl Checks for header files.
AC_HEADER_STDC
-AC_CHECK_LIB(crypto, MD5_Init, CRYPTO_LIBS=-lcrypto)
AC_CHECK_LIB(jansson, json_loads, JANSSON_LIBS=-ljansson)
PKG_PROG_PKG_CONFIG()
@@ -24,7 +23,6 @@ PKG_PROG_PKG_CONFIG()
LIBCURL_CHECK_CONFIG(, 7.10.1, ,
[AC_MSG_ERROR([Missing required libcurl >= 7.10.1])])
-AC_SUBST(CRYPTO_LIBS)
AC_SUBST(JANSSON_LIBS)
AC_CONFIG_FILES([
diff --git a/cpu-miner.c b/cpu-miner.c
index df1da5e..4985a07 100644
--- a/cpu-miner.c
+++ b/cpu-miner.c
@@ -21,9 +21,10 @@
#include <argp.h>
#include <jansson.h>
#include <curl/curl.h>
-#include <openssl/bn.h>
-#define PROGRAM_NAME "minerd"
+#define PROGRAM_NAME "minerd"
+#define DEF_RPC_URL "http://127.0.0.1:8332/"
+#define DEF_RPC_USERPASS "rpcuser:rpcpass"
#include "sha256_generic.c"
@@ -39,8 +40,8 @@ static const bool opt_time = true;
static int opt_n_threads = 1;
static pthread_mutex_t stats_mutex = PTHREAD_MUTEX_INITIALIZER;
static uint64_t hash_ctr;
-static char *rpc_url = "http://127.0.0.1:8332/";
-static char *userpass = "rpcuser:rpcpass";
+static char *rpc_url = DEF_RPC_URL;
+static char *userpass = DEF_RPC_USERPASS;
static struct argp_option options[] = {
@@ -55,11 +56,11 @@ static struct argp_option options[] = {
{ "url", 1001, "URL", 0,
"URL for bitcoin JSON-RPC server "
- "(default: http://127.0.0.1:8332/)" },
+ "(default: " DEF_RPC_URL ")" },
{ "userpass", 1002, "USER:PASS", 0,
"Username:Password pair for bitcoin JSON-RPC server "
- "(default: rpcuser:rpcpass)" },
+ "(default: " DEF_RPC_USERPASS ")" },
{ }
};
@@ -85,7 +86,7 @@ struct work {
unsigned char data[128];
unsigned char hash[32];
unsigned char hash1[64];
- BIGNUM *target;
+ unsigned char target[32];
};
static void databuf_free(struct data_buffer *db)
@@ -286,9 +287,6 @@ static void work_free(struct work *work)
if (!work)
return;
- if (work->target)
- BN_free(work->target);
-
free(work);
}
@@ -316,8 +314,7 @@ static struct work *work_decode(const json_t *val)
goto err_out;
}
- if (!BN_hex2bn(&work->target,
- json_string_value(json_object_get(val, "target")))) {
+ if (!jobj_binary(val, "target", work->target, sizeof(work->target))) {
fprintf(stderr, "JSON inval target\n");
goto err_out;
}