update bip39bruteforce tool

tools/bip39bruteforce.c

@@ -6,30 +6,41 @@
 #include "ecdsa.h"
 #include "curves.h"
 
-char passphrase[256];
+char iter[256];
 uint8_t seed[512 / 8];
 uint8_t addr[21], pubkeyhash[20];
 int count = 0, found = 0;
 HDNode node;
 clock_t start;
 
-// around 120 tries per second
+// around 280 tries per second
 
 // testing data:
 //
 // mnemonic:   "all all all all all all all all all all all all"
+// address:    "1JAd7XCBzGudGpJQSDSfpmJhiygtLQWaGL"
+// passphrase: ""
+//
+// mnemonic:   "all all all all all all all all all all all all"
 // address:    "1N3uJ5AU3FTYQ1ZQgTMtYmgSvMBmQiGVBS"
 // passphrase: "testing"
 
 int main(int argc, char **argv)
 {
-	if (argc != 3) {
-		fprintf(stderr, "Usage: bip39bruteforce mnemonic address\n");
+	if (argc != 2 && argc != 3) {
+		fprintf(stderr, "Usage: bip39bruteforce address [mnemonic]\n");
 		return 1;
 	}
-	const char *mnemonic = argv[1];
-	const char *address = argv[2];
-	if (!mnemonic_check(mnemonic)) {
+	const char *address = argv[1];
+	const char *mnemonic, *item;
+	if (argc == 3) {
+		mnemonic = argv[2];
+		item = "passphrase";
+	} else {
+		mnemonic = NULL;
+		item = "mnemonic";
+	}
+	if (mnemonic && !mnemonic_check(mnemonic)) {
 		fprintf(stderr, "\"%s\" is not a valid mnemonic\n", mnemonic);
 		return 2;
 	}
@@ -37,23 +48,28 @@ int main(int argc, char **argv)
 		fprintf(stderr, "\"%s\" is not a valid address\n", address);
 		return 3;
 	}
-	printf("Reading passphrases from stdin ...\n");
+	printf("Reading %ss from stdin ...\n", item);
 	start = clock();
 	for (;;) {
-		if (fgets(passphrase, 256, stdin) == NULL) break;
-		int len = strlen(passphrase);
+		if (fgets(iter, 256, stdin) == NULL) break;
+		int len = strlen(iter);
 		if (len <= 0) {
 			continue;
 		}
 		count++;
-		passphrase[len - 1] = 0;
-		mnemonic_to_seed(mnemonic, passphrase, seed, NULL);
+		iter[len - 1] = 0;
+		if (mnemonic) {
+			mnemonic_to_seed(mnemonic, iter, seed, NULL);
+		} else {
+			mnemonic_to_seed(iter, "", seed, NULL);
+		}
 		hdnode_from_seed(seed, 512 / 8, SECP256K1_NAME, &node);
 		hdnode_private_ckd_prime(&node, 44);
 		hdnode_private_ckd_prime(&node, 0);
 		hdnode_private_ckd_prime(&node, 0);
 		hdnode_private_ckd(&node, 0);
 		hdnode_private_ckd(&node, 0);
+		hdnode_fill_public_key(&node);
 		ecdsa_get_pubkeyhash(node.public_key, pubkeyhash);
 		if (memcmp(addr + 1, pubkeyhash, 20) == 0) {
 			found = 1;
@@ -61,11 +77,11 @@ int main(int argc, char **argv)
 		}
 	}
 	float dur = (float)(clock() - start) / CLOCKS_PER_SEC;
-	printf("Tried %d passphrases in %f seconds = %f tries/second\n", count, dur, (float)count/dur);
+	printf("Tried %d %ss in %f seconds = %f tries/second\n", count, item, dur, (float)count/dur);
 	if (found) {
-		printf("Correct passphrase found! :-)\n\"%s\"\n", passphrase);
+		printf("Correct %s found! :-)\n\"%s\"\n", item, iter);
 		return 0;
 	}
-	printf("Correct passphrase not found. :-(\n");
+	printf("Correct %s not found. :-(\n", item);
 	return 4;
 }