fix for issue #37

dagon.py

@@ -14,7 +14,6 @@
     create_wordlist
 )
 from lib.settings import (
-    CLONE,
     LOGGER,
     VERSION_STRING,
     algorithm_pointers,
@@ -34,6 +33,17 @@
 
 if __name__ == '__main__':
 
+    # # # # # # # # #
+    # DO NOT REMOVE THIS
+    # I don't know how, I don't know why, but this fixes pretty much
+    # all of the `ascii can't decode byte` errors. This has to be the
+    # very first thing done in order for some of the hashes to work
+    # successfully. Once again, I don't know how or why it works,
+    # but it works.
+    reload(sys)
+    sys.setdefaultencoding("utf8")
+    # # # # # # # # # #
+
     parser = optparse.OptionParser(usage="dagon [c|v|V|l] HASH|HASH-LIST --bruteforce [OPTS]")
 
     # Mandatory arguments, required for program to run

lib/settings.py

@@ -31,7 +31,7 @@
 LOGGER.addHandler(stream)
 
 # Version number <major>.<minor>.<patch>.<git-commit>
-VERSION = "1.12.26.45"
+VERSION = "1.12.27.46"
 # Colors, green if stable, yellow if dev
 TYPE_COLORS = {"dev": 33, "stable": 92}
 # Version string, dev or stable release?

md5sum/checksum.md5

@@ -1,37 +1,37 @@
 d41d8cd98f00b204e9800998ecf8427e  ./checksum.txt
 ff1716110bf8e98fd7df01543a61238e  ./README.md
 5c2118501321299e1c36537a33ac76a9  ./requirements.txt
-5d8601e430c2b5a4900cb078be3b79bc  ./md5sum/checksum.md5
+6388f6a23c8d367cc36bd2ca6e64588f  ./md5sum/checksum.md5
 d41d8cd98f00b204e9800998ecf8427e  ./bin/__init__.py
 d41d8cd98f00b204e9800998ecf8427e  ./bin/verify_hashes/__init__.py
 0979d2f0faa2386de9524b816f7e7b6f  ./bin/verify_hashes/verify.py
-8a7887cc5da94227fffdb8343467bccf  ./bin/verify_hashes/verify.pyc
-ebd3cc9e1fbedad1df3e22835b631b30  ./bin/verify_hashes/__init__.pyc
+302a44f782f3d9dd7da17d387bd71389  ./bin/verify_hashes/verify.pyc
+9a32ae5531af1f0b620316a1f112ea49  ./bin/verify_hashes/__init__.pyc
 d41d8cd98f00b204e9800998ecf8427e  ./bin/attacks/__init__.py
 d41d8cd98f00b204e9800998ecf8427e  ./bin/attacks/bruteforce/__init__.py
-5e4b0b08f9cfcddb98bc072e39117c98  ./bin/attacks/bruteforce/bf_attack.pyc
-dfe4fd501bd5ceef8371794a22beb419  ./bin/attacks/bruteforce/__init__.pyc
+cd665247529b1486d9aa59b61c0446fa  ./bin/attacks/bruteforce/bf_attack.pyc
+be5816a2eae572ead4a960deae075ba4  ./bin/attacks/bruteforce/__init__.pyc
 84ef7d652cfedc91e6daa79b9998b4a8  ./bin/attacks/bruteforce/bf_attack.py
-851143a5e3507ea1db7ef8da274df16c  ./bin/attacks/__init__.pyc
+de98d8d26cdfa98ebe33065dbc5757a4  ./bin/attacks/__init__.pyc
 2c10265111b84f4d8266651562c20ea7  ./bin/generators/__init__.py
-51499b846ee0fd6233c32ed3a3b6c3dc  ./bin/generators/__init__.pyc
-aca486f6178f877a3593571fc801801e  ./bin/__init__.pyc
+dea6b4574a22d26867673e5c69cd06cb  ./bin/generators/__init__.pyc
+d2bf1de965d4262baeffde2afccf88e7  ./bin/__init__.pyc
 d41d8cd98f00b204e9800998ecf8427e  ./lib/algorithms/__init__.py
 d41d8cd98f00b204e9800998ecf8427e  ./lib/algorithms/custom/__init__.py
 8b94aaadf0174a1b20f533343dd8be59  ./lib/algorithms/custom/_crc64.py
-5c1ad61e0217525c016eb52f4d81afc6  ./lib/algorithms/custom/_crc64.pyc
-8cb5f103f09fa987a1a3e2ab934f0355  ./lib/algorithms/custom/__init__.pyc
-eb1ff057f75fecc4dad12046d327a4f8  ./lib/algorithms/hashing_algs.pyc
-072359565e369663f14621e08be199bb  ./lib/algorithms/__init__.pyc
+1b4118d4d1814ef05823858cb5f7ccbf  ./lib/algorithms/custom/_crc64.pyc
+628940ce9a0875dc1773096665d0adf7  ./lib/algorithms/custom/__init__.pyc
+49a5b169493af9f0888c6c5e156a4891  ./lib/algorithms/hashing_algs.pyc
+0c852dc5ccc7b8872a6b99319281cf99  ./lib/algorithms/__init__.pyc
 094bd44d8d4d8e8188400b79de4cdf1e  ./lib/algorithms/hashing_algs.py
 d41d8cd98f00b204e9800998ecf8427e  ./lib/__init__.py
-f21a818ed03fee66a897bdf65b1aa830  ./lib/settings.py
+8c476a08c589202a218feb1c51db01c5  ./lib/settings.py
 2a8fc5ded461620f850461b8469dbd97  ./lib/data_files/wordlist_links
-73243ff59e4bc4165e46b63553a9d606  ./lib/settings.pyc
-6113faac9a3775d5eddf2c2fa37c0584  ./lib/__init__.pyc
+6e1ecd651e5a8e5f453ee701659ac2fa  ./lib/settings.pyc
+6bdfb8da9c9576320ab20e558ddb5dc8  ./lib/__init__.pyc
 192d7018c1ea6003f56dac720f5b7882  ./.idea/misc.xml
 166acef3d301bd241d0d6da15bc5ad3c  ./.idea/vcs.xml
-07459e13ad799cbf1e98e26e7d373884  ./.idea/workspace.xml
+2b08a7fbc7e7eb6716021b945a4aaf6b  ./.idea/workspace.xml
 a3d11079520b18e3f6780291d1152696  ./.idea/dagon.iml
 917d7377a1d655c67504cb92818b05ee  ./.idea/modules.xml
 e7a5341d4a055f5a4b9f76aae301cc57  ./.github/ISSUE_TEMPLATE.md
@@ -40,29 +40,38 @@ e7a5341d4a055f5a4b9f76aae301cc57  ./.github/ISSUE_TEMPLATE.md
 39e387b0e340c4404be10fcdcd534772  ./thirdparty/blake/blake_test.py
 d41d8cd98f00b204e9800998ecf8427e  ./thirdparty/blake/__init__.py
 19bb74d4d4e62749564e4b98db1e8068  ./thirdparty/blake/blake_wrapper.py
-afbd5e5d9a24c25d4634ca01f6f9c791  ./thirdparty/blake/__init__.pyc
-7913a71edd61413ca5263e80118a5e44  ./thirdparty/blake/blake.pyc
+8e6bcc12406b1d4bdd915812780c6bae  ./thirdparty/blake/__init__.pyc
+386a870a645d4356553cb670ebef9ee7  ./thirdparty/blake/blake.pyc
 62cd797fafacc7bf657b2f95df21abb7  ./thirdparty/blake/blake.py
 d41d8cd98f00b204e9800998ecf8427e  ./thirdparty/__init__.py
 5b12b4942fb7669a032a5201cf720a95  ./thirdparty/md2/md2_hash.py
 d41d8cd98f00b204e9800998ecf8427e  ./thirdparty/md2/__init__.py
-c0168279b05b3d195551e635fde81af3  ./thirdparty/md2/__init__.pyc
-c708f09327e10b098c12bb9d4a5e1db9  ./thirdparty/md2/md2_hash.pyc
+a4fd9150eae32686f1e155b128ac3b0b  ./thirdparty/md2/__init__.pyc
+18e5fb52af1298e678db794bc7153077  ./thirdparty/md2/md2_hash.pyc
 e940d4065d04d78004385cb8bde1e77c  ./thirdparty/des/pydes.py
 d41d8cd98f00b204e9800998ecf8427e  ./thirdparty/des/__init__.py
-b8f58420e2aaa0bc7da3c4b3d476296b  ./thirdparty/des/pydes.pyc
-b6de0b61329c778f32492ff66c446fb6  ./thirdparty/des/__init__.pyc
-af3125e09ab2a0453db224241529fe8f  ./thirdparty/__init__.pyc
+9e1e50c532c67ba59d8b08c1c5df1b44  ./thirdparty/des/pydes.pyc
+e7e3cf6ff86d7a76022bd4e01d30bfd3  ./thirdparty/des/__init__.pyc
+15547ad60696447d4f6f984705d3f972  ./thirdparty/__init__.pyc
 d41d8cd98f00b204e9800998ecf8427e  ./thirdparty/tiger/__init__.py
-12a8d9e723f4bfb3cd0461b62e1dad93  ./thirdparty/tiger/tiger.pyc
+d8c03dd1e08f7fe170952421c11feba9  ./thirdparty/tiger/tiger.pyc
 67a62cf48bb0412daaa00f4a6e4fa620  ./thirdparty/tiger/README.textile
 1ae74957f5bd17f61d5bef0cdb36ae27  ./thirdparty/tiger/LICENSE
 0fce37bd61cfbb36ee0b3cb4b2e1f701  ./thirdparty/tiger/test_tiger.py
 d95c3420002f6de555eedff8b81e3489  ./thirdparty/tiger/tiger.py
-0dc06da5ebb86ac6273a84c5e3d803c9  ./thirdparty/tiger/sboxes.pyc
-24ff55165118eca48ff59e19b737fb19  ./thirdparty/tiger/__init__.pyc
+60482d6aec6bc37f0da21fcba0f987be  ./thirdparty/tiger/sboxes.pyc
+e8aa60a950887c2fcd3c259670e07981  ./thirdparty/tiger/__init__.pyc
 ed62155328c906f0498815e2bb48d04a  ./thirdparty/tiger/sboxes.py
-77842a08c7b038dd1f97eeb1cde44694  ./dagon.py
+b00a169e9a5feb89ae68409291f6437b  ./dagon.py
+cc3e3034492d937be94a6948a88a48c8  ./bf-dicts/Dagon-bfdict-DSTsLiF.txt
+85a85d98ccbe640187dda4b29b9e8fa2  ./bf-dicts/Dagon-bfdict-kgKIuwv.txt
+86ee141a1e0b9c43e5c3ea29a218183d  ./bf-dicts/Dagon-bfdict-vRpglXJ.txt
+867446c9508c700cb5bc1fb32f487829  ./bf-dicts/Dagon-bfdict-ZUNCKnv.txt
+fe35d4c48fd09b03d8b1ad72a0c27df0  ./bf-dicts/Dagon-bfdict-xJnfDrw.txt
+6662ad3b9a1ac0c4e643530e0cbd22d9  ./bf-dicts/Dagon-bfdict-dIVnDXU.txt
+d8bb6ee467add46de96934d2f4c6914e  ./bf-dicts/Dagon-bfdict-CPZSPnP.txt
+d8bb6ee467add46de96934d2f4c6914e  ./bf-dicts/Dagon-bfdict-LOslsJb.txt
+c76188c38162dce1fc29d2ddce68bbe9  ./bf-dicts/Dagon-bfdict-sqaghMe.txt
 2ad18ec82c20af7b5926ed9cea6aeedd  ./.git/hooks/pre-receive.sample
 7dfe15854212a30f346da5255c1d794b  ./.git/hooks/prepare-commit-msg.sample
 579a3c1e12a1e74a98169175fb913012  ./.git/hooks/commit-msg.sample
@@ -74,20 +83,18 @@ ed62155328c906f0498815e2bb48d04a  ./thirdparty/tiger/sboxes.py
 ce562e08d8098926a3862fc6e7905199  ./.git/hooks/applypatch-msg.sample
 517f14b9239689dff8bda3022ebd9004  ./.git/hooks/update.sample
 a0a7c3fff21f2aea3cfa1d0316dd816c  ./.git/description
-95ebcb705cb2068678c51bd0c0c1539f  ./.git/index
+9ae164bec5db913c199e607ffc936a56  ./.git/index
 4cf2d64e44205fe628ddd534e1151b58  ./.git/HEAD
-5bd5bf6d7402b48be4474ef5d5d7bfef  ./.git/packed-refs
-2c2fe693ec33e09bb1475c8ab3f0094d  ./.git/FETCH_HEAD
+7cbe07a9c054bc29d99308341eae87e3  ./.git/packed-refs
 b7e2d84bcd0648bb1b231787eb5554df  ./.git/config
 036208b4a1ab4a235d75c181e685e5a3  ./.git/info/exclude
-4c47b63a3cd3d6229f743147d23c9b7d  ./.git/logs/HEAD
-4c47b63a3cd3d6229f743147d23c9b7d  ./.git/logs/refs/heads/master
-4c47b63a3cd3d6229f743147d23c9b7d  ./.git/logs/refs/remotes/origin/HEAD
-b324807beb380168969eddcc59c84354  ./.git/refs/heads/master
+0d2ce961b1fbd2d5111f0f5eb7e5d09e  ./.git/logs/HEAD
+0d2ce961b1fbd2d5111f0f5eb7e5d09e  ./.git/logs/refs/heads/master
+0d2ce961b1fbd2d5111f0f5eb7e5d09e  ./.git/logs/refs/remotes/origin/HEAD
+9cf81e0e45a69f546577cfb36f4e7754  ./.git/refs/heads/master
 73a00957034783b7b5c8294c54cd3e12  ./.git/refs/remotes/origin/HEAD
-08a024a6a676afa6034ffd56ba3966b4  ./.git/objects/pack/pack-772f1b6c7a7ee0887d0f2bb234f06d17ac6ffdd3.pack
-29379950293f7c9540a19a9a19ab822d  ./.git/objects/pack/pack-772f1b6c7a7ee0887d0f2bb234f06d17ac6ffdd3.idx
-b324807beb380168969eddcc59c84354  ./.git/ORIG_HEAD
+3a894f2e5b25c093b88c62c8fd8ca4b9  ./.git/objects/pack/pack-f375cc36abb4585dca584d365a3ac821b0bd57ac.pack
+db61f95371db3636b3089f9ab1b03d52  ./.git/objects/pack/pack-f375cc36abb4585dca584d365a3ac821b0bd57ac.idx
 5b7537fe8628e5c1d260217c46fb5150  ./legal/thirdparty_info.txt
 035b4e652110fb12d636a807e8f1c68c  ./legal/LICENSE.md
 f52aa2b56c492de0e63fc16d06197986  ./.gitignore