Skip to content

Commit 60ed5cd

Browse files
jfougmagnumripper
jfoug
authored and
magnumripper
committed
Test Suite 1.11 as released
1 parent 36213ea commit 60ed5cd

10 files changed

+10561
-15
lines changed

‎JtrTestSuite.Manifest

+7
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,12 @@
6969
# and is -type core -type full if this is a john core build. This will cause
7070
# john to run MUCH faster in a 'default' mode. There are MANY other
7171
# improvements. NTv2 format also added.
72+
#
73+
# v1.11 There were a few MSSQL05 hashes, which were using forced mssql, instead of the mssql05.
74+
# Only the .dat file changed.
75+
# Did a little to 'clean' up the main code, in the jtrts.pl file.
76+
# Added dynamic 30,31,32,33,34. Added NT-raw, NT-raw-utf8. These files were added
77+
# to NT, NTv2 and dynamic_33.
78+
# Different message if there are zero tests.
7279
#--------------------------------------------------------------------
7380

‎NT_raw_tst.in

+1,501
Large diffs are not rendered by default.

‎NT_raw_tst_utf8.in

+1,501
Large diffs are not rendered by default.

‎dynamic_30_tst.in

+1,501
Large diffs are not rendered by default.

‎dynamic_31_tst.in

+1,501
Large diffs are not rendered by default.

‎dynamic_32_tst.in

+1,501
Large diffs are not rendered by default.

‎dynamic_33_tst.in

+1,501
Large diffs are not rendered by default.

‎dynamic_34_tst.in

+1,501
Large diffs are not rendered by default.

‎jtrts.dat

