arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-22 16:18:09 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2534 from philsmd/python3_unit_tests

Browse Source 
tests: added Python 3 support and make it default
This commit is contained in:
Jens Steube 2020-08-27 09:35:29 +02:00 committed by GitHub
commit 01a56c89eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 72 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@ -33,6 +33,7 @@
- Hash-Mode 13200 (AxCrypt): Changed the name to AxCrypt 1 to avoid confusion - Hash-Mode 13200 (AxCrypt): Changed the name to AxCrypt 1 to avoid confusion
- Hash-Mode 13300 (AxCrypt in-memory SHA1): Changed the name to AxCrypt 1 in-memory SHA1 - Hash-Mode 13300 (AxCrypt in-memory SHA1): Changed the name to AxCrypt 1 in-memory SHA1
- Unit tests: Added Python 3 support for all of the Python code in our test framework
- Unit tests: Fixed the packaging of test (-p) feature - Unit tests: Fixed the packaging of test (-p) feature
* changes v6.1.0 -> v6.1.1 * changes v6.1.0 -> v6.1.1

10
tools/install_modules.sh
View File

@ -64,13 +64,13 @@ cpan install Authen::Passphrase::LANManager \
ERRORS=$((ERRORS+$?)) ERRORS=$((ERRORS+$?))
pip2 install pygost pip install pygost
# pip2 uninstall -y pycryptoplus pycrypto pycryptodome # pip uninstall -y pycryptoplus pycrypto pycryptodome
pip2 install pycryptoplus pip install pycryptoplus
pip2 uninstall -y pycryptodome pip uninstall -y pycryptodome
pip2 install pycrypto pip install pycrypto
ERRORS=$((ERRORS+$?)) ERRORS=$((ERRORS+$?))

5
tools/test_modules/m11700.pm
View File

@ -16,18 +16,17 @@ sub module_generate_hash
# PyGOST outputs digests in little-endian order, while the kernels # PyGOST outputs digests in little-endian order, while the kernels
# expect them in big-endian; hence the digest[::-1] mirroring. # expect them in big-endian; hence the digest[::-1] mirroring.
# Using sys.stdout.write instead of print to disable \n character.
my $python_code = <<"END_CODE"; my $python_code = <<"END_CODE";
import binascii import binascii
import sys import sys
from pygost import gost34112012256 from pygost import gost34112012256
digest = gost34112012256.new (b"$word").digest () digest = gost34112012256.new (b"$word").digest ()
sys.stdout.write (binascii.hexlify (digest[::-1])) print (binascii.hexlify (digest[::-1]).decode (), end = "")
END_CODE END_CODE
my $hash = `python2 -c '$python_code'`; my $hash = `python -c '$python_code'`;
return $hash; return $hash;
} }

4
tools/test_modules/m11750.pm
View File

@ -23,11 +23,11 @@ from pygost import gost34112012256
key = b"$word" key = b"$word"
msg = b"$salt" msg = b"$salt"
digest = hmac.new (key, msg, gost34112012256).digest () digest = hmac.new (key, msg, gost34112012256).digest ()
sys.stdout.write (binascii.hexlify (digest[::-1])) print (binascii.hexlify (digest[::-1]).decode (), end = "")
END_CODE END_CODE
my $digest = `python2 -c '$python_code'`; my $digest = `python -c '$python_code'`;
my $hash = sprintf ("%s:%s", $digest, $salt); my $hash = sprintf ("%s:%s", $digest, $salt);

4
tools/test_modules/m11760.pm
View File

@ -23,11 +23,11 @@ from pygost import gost34112012256
key = b"$salt" key = b"$salt"
msg = b"$word" msg = b"$word"
digest = hmac.new (key, msg, gost34112012256).digest () digest = hmac.new (key, msg, gost34112012256).digest ()
sys.stdout.write (binascii.hexlify (digest[::-1])) print (binascii.hexlify (digest[::-1]).decode (), end = "")
END_CODE END_CODE
my $digest = `python2 -c '$python_code'`; my $digest = `python -c '$python_code'`;
my $hash = sprintf ("%s:%s", $digest, $salt); my $hash = sprintf ("%s:%s", $digest, $salt);

