From d0dbe37a3bdb2fc24a4d5ba5d3acc03052efdc8e Mon Sep 17 00:00:00 2001
From: samr7 <samr7@cs.washington.edu>
Date: Sat, 20 Aug 2011 14:42:12 -0700
Subject: [PATCH] Add fdumphex() and fdumpbn() for use with stderr.

---
 oclvanitygen.c | 27 ++++++++++++++-------------
 util.c         | 20 ++++++++++++++++----
 util.h         |  3 +++
 3 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/oclvanitygen.c b/oclvanitygen.c
index 84054ea..afcece6 100644
--- a/oclvanitygen.c
+++ b/oclvanitygen.c
@@ -1544,9 +1544,10 @@ vg_ocl_prefix_check(vg_ocl_context_t *vocp, int slot)
 			tablesize = ocl_found_out[2];
 			fprintf(stderr, "Match idx: %d\n", ocl_found_out[1]);
 			fprintf(stderr, "CPU hash: ");
-			dumphex(vxcp->vxc_binres + 1, 20);
+			fdumphex(stderr, vxcp->vxc_binres + 1, 20);
 			fprintf(stderr, "GPU hash: ");
-			dumphex((unsigned char *) (ocl_found_out + 2), 20);
+			fdumphex(stderr,
+				 (unsigned char *) (ocl_found_out + 2), 20);
 			fprintf(stderr, "Found delta: %d "
 			       "Start delta: %d\n",
 			       found_delta, orig_delta);
@@ -1689,7 +1690,7 @@ vg_ocl_verify_temporary(vg_ocl_context_t *vocp, int slot, int z_inverted)
 			    BN_cmp(&bnz, bnzc)) {
 				if (!mismatches) {
 					fprintf(stderr, "Base privkey: ");
-					dumpbn(EC_KEY_get0_private_key(
+					fdumpbn(stderr, EC_KEY_get0_private_key(
 						       vxcp->vxc_key));
 				}
 				mismatches++;
@@ -1699,33 +1700,33 @@ vg_ocl_verify_temporary(vg_ocl_context_t *vocp, int slot, int z_inverted)
 				if (!mm_r) {
 					mm_r = 1;
 					fprintf(stderr, "Row X   : ");
-					dumpbn(&ppr->X);
+					fdumpbn(stderr, &ppr->X);
 					fprintf(stderr, "Row Y   : ");
-					dumpbn(&ppr->Y);
+					fdumpbn(stderr, &ppr->Y);
 				}
 
 				fprintf(stderr, "Column X: ");
-				dumpbn(&ppc->X);
+				fdumpbn(stderr, &ppc->X);
 				fprintf(stderr, "Column Y: ");
-				dumpbn(&ppc->Y);
+				fdumpbn(stderr, &ppc->Y);
 
 				if (BN_cmp(&ppt->X, &pps->X)) {
 					fprintf(stderr, "Expect X: ");
-					dumpbn(&pps->X);
+					fdumpbn(stderr, &pps->X);
 					fprintf(stderr, "Device X: ");
-					dumpbn(&ppt->X);
+					fdumpbn(stderr, &ppt->X);
 				}
 				if (BN_cmp(&ppt->Y, &pps->Y)) {
 					fprintf(stderr, "Expect Y: ");
-					dumpbn(&pps->Y);
+					fdumpbn(stderr, &pps->Y);
 					fprintf(stderr, "Device Y: ");
-					dumpbn(&ppt->Y);
+					fdumpbn(stderr, &ppt->Y);
 				}
 				if (BN_cmp(&bnz, bnzc)) {
 					fprintf(stderr, "Expect Z: ");
-					dumpbn(bnzc);
+					fdumpbn(stderr, bnzc);
 					fprintf(stderr, "Device Z: ");
-					dumpbn(&bnz);
+					fdumpbn(stderr, &bnz);
 				}
 			}
 		}
diff --git a/util.c b/util.c
index 5103541..6e7be17 100644
--- a/util.c
+++ b/util.c
@@ -60,25 +60,37 @@ const signed char vg_b58_reverse_map[256] = {
 };
 
 void
-dumphex(const unsigned char *src, size_t len)
+fdumphex(FILE *fp, const unsigned char *src, size_t len)
 {
 	size_t i;
 	for (i = 0; i < len; i++) {
-		printf("%02x", src[i]);
+		fprintf(fp, "%02x", src[i]);
 	}
 	printf("\n");
 }
 
 void
-dumpbn(const BIGNUM *bn)
+fdumpbn(FILE *fp, const BIGNUM *bn)
 {
 	char *buf;
 	buf = BN_bn2hex(bn);
-	printf("%s\n", buf ? buf : "0");
+	fprintf(stderr, "%s\n", buf ? buf : "0");
 	if (buf)
 		OPENSSL_free(buf);
 }
 
+void
+dumphex(const unsigned char *src, size_t len)
+{
+	fdumphex(stdout, src, len);
+}
+
+void
+dumpbn(const BIGNUM *bn)
+{
+	fdumpbn(stdout, bn);
+}
+
 /*
  * Key format encode/decode
  */
diff --git a/util.h b/util.h
index 1ca89ed..3cffb75 100644
--- a/util.h
+++ b/util.h
@@ -19,6 +19,7 @@
 #if !defined (__VG_UTIL_H__)
 #define __VG_UTIL_H__
 
+#include <stdio.h>
 #include <stdint.h>
 
 #include <openssl/bn.h>
@@ -27,6 +28,8 @@
 extern const char *vg_b58_alphabet;
 extern const signed char vg_b58_reverse_map[256];
 
+extern void fdumphex(FILE *fp, const unsigned char *src, size_t len);
+extern void fdumpbn(FILE *fp, const BIGNUM *bn);
 extern void dumphex(const unsigned char *src, size_t len);
 extern void dumpbn(const BIGNUM *bn);