+22-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
############################################################################
2+
# Version 1.10. Original release, Dec 18, 2011
3+
# Version 1.11. Several MSSQL05 hashes were being called with forced mssql
4+
# Added dynamic 30,31,32,33,34, and several 'NT-raw' formats
5+
# for dynamic_33 AND NT/NTv2
6+
############################################################################
7+
#
18
# core formats: des/bsdi/md5/bf/afs/lm/trip/dummy, no tests (yet) for afs, trip, dummy. Need more for LM.
29
# CSV format file for JtRTestSuite input data. Format is:
310
#types,required_types,sys_caps,dict_cnt,scr_output,dict,input,-form=string,Y/N_FmtStr_req,addtionalParams,correct_Cracks_num(s),.pot_crack_num(s)
@@ -45,6 +52,14 @@
4552
(dynamic)(utf8)(utf-8)(enc),(X),(jumbo)&(encode_valid),10000,dynamic_29-utf8,pw,rawmd5u_tst.in,dynamic_29,Y,-enc:utf-8,(1229),(1229)
4653
(dynamic)(utf8)(utf-8)(enc),(X),(jumbo)&(encode_valid),10000,dynamic_29-utf8,pw-utf8,rawmd5u_tst_utf8.in,dynamic_29,Y,-enc:utf-8,(1500),(1500)
4754
#
55+
(dynamic)(base),(X),(jumbo),10000,dynamic_30,pw,dynamic_30_tst.in,dynamic_30,N,X,(1500),(1500)
56+
(dynamic)(base),(X),(jumbo),10000,dynamic_31,pw,dynamic_31_tst.in,dynamic_31,N,X,(1500),(1500)
57+
(dynamic)(base),(X),(jumbo),10000,dynamic_32,pw,dynamic_32_tst.in,dynamic_32,N,X,(1500),(1500)
58+
(dynamic)(base),(X),(jumbo),10000,dynamic_33,pw,dynamic_33_tst.in,dynamic_33,N,X,(1500),(1500)
59+
(dynamic)(base),(X),(jumbo),10000,dynamic_33-NT,pw,NT_raw_tst.in,dynamic_33,Y,X,(1500),(1500)
60+
(dynamic)(utf8)(utf-8)(enc),(X),(jumbo)&(encode_valid),10000,dynamic_33-NT-utf8,pw-utf8,NT_raw_tst_utf8.in,dynamic_33,Y,-enc=utf8,(1500),(1500)
61+
(dynamic)(base),(X),(jumbo),10000,dynamic_34,pw,dynamic_34_tst.in,dynamic_34,N,X,(1500),(1500)
62+
#
4863
(base),(X),(jumbo),10000,raw-md5u-raw,pw,rawmd5u_raw_tst.in,raw-md5u,Y,X,(1500),(1500)
4964
(base),(X),(jumbo),10000,raw-md5u,pw,rawmd5u_tst.in,raw-md5u,Y,X,(1500),(1500)
5065
(utf8)(utf-8)(enc),(X),(jumbo)&(encode_valid),10000,raw-md5u-raw-utf8,pw,rawmd5u_raw_tst.in,raw-md5u,Y,-enc:utf-8,(1229),(1229)
@@ -78,7 +93,9 @@
7893
(sha1-genp)(base),(X),(jumbo),10000,raw-sha1,pw,sha1p_tst.in,sha1-gen,Y,X,(1500),(1500)
7994
#
8095
(base),(X),(jumbo),10000,NT,pw,NT_tst.in,nt,Y,X,(1500),(1500)
96+
(base),(X),(jumbo),10000,NT-raw,pw,NT_raw_tst.in,nt,Y,X,(1500),(1500)
8197
(base),(X),(jumbo),10000,NTv2,pw,NT_tst.in,nt2,Y,X,(1500),(1500)
98+
(base),(X),(jumbo),10000,NTv2-raw,pw,NT_raw_tst.in,nt2,Y,X,(1500),(1500)
8299
(base),(X),(jumbo),10000,raw-md4,pw,rawmd4_tst.in,raw-md4,Y,X,(1500),(1500)
83100
(md4-genp)(base),(X),(jumbo),10000,md4-genp,pw,md4p_tst.in,md4-gen,Y,X,(1500),(1500)
84101
(md4-gens)(base),(X),(jumbo),10000,md4-gens,pw,md4s_tst.in,md4-gen,Y,X,(1500),(1500)
@@ -131,6 +148,8 @@
131148
(utf8)(utf-8)(enc),(X),(jumbo)&(encode_valid),10000,netntlmv2-utf8,pw-utf8,netntlmv2_tst_utf8.in,netntlmv2,Y,-enc=utf8,(1500),(1500)
132149
(utf8)(utf-8)(enc),(X),(jumbo)&(encode_valid),10000,NT-utf8,pw-utf8,NT_tst_utf8.in,nt,Y,-enc=utf8,(1500),(1500)
133150
(utf8)(utf-8)(enc),(X),(jumbo)&(encode_valid),10000,NTv2-utf8,pw-utf8,NT_tst_utf8.in,nt2,Y,-enc=utf8,(1500),(1500)
151+
(utf8)(utf-8)(enc),(X),(jumbo)&(encode_valid),10000,NT-raw-utf8,pw-utf8,NT_raw_tst_utf8.in,nt,Y,-enc=utf8,(1500),(1500)
152+
(utf8)(utf-8)(enc),(X),(jumbo)&(encode_valid),10000,NTv2-raw-utf8,pw-utf8,NT_raw_tst_utf8.in,nt2,Y,-enc=utf8,(1500),(1500)
134153
(utf8)(utf-8)(enc),(X),(jumbo)&(encode_valid),10000,mscash-utf8,pw-utf8,mscash_tst_utf8.in,mscash,Y,-enc=utf8,(1500),(1500)
135154
(utf8)(utf-8)(enc),(full),(jumbo)&(encode_valid),160,mscash2-utf8,pw-utf8,MSCash2_tst_utf8.in,mscash2,Y,-enc=utf8,(1500),(1500)
136155
(utf8)(utf-8)(enc),(X),(jumbo)&(encode_valid),10000,mssql05-utf8,pw-utf8,MSSql05_tst_utf8.in,mssql05,Y,-enc=utf8,(1500),(1500)
@@ -150,7 +169,7 @@
150169
(koi8r)(enc),(full),(jumbo)&(encode_valid),160,mscash2-koi8r,pw-koi8r,MSCash2_tst_koi8r.in,mscash2,Y,-enc=koi8r,(1500),(1500)
151170
(koi8r)(enc),(X),(jumbo)&(encode_valid),10000,mssql-koi8r-gen,pw-gen-enc,mssql_tst_koi8r_gen.in,mssql,Y,-enc=koi8r,(1500),(1500)
152171
(koi8r)(enc),(X),(jumbo)&(encode_valid),10000,mssql-koi8r,pw-koi8r,mssql_tst_koi8r.in,mssql,Y,-enc=koi8r,(1500),(1500)
153-
(koi8r)(enc),(X),(jumbo)&(encode_valid),10000,mssql05-koi8r-gen,pw-gen-enc,mssql_tst_koi8r_gen.in,mssql,Y,-enc=koi8r,(1500),(1500)
172+
(koi8r)(enc),(X),(jumbo)&(encode_valid),10000,mssql05-koi8r-gen,pw-gen-enc,mssql_tst_koi8r_gen.in,mssql05,Y,-enc=koi8r,(1500),(1500)
154173
(koi8r)(enc),(X),(jumbo)&(encode_valid),10000,MSSql05-koi8r,pw-koi8r,MSSql05_tst_koi8r.in,mssql05,Y,-enc=koi8r,(1500),(1500)
155174
(koi8r)(enc),(X),(jumbo)&(encode_valid),10000,oracle-koi8r,pw-koi8r,oracle_tst_koi8r.in,oracle,Y,-enc=koi8r,(1500),(1500)
156175
#
@@ -165,7 +184,7 @@
165184
(cp1251)(enc),(full),(jumbo)&(encode_valid),160,mscash2-cp1251,pw-cp1251,MSCash2_tst_cp1251.in,mscash2,Y,-enc=cp1251,(1500),(1500)
166185
(cp1251)(enc),(X),(jumbo)&(encode_valid),10000,mssql-cp1251-gen,pw-gen-enc,mssql_tst_cp1251_gen.in,mssql,Y,-enc=cp1251,(1500),(1500)
167186
(cp1251)(enc),(X),(jumbo)&(encode_valid),10000,mssql-cp1251,pw-cp1251,mssql_tst_cp1251.in,mssql,Y,-enc=cp1251,(1500),(1500)
168-
(cp1251)(enc),(X),(jumbo)&(encode_valid),10000,mssql05-cp1251-gen,pw-gen-enc,mssql_tst_cp1251_gen.in,mssql,Y,-enc=cp1251,(1500),(1500)
187+
(cp1251)(enc),(X),(jumbo)&(encode_valid),10000,mssql05-cp1251-gen,pw-gen-enc,mssql_tst_cp1251_gen.in,mssql05,Y,-enc=cp1251,(1500),(1500)
169188
(cp1251)(enc),(X),(jumbo)&(encode_valid),10000,MSSql05-cp1251,pw-cp1251,MSSql05_tst_cp1251.in,mssql05,Y,-enc=cp1251,(1500),(1500)
170189
(cp1251)(enc),(X),(jumbo)&(encode_valid),10000,oracle-cp1251,pw-cp1251,oracle_tst_cp1251.in,oracle,Y,-enc=cp1251,(1500),(1500)
171190
#
@@ -180,7 +199,7 @@
180199
(cp866)(enc),(full),(jumbo)&(encode_valid),160,mscash2-cp866,pw-cp866,MSCash2_tst_cp866.in,mscash2,Y,-enc=cp866,(1500),(1500)
181200
(cp866)(enc),(X),(jumbo)&(encode_valid),10000,mssql-cp866-gen,pw-gen-enc,mssql_tst_cp866_gen.in,mssql,Y,-enc=cp866,(1500),(1500)
182201
(cp866)(enc),(X),(jumbo)&(encode_valid),10000,mssql-cp866,pw-cp866,mssql_tst_cp866.in,mssql,Y,-enc=cp866,(1500),(1500)
183-
(cp866)(enc),(X),(jumbo)&(encode_valid),10000,mssql05-cp866-gen,pw-gen-enc,mssql_tst_cp866_gen.in,mssql,Y,-enc=cp866,(1500),(1500)
202+
(cp866)(enc),(X),(jumbo)&(encode_valid),10000,mssql05-cp866-gen,pw-gen-enc,mssql_tst_cp866_gen.in,mssql05,Y,-enc=cp866,(1500),(1500)
184203
(cp866)(enc),(X),(jumbo)&(encode_valid),10000,MSSql05-cp866,pw-cp866,MSSql05_tst_cp866.in,mssql05,Y,-enc=cp866,(1500),(1500)
185204
(cp866)(enc),(X),(jumbo)&(encode_valid),10000,oracle-cp866,pw-cp866,oracle_tst_cp866.in,oracle,Y,-enc=cp866,(1500),(1500)
186205
#