4
tools/test_modules/m11800.pm
View File

@ -20,11 +20,11 @@ import binascii
import sys import sys
from pygost import gost34112012512 from pygost import gost34112012512
digest = gost34112012512.new (b"$word").digest () digest = gost34112012512.new (b"$word").digest ()
sys.stdout.write (binascii.hexlify (digest[::-1])) print (binascii.hexlify (digest[::-1]).decode (), end = "")
END_CODE END_CODE
my $hash = `python2 -c '$python_code'`; my $hash = `python -c '$python_code'`;
return $hash; return $hash;
} }

4
tools/test_modules/m11850.pm
View File

@ -24,11 +24,11 @@ from pygost import gost34112012512
key = b"$word" key = b"$word"
msg = b"$salt" msg = b"$salt"
digest = hmac.new (key, msg, gost34112012512).digest () digest = hmac.new (key, msg, gost34112012512).digest ()
sys.stdout.write (binascii.hexlify (digest[::-1])) print (binascii.hexlify (digest[::-1]).decode (), end = "")
END_CODE END_CODE
my $digest = `python2 -c '$python_code'`; my $digest = `python -c '$python_code'`;
my $hash = sprintf ("%s:%s", $digest, $salt); my $hash = sprintf ("%s:%s", $digest, $salt);

4
tools/test_modules/m11860.pm
View File

@ -24,11 +24,11 @@ from pygost import gost34112012512
key = b"$salt" key = b"$salt"
msg = b"$word" msg = b"$word"
digest = hmac.new (key, msg, gost34112012512).digest () digest = hmac.new (key, msg, gost34112012512).digest ()
sys.stdout.write (binascii.hexlify (digest[::-1])) print (binascii.hexlify (digest[::-1]).decode (), end = "")
END_CODE END_CODE
my $digest = `python2 -c '$python_code'`; my $digest = `python -c '$python_code'`;
my $hash = sprintf ("%s:%s", $digest, $salt); my $hash = sprintf ("%s:%s", $digest, $salt);

36
tools/test_modules/m20011.pm
View File

