arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-26 01:50:10 +00:00
Code Issues Releases Wiki Activity

Add remaining updates for test.sh

Browse Source
This commit is contained in:
jsteube 2018-12-28 20:50:59 +01:00
parent 925c089035
commit 9b572d3faa
2 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/test.pl
View File

@ -75,9 +75,6 @@ sub single
my $db_prev;
my $word_len_prev = 0;
my $salt_len_prev = 0;
my $giveup = 0;
my $idx = 0;
@ -143,9 +140,6 @@ sub single
$db_prev->{$word}->{$salt} = undef;
$word_len_prev = $word_len;
$salt_len_prev = $salt_len;
$idx++;
my $hash = module_generate_hash ($word, $salt);
@ -204,10 +198,10 @@ sub passthrough
}
}
$idx++;
my $salt = random_numeric_string ($salt_len) // "";
$idx++;
my $hash = module_generate_hash ($word, $salt);
next unless defined $hash;

38
tools/test.sh
View File

@ -752,28 +752,12 @@ function attack_1()
e_nm=0
cnt=0
offset=14
offset=7
if [ ${hash_type} -eq 2410 ]; then
offset=11
elif [ ${hash_type} -eq 2500 ]; then
offset=7
elif [ ${hash_type} -eq 5800 ]; then
if [ ${hash_type} -eq 5800 ]; then
offset=6
elif [ ${hash_type} -eq 3000 ]; then
offset=6
elif [ ${hash_type} -eq 2100 ]; then
offset=11
elif [ ${hash_type} -eq 1500 ]; then
offset=7
elif [ ${hash_type} -eq 7700 ] || [ ${hash_type} -eq 7701 ]; then
offset=7
elif [ ${hash_type} -eq 8500 ]; then
offset=7
elif [ ${hash_type} -eq 16000 ]; then
offset=7
elif [ ${hash_type} -eq 16800 ]; then
offset=7
fi
hash_file=${OUTD}/${hash_type}_multihash_combi.txt
@ -1055,7 +1039,20 @@ function attack_3()
hash_file=${OUTD}/${hash_type}_multihash_bruteforce.txt
head -n $((increment_max - ${increment_min} + 1)) ${OUTD}/${hash_type}_hashes.txt > ${hash_file}
tail_hashes=$(awk "length >= ${increment_min} && length <= ${increment_max}" ${OUTD}/${hash_type}_passwords.txt | wc -l)
head_hashes=$(awk "length <= ${increment_max}" ${OUTD}/${hash_type}_passwords.txt | wc -l)
if [ ${tail_hashes} -gt ${head_hashes} ]; then
return
fi
if [ ${tail_hashes} -lt 1 ]; then
return
fi
cracks_offset=$((${head_hashes} - ${tail_hashes}))
head -n ${head_hashes} ${OUTD}/${hash_type}_hashes.txt | tail -n ${tail_hashes} > ${hash_file}
# if file_only -> decode all base64 "hashes" and put them in the temporary file
@ -1270,8 +1267,9 @@ function attack_3()
i=1
while read -u 9 hash; do
line_nr=$((${i} + ${cracks_offset}))
pass=$(sed -n ${i}p ${OUTD}/${hash_type}_passwords.txt)
pass=$(sed -n ${line_nr}p ${OUTD}/${hash_type}_passwords.txt)
if [ ${pass_only} -eq 1 ]; then
search=":${pass}"