From 2ee4f988c2cc77031b2d383c5f993e25b3b288d3 Mon Sep 17 00:00:00 2001 From: moloch Date: Mon, 19 Mar 2018 18:50:24 -0500 Subject: [PATCH] Updated readme --- .gitignore | 6 ++++++ README.md | 10 +++------- hashlookup.py | 15 +++++++-------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index f4f4e9d..bf2afdc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,9 @@ +checksort +sortidx + +words.txt +test/ + # Python files *.py[co] diff --git a/README.md b/README.md index 9b93475..f059178 100644 --- a/README.md +++ b/README.md @@ -6,15 +6,11 @@ Introduction There are three components to this system: -1. The indexing script (createidx.py), which takes a wordlist and builds - a lookup table index for a hash function and the words in the list. +1. The indexing script `createidx.py`, which takes a wordlist and builds a lookup table index for a hash function and the words in the list. -2. The indexing sorter program (sortidx.c), which sorts an index created by the - indexing script, so that the lookup script can use a binary search on the - index to crack hashes. +2. The indexing sorter program `sortidx.c`, which sorts an index created by the indexing script, so that the lookup script can use a binary search on the index to crack hashes. -3. The lookup script (LookupTable.py), which uses the wordlist and index to - crack hashes. +3. The lookup script `hashlookup.py`, which uses the wordlist and index to crack hashes. Suported Algorithms: * lm diff --git a/hashlookup.py b/hashlookup.py index 21ae6cd..60d6a57 100755 --- a/hashlookup.py +++ b/hashlookup.py @@ -211,14 +211,14 @@ def _cli(args, table): sys.stdout.write("%d) %s -> %s\n" % (index, hsh, results[hsh],)) sys.stdout.flush() sys.stdout.write("%sTotal lookup time: %.6f\n" % (INFO, lookup_time)) - percent = 100 * (float(len(cracked)) // float(len(hashes))) + percent = 100 * len(cracked) / len(hashes) sys.stdout.write("%sCracked %d of %d (%3.2f%s)\n" % (MONEY, len(cracked), len(hashes), percent, '%')) sys.stdout.flush() parser = argparse.ArgumentParser(description='Search sorted IDX files for hashes') parser.add_argument('-v', '--version', action='version', - version='LookupTable 0.1.2') + version='hashlookup 0.1.3') parser.add_argument('-d', '--debug', action='store_true', dest='debug', @@ -226,20 +226,19 @@ def _cli(args, table): parser.add_argument('-e', '--decoder', dest='decoder', help='decode hashes using an encoder') - parser.add_argument('-w', + parser.add_argument('-w', '--wordlist', dest='wordlist', help='wordlist file', required=True) - parser.add_argument('-i', + parser.add_argument('-i', '--index', dest='index', help='the .idx file matching the wordlist', required=True) - parser.add_argument('-a', + parser.add_argument('-a', '--algorithm', dest='algorithm', - help='hashing algorithm: %s' % sorted( - algorithms.keys()), + help='hashing algorithm: %s' % sorted(algorithms.keys()), required=True) - parser.add_argument('-c', + parser.add_argument('-c', '--crack', nargs='*', dest='hash', help='crack a file or list of hashes')