@ -34,11 +34,11 @@ key = (key1, key2)
cipher = AES.new (key, AES.MODE_XTS) cipher = AES.new (key, AES.MODE_XTS)
sequence = "01".decode ("hex") sequence = b"\x01"
encrypted = cipher.encrypt (base64.b64decode (data), sequence) encrypted = cipher.encrypt (base64.b64decode (data), sequence)
print encrypted.encode ("hex") print (encrypted.hex ())
END_CODE END_CODE
@ -48,7 +48,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/; $python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/; $python_code =~ s/data/"$data_base64"/;
my $output_buf = `python2 -c '$python_code'`; my $output_buf = `python -c '$python_code'`;
$output_buf =~ s/[\r\n]//g; $output_buf =~ s/[\r\n]//g;
@ -77,11 +77,11 @@ key = (key1, key2)
cipher = AES.new (key, AES.MODE_XTS) cipher = AES.new (key, AES.MODE_XTS)
sequence = "01".decode ("hex") sequence = b"\x01"
decrypted = cipher.decrypt (base64.b64decode (data), sequence) decrypted = cipher.decrypt (base64.b64decode (data), sequence)
print decrypted.encode ("hex") print (decrypted.hex ())
END_CODE END_CODE
@ -91,7 +91,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/; $python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/; $python_code =~ s/data/"$data_base64"/;
my $output_buf = `python2 -c '$python_code'`; my $output_buf = `python -c '$python_code'`;
$output_buf =~ s/[\r\n]//g; $output_buf =~ s/[\r\n]//g;
@ -122,11 +122,11 @@ key = (key1, key2)
cipher = python_Twofish.new (key, python_Twofish.MODE_XTS) cipher = python_Twofish.new (key, python_Twofish.MODE_XTS)
sequence = "01".decode ("hex") sequence = b"\x01"
encrypted = cipher.encrypt (base64.b64decode (data), sequence) encrypted = cipher.encrypt (base64.b64decode (data), sequence)
print encrypted.encode ("hex") print (encrypted.hex ())
END_CODE END_CODE
@ -136,7 +136,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/; $python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/; $python_code =~ s/data/"$data_base64"/;
my $output_buf = `python2 -c '$python_code'`; my $output_buf = `python -c '$python_code'`;
$output_buf =~ s/[\r\n]//g; $output_buf =~ s/[\r\n]//g;
@ -165,11 +165,11 @@ key = (key1, key2)
cipher = python_Twofish.new (key, python_Twofish.MODE_XTS) cipher = python_Twofish.new (key, python_Twofish.MODE_XTS)
sequence = "01".decode ("hex") sequence = b"\x01"
decrypted = cipher.decrypt (base64.b64decode (data), sequence) decrypted = cipher.decrypt (base64.b64decode (data), sequence)
print decrypted.encode ("hex") print (decrypted.hex ())
END_CODE END_CODE
@ -179,7 +179,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/; $python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/; $python_code =~ s/data/"$data_base64"/;
my $output_buf = `python2 -c '$python_code'`; my $output_buf = `python -c '$python_code'`;
$output_buf =~ s/[\r\n]//g; $output_buf =~ s/[\r\n]//g;
@ -210,11 +210,11 @@ key = (key1, key2)
cipher = python_Serpent.new (key, python_Serpent.MODE_XTS) cipher = python_Serpent.new (key, python_Serpent.MODE_XTS)
sequence = "01".decode ("hex") sequence = b"\x01"
encrypted = cipher.encrypt (base64.b64decode (data), sequence) encrypted = cipher.encrypt (base64.b64decode (data), sequence)
print encrypted.encode ("hex") print (encrypted.hex ())
END_CODE END_CODE
@ -224,7 +224,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/; $python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/; $python_code =~ s/data/"$data_base64"/;
my $output_buf = `python2 -c '$python_code'`; my $output_buf = `python -c '$python_code'`;
$output_buf =~ s/[\r\n]//g; $output_buf =~ s/[\r\n]//g;
@ -253,11 +253,11 @@ key = (key1, key2)
cipher = python_Serpent.new (key, python_Serpent.MODE_XTS) cipher = python_Serpent.new (key, python_Serpent.MODE_XTS)
sequence = "01".decode ("hex") sequence = b"\x01"
decrypted = cipher.decrypt (base64.b64decode (data), sequence) decrypted = cipher.decrypt (base64.b64decode (data), sequence)
print decrypted.encode ("hex") print (decrypted.hex ())
END_CODE END_CODE
@ -267,7 +267,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/; $python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/; $python_code =~ s/data/"$data_base64"/;
my $output_buf = `python2 -c '$python_code'`; my $output_buf = `python -c '$python_code'`;
$output_buf =~ s/[\r\n]//g; $output_buf =~ s/[\r\n]//g;

36
tools/test_modules/m20012.pm
View File

