From a614823fa7891bef6bfa3e4b44f40a22ce557cef Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Thu, 25 Nov 2010 01:02:53 -0500 Subject: [PATCH] Remove unused OpenSSL dependency. Also, turn a few strings into #define'd constants. --- Makefile.am | 2 +- README | 1 - configure.ac | 2 -- cpu-miner.c | 21 +++++++++------------ 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/Makefile.am b/Makefile.am index d19a3dcc..8032eece 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 ce34b758..6d8caa79 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 1cb3712f..7ae98887 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 df1da5e9..4985a073 100644 --- a/cpu-miner.c +++ b/cpu-miner.c @@ -21,9 +21,10 @@ #include #include #include -#include -#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; }