‎jtrts.pl

+25-12
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use Getopt::Long;
44
use jtrts_inc;
55

6-
my $VERSION = "1.10";
6+
my $VERSION = "1.11";
77

88
# how to do alpha character left, so next 'alpha', or beta release will be easy.
99
#use utf8;
@@ -32,12 +32,13 @@
3232
my $last_line_len=0;
3333
my $john_type="core"; # may be replaced with jumbo. This will end up BEING a typex
3434
my $error_cnt = 0, my $error_cnt_pot = 0; my $done_cnt = 0;
35-
my @timeStart = localtime(time);
35+
my @startingTime;
3636

3737
###############################################################################
3838
# MAIN
3939
###############################################################################
4040

41+
startTime();
4142
parseArgs();
4243
setup();
4344
readData();
@@ -46,23 +47,35 @@
4647
filterPatterns();
4748
process();
4849
cleanup();
50+
displaySummary();
4951

50-
my @timeEnd = localtime(time);
51-
my $secs = timeToSecs(@timeEnd)-timeToSecs(@timeStart);
5252

53-
if ($error_cnt == 0 && $error_cnt_pot == 0) {
54-
ScreenOutAlways ("All tests passed without error. Performed $done_cnt tests. Time used was $secs seconds\n");
55-
} else {
56-
my $s = "Some tests had Errors. Performed $done_cnt tests.";
57-
unless ($error_cnt == 0) { $s = $s . "$error_cnt errors"; }
58-
unless ($error_cnt_pot == 0) { $s = $s . " $error_cnt_pot errors reprocessing the .POT files"; }
59-
ScreenOutAlways ("$s\nTime used was $secs seconds\n");
60-
}
53+
###############################################################################
54+
# End of MAIN. Everything from this point on is subroutines.
55+
###############################################################################
6156

6257
###############################################################################
6358
# Here are all of the subroutines that get the job done
6459
###############################################################################
6560

61+
sub startTime {
62+
@startingTime = localtime(time);
63+
}
64+
65+
sub displaySummary {
66+
my @timeEnd = localtime(time);
67+
my $secs = timeToSecs(@timeEnd)-timeToSecs(@startingTime);
68+
if ($error_cnt == 0 && $error_cnt_pot == 0) {
69+
if ($done_cnt == 0) { ScreenOutAlways ("NO tests were performed. Time used was $secs seconds\n"); }
70+
else { ScreenOutAlways ("All tests passed without error. Performed $done_cnt tests. Time used was $secs seconds\n"); }
71+
} else {
72+
my $s = "Some tests had Errors. Performed $done_cnt tests.";
73+
unless ($error_cnt == 0) { $s = $s . "$error_cnt errors"; }
74+
unless ($error_cnt_pot == 0) { $s = $s . " $error_cnt_pot errors reprocessing the .POT files"; }
75+
ScreenOutAlways ("$s\nTime used was $secs seconds\n");
76+
}
77+
}
78+
6679
###############################################################################
6780
# parse our command line options.
6881
###############################################################################

0 commit comments

Comments
 (0)