@ -34,11 +34,11 @@ key = (key1, key2)
cipher = AES.new (key, AES.MODE_XTS) cipher = AES.new (key, AES.MODE_XTS)
sequence = "01".decode ("hex") sequence = b"\x01"
encrypted = cipher.encrypt (base64.b64decode (data), sequence) encrypted = cipher.encrypt (base64.b64decode (data), sequence)
print encrypted.encode ("hex") print (encrypted.hex ())
END_CODE END_CODE
@ -48,7 +48,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/; $python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/; $python_code =~ s/data/"$data_base64"/;
my $output_buf = `python2 -c '$python_code'`; my $output_buf = `python -c '$python_code'`;
$output_buf =~ s/[\r\n]//g; $output_buf =~ s/[\r\n]//g;
@ -77,11 +77,11 @@ key = (key1, key2)
cipher = AES.new (key, AES.MODE_XTS) cipher = AES.new (key, AES.MODE_XTS)
sequence = "01".decode ("hex") sequence = b"\x01"
decrypted = cipher.decrypt (base64.b64decode (data), sequence) decrypted = cipher.decrypt (base64.b64decode (data), sequence)
print decrypted.encode ("hex") print (decrypted.hex ())
END_CODE END_CODE
@ -91,7 +91,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/; $python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/; $python_code =~ s/data/"$data_base64"/;
my $output_buf = `python2 -c '$python_code'`; my $output_buf = `python -c '$python_code'`;
$output_buf =~ s/[\r\n]//g; $output_buf =~ s/[\r\n]//g;
@ -122,11 +122,11 @@ key = (key1, key2)
cipher = python_Twofish.new (key, python_Twofish.MODE_XTS) cipher = python_Twofish.new (key, python_Twofish.MODE_XTS)
sequence = "01".decode ("hex") sequence = b"\x01"
encrypted = cipher.encrypt (base64.b64decode (data), sequence) encrypted = cipher.encrypt (base64.b64decode (data), sequence)
print encrypted.encode ("hex") print (encrypted.hex ())
END_CODE END_CODE
@ -136,7 +136,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/; $python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/; $python_code =~ s/data/"$data_base64"/;
my $output_buf = `python2 -c '$python_code'`; my $output_buf = `python -c '$python_code'`;
$output_buf =~ s/[\r\n]//g; $output_buf =~ s/[\r\n]//g;
@ -165,11 +165,11 @@ key = (key1, key2)
cipher = python_Twofish.new (key, python_Twofish.MODE_XTS) cipher = python_Twofish.new (key, python_Twofish.MODE_XTS)
sequence = "01".decode ("hex") sequence = b"\x01"
decrypted = cipher.decrypt (base64.b64decode (data), sequence) decrypted = cipher.decrypt (base64.b64decode (data), sequence)
print decrypted.encode ("hex") print (decrypted.hex ())
END_CODE END_CODE
@ -179,7 +179,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/; $python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/; $python_code =~ s/data/"$data_base64"/;
my $output_buf = `python2 -c '$python_code'`; my $output_buf = `python -c '$python_code'`;
$output_buf =~ s/[\r\n]//g; $output_buf =~ s/[\r\n]//g;
@ -210,11 +210,11 @@ key = (key1, key2)
cipher = python_Serpent.new (key, python_Serpent.MODE_XTS) cipher = python_Serpent.new (key, python_Serpent.MODE_XTS)
sequence = "01".decode ("hex") sequence = b"\x01"
encrypted = cipher.encrypt (base64.b64decode (data), sequence) encrypted = cipher.encrypt (base64.b64decode (data), sequence)
print encrypted.encode ("hex") print (encrypted.hex ())
END_CODE END_CODE
@ -224,7 +224,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/; $python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/; $python_code =~ s/data/"$data_base64"/;
my $output_buf = `python2 -c '$python_code'`; my $output_buf = `python -c '$python_code'`;
$output_buf =~ s/[\r\n]//g; $output_buf =~ s/[\r\n]//g;
@ -253,11 +253,11 @@ key = (key1, key2)
cipher = python_Serpent.new (key, python_Serpent.MODE_XTS) cipher = python_Serpent.new (key, python_Serpent.MODE_XTS)
sequence = "01".decode ("hex") sequence = b"\x01"
decrypted = cipher.decrypt (base64.b64decode (data), sequence) decrypted = cipher.decrypt (base64.b64decode (data), sequence)
print decrypted.encode ("hex") print (decrypted.hex ())
END_CODE END_CODE
@ -267,7 +267,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/; $python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/; $python_code =~ s/data/"$data_base64"/;
my $output_buf = `python2 -c '$python_code'`; my $output_buf = `python -c '$python_code'`;
$output_buf =~ s/[\r\n]//g; $output_buf =~ s/[\r\n]//g;

36
tools/test_modules/m20013.pm
View File

@ -34,11 +34,11 @@ key = (key1, key2)
cipher = AES.new (key, AES.MODE_XTS) cipher = AES.new (key, AES.MODE_XTS)
sequence = "01".decode ("hex") sequence = b"\x01"
encrypted = cipher.encrypt (base64.b64decode (data), sequence) encrypted = cipher.encrypt (base64.b64decode (data), sequence)
print encrypted.encode ("hex") print (encrypted.hex ())
END_CODE END_CODE
@ -48,7 +48,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/; $python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/; $python_code =~ s/data/"$data_base64"/;
my $output_buf = `python2 -c '$python_code'`; my $output_buf = `python -c '$python_code'`;
$output_buf =~ s/[\r\n]//g; $output_buf =~ s/[\r\n]//g;
@ -77,11 +77,11 @@ key = (key1, key2)
cipher = AES.new (key, AES.MODE_XTS) cipher = AES.new (key, AES.MODE_XTS)
sequence = "01".decode ("hex") sequence = b"\x01"
decrypted = cipher.decrypt (base64.b64decode (data), sequence) decrypted = cipher.decrypt (base64.b64decode (data), sequence)
print decrypted.encode ("hex") print (decrypted.hex ())
END_CODE END_CODE
@ -91,7 +91,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/; $python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/; $python_code =~ s/data/"$data_base64"/;
my $output_buf = `python2 -c '$python_code'`; my $output_buf = `python -c '$python_code'`;
$output_buf =~ s/[\r\n]//g; $output_buf =~ s/[\r\n]//g;
@ -122,11 +122,11 @@ key = (key1, key2)
cipher = python_Twofish.new (key, python_Twofish.MODE_XTS) cipher = python_Twofish.new (key, python_Twofish.MODE_XTS)
sequence = "01".decode ("hex") sequence = b"\x01"
encrypted = cipher.encrypt (base64.b64decode (data), sequence) encrypted = cipher.encrypt (base64.b64decode (data), sequence)
print encrypted.encode ("hex") print (encrypted.hex ())
END_CODE END_CODE
@ -136,7 +136,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/; $python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/; $python_code =~ s/data/"$data_base64"/;
my $output_buf = `python2 -c '$python_code'`; my $output_buf = `python -c '$python_code'`;
$output_buf =~ s/[\r\n]//g; $output_buf =~ s/[\r\n]//g;
@ -165,11 +165,11 @@ key = (key1, key2)
cipher = python_Twofish.new (key, python_Twofish.MODE_XTS) cipher = python_Twofish.new (key, python_Twofish.MODE_XTS)
sequence = "01".decode ("hex") sequence = b"\x01"
decrypted = cipher.decrypt (base64.b64decode (data), sequence) decrypted = cipher.decrypt (base64.b64decode (data), sequence)
print decrypted.encode ("hex") print (decrypted.hex ())
END_CODE END_CODE
@ -179,7 +179,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/; $python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/; $python_code =~ s/data/"$data_base64"/;
my $output_buf = `python2 -c '$python_code'`; my $output_buf = `python -c '$python_code'`;
$output_buf =~ s/[\r\n]//g; $output_buf =~ s/[\r\n]//g;
@ -210,11 +210,11 @@ key = (key1, key2)
cipher = python_Serpent.new (key, python_Serpent.MODE_XTS) cipher = python_Serpent.new (key, python_Serpent.MODE_XTS)
sequence = "01".decode ("hex") sequence = b"\x01"
encrypted = cipher.encrypt (base64.b64decode (data), sequence) encrypted = cipher.encrypt (base64.b64decode (data), sequence)
print encrypted.encode ("hex") print (encrypted.hex ())
END_CODE END_CODE
@ -224,7 +224,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/; $python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/; $python_code =~ s/data/"$data_base64"/;
my $output_buf = `python2 -c '$python_code'`; my $output_buf = `python -c '$python_code'`;
$output_buf =~ s/[\r\n]//g; $output_buf =~ s/[\r\n]//g;
@ -253,11 +253,11 @@ key = (key1, key2)
cipher = python_Serpent.new (key, python_Serpent.MODE_XTS) cipher = python_Serpent.new (key, python_Serpent.MODE_XTS)
sequence = "01".decode ("hex") sequence = b"\x01"
decrypted = cipher.decrypt (base64.b64decode (data), sequence) decrypted = cipher.decrypt (base64.b64decode (data), sequence)
print decrypted.encode ("hex") print (decrypted.hex ())
END_CODE END_CODE
@ -267,7 +267,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/; $python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/; $python_code =~ s/data/"$data_base64"/;
my $output_buf = `python2 -c '$python_code'`; my $output_buf = `python -c '$python_code'`;
$output_buf =~ s/[\r\n]//g; $output_buf =~ s/[\r\n]//g;