Skip to content

Commit 013081a

Browse files
jfougjfoug
committed
updated for some incremental to work again
1 parent ff88ce2 commit 013081a

18 files changed

+3036
-14039
lines changed

‎DES_inc_all_qwk_tst.in

-1,503
This file was deleted.

‎DES_inc_all_tst.in

-1,503
This file was deleted.

‎DES_inc_alnum_qwk_tst.in

-1,503
This file was deleted.

‎DES_inc_alnum_tst.in

-1,503
This file was deleted.

‎NT_inc_all_qwk_tst.in

-501
This file was deleted.

‎NT_inc_all_tst.in

-1,501
This file was deleted.

‎NT_inc_alnum_qwk_tst.in

+503-501
Large diffs are not rendered by default.

‎NT_inc_alnum_tst.in

-1,501
This file was deleted.

‎NT_inc_ascii_qwk_tst.in

+503
Large diffs are not rendered by default.

‎descrypt_inc_alnum_qwk_tst.in

+503
Large diffs are not rendered by default.

‎descrypt_inc_ascii_qwk_tst.in

+503
Large diffs are not rendered by default.

‎dynamic_0_inc_all_qwk_tst.in

-501
This file was deleted.

‎dynamic_0_inc_all_tst.in

-1,501
This file was deleted.

‎dynamic_0_inc_alnum_qwk_tst.in

+503-501
Large diffs are not rendered by default.

‎dynamic_0_inc_alnum_tst.in

-1,501
This file was deleted.

‎dynamic_0_inc_ascii_qwk_tst.in

+503
Large diffs are not rendered by default.

‎jtrts.dat

+13-14
Original file line numberDiff line numberDiff line change
@@ -1051,27 +1051,26 @@
10511051
# to change these from a base run, at a later time. Also, we may want to use --max-run-time=X to cause
10521052
# a lockup to not happen. However, this switch is ONLY in the bleeding edge john jumbo right now.
10531053
#
1054-
(inc)(base),(X),(jumbo)&(inc_ascii_72acb6963bf12701dfb06c8d1b00cad4),10000,dyn_0-inc_all_qwk,INCREMENT_ascii,dynamic_0_inc_all_qwk_tst.in,dynamic_0,N,X,(500),(500)
1054+
# had to recreate these. Here is the commands used to build the dic files
1055+
#
1056+
# ../run/john -inc:ascii -stdout | perl -e '$i=0; while ($s=<STDIN>) {++$i; if($i%1000==888){print $s;if(++$k==1500){exit(0);}}}' > alnum_qwk.dic
1057+
# ../run/john -inc:ascii -stdout | perl -e '$i=0; while ($s=<STDIN>) {++$i; if($i%25000==888){print $s;if(++$k==1500){exit(0);}}}' > alnum_full.dic
1058+
#
1059+
(inc)(base),(X),(jumbo)&(inc_ascii_72acb6963bf12701dfb06c8d1b00cad4),10000,dyn_0-inc_ascii_qwk,INCREMENT_ascii,dynamic_0_inc_ascii_qwk_tst.in,dynamic_0,N,X,(500),(500)
10551060
(inc)(base),(X),(jumbo)&(inc_alnum_ee8763c850dee8e4b88ef547a8ed39b8),10000,dyn_0-inc_alnum_qwk,INCREMENT_alnum,dynamic_0_inc_alnum_qwk_tst.in,dynamic_0,N,X,(500),(500)
1056-
(inc)(base),(X),(jumbo)&(inc_ascii_72acb6963bf12701dfb06c8d1b00cad4),10000,NT-inc_all_qwk,INCREMENT_ascii,NT_inc_all_qwk_tst.in,nt,N,X,(500),(500)
1061+
(inc)(base),(X),(jumbo)&(inc_ascii_72acb6963bf12701dfb06c8d1b00cad4),10000,NT-inc_ascii_qwk,INCREMENT_ascii,NT_inc_ascii_qwk_tst.in,nt,N,X,(500),(500)
10571062
(inc)(base),(X),(jumbo)&(inc_alnum_ee8763c850dee8e4b88ef547a8ed39b8),10000,NT-inc_alnum_qwk,INCREMENT_alnum,NT_inc_alnum_qwk_tst.in,nt,N,X,(500),(500)
1058-
(inc)(base),(X),(core)&(inc_ascii_72acb6963bf12701dfb06c8d1b00cad4),10000,DES-inc_all_qwk,INCREMENT_ascii,DES_inc_all_qwk_tst.in,des,N,X,(1500),(1500)
1059-
(inc)(base),(X),(core)&(inc_alnum_ee8763c850dee8e4b88ef547a8ed39b8),10000,DES-inc_alnum_qwk,INCREMENT_alnum,DES_inc_alnum_qwk_tst.in,des,N,X,(1500),(1500)
1060-
(inc)(base),(X),(core)&(inc_ascii_72acb6963bf12701dfb06c8d1b00cad4),10000,descrypt-inc_all_qwk,INCREMENT_ascii,DES_inc_all_qwk_tst.in,descrypt,N,X,(1500),(1500)
1061-
(inc)(base),(X),(core)&(inc_alnum_ee8763c850dee8e4b88ef547a8ed39b8),10000,descrypt-inc_alnum_qwk,INCREMENT_alnum,DES_inc_alnum_qwk_tst.in,descrypt,N,X,(1500),(1500)
1063+
(inc)(base),(X),(core)&(inc_ascii_72acb6963bf12701dfb06c8d1b00cad4),10000,descrypt-inc_ascii_qwk,INCREMENT_ascii,descrypt_iXXXnc_ascii_qwk_tst.in,descrypt,N,X,(1500),(1500)
1064+
(inc)(base),(X),(core)&(inc_alnum_ee8763c850dee8e4b88ef547a8ed39b8),10000,descrypt-inc_alnum_qwk,INCREMENT_alnum,descrypt_iXXXnc_alnum_qwk_tst.in,descrypt,N,X,(1500),(1500)
10621065
#
10631066
# these are SLOW. Will only be run if inc is the 'type' listed.
1064-
(inc),(inc),(jumbo)&(inc_ascii_72acb6963bf12701dfb06c8d1b00cad4),10000,dyn_0-inc_all,INCREMENT_ascii,dynamic_0_inc_all_tst.in,dynamic_0,N,X,(1500),(1500)
1067+
(inc),(inc),(jumbo)&(inc_ascii_72acb6963bf12701dfb06c8d1b00cad4),10000,dyn_0-inc_ascii,INCREMENT_ascii,dynamic_0_inc_ascii_tst.in,dynamic_0,N,X,(1500),(1500)
10651068
(inc),(inc),(jumbo)&(inc_alnum_ee8763c850dee8e4b88ef547a8ed39b8),10000,dyn_0-inc_alnum,INCREMENT_alnum,dynamic_0_inc_alnum_tst.in,dynamic_0,N,X,(1500),(1500)
1066-
(inc),(inc),(jumbo)&(inc_ascii_72acb6963bf12701dfb06c8d1b00cad4),10000,NT-inc_all,INCREMENT_ascii,NT_inc_all_tst.in,nt,N,X,(1500),(1500)
1069+
(inc),(inc),(jumbo)&(inc_ascii_72acb6963bf12701dfb06c8d1b00cad4),10000,NT-inc_ascii,INCREMENT_ascii,NT_inc_ascii_tst.in,nt,N,X,(1500),(1500)
10671070
(inc),(inc),(jumbo)&(inc_alnum_ee8763c850dee8e4b88ef547a8ed39b8),10000,NT-inc_alnum,INCREMENT_alnum,NT_inc_alnum_tst.in,nt,N,X,(1500),(1500)
1068-
(inc),(inc),(core)&(inc_ascii_72acb6963bf12701dfb06c8d1b00cad4),10000,DES-inc_all,INCREMENT_ascii,DES_inc_all_tst.in,des,N,X,(1500),(1500)
1069-
(inc),(inc),(core)&(inc_alnum_ee8763c850dee8e4b88ef547a8ed39b8),10000,DES-inc_alnum,INCREMENT_alnum,DES_inc_alnum_tst.in,des,N,X,(1500),(1500)
1070-
(inc),(inc),(core)&(inc_ascii_72acb6963bf12701dfb06c8d1b00cad4),10000,DES-inc_all,INCREMENT_ascii,DES_inc_all_tst.in,des,N,X,(1500),(1500)
1071-
(inc),(inc),(core)&(inc_alnum_ee8763c850dee8e4b88ef547a8ed39b8),10000,DES-inc_alnum,INCREMENT_alnum,DES_inc_alnum_tst.in,des,N,X,(1500),(1500)
1072-
(inc),(inc),(core)&(inc_ascii_72acb6963bf12701dfb06c8d1b00cad4),10000,descrypt-inc_all,INCREMENT_ascii,DES_inc_all_tst.in,descrypt,N,X,(1500),(1500)
1071+
(inc),(inc),(core)&(inc_ascii_72acb6963bf12701dfb06c8d1b00cad4),10000,descrypt-inc_ascii,INCREMENT_ascii,DES_inc_ascii_tst.in,descrypt,N,X,(1500),(1500)
10731072
(inc),(inc),(core)&(inc_alnum_ee8763c850dee8e4b88ef547a8ed39b8),10000,descrypt-inc_alnum,INCREMENT_alnum,DES_inc_alnum_tst.in,descrypt,N,X,(1500),(1500)
1074-
(inc),(inc),(core)&(inc_ascii_72acb6963bf12701dfb06c8d1b00cad4),10000,descrypt-inc_all,INCREMENT_ascii,DES_inc_all_tst.in,descrypt,N,X,(1500),(1500)
1073+
(inc),(inc),(core)&(inc_ascii_72acb6963bf12701dfb06c8d1b00cad4),10000,descrypt-inc_ascii,INCREMENT_ascii,DES_inc_ascii_tst.in,descrypt,N,X,(1500),(1500)
10751074
(inc),(inc),(core)&(inc_alnum_ee8763c850dee8e4b88ef547a8ed39b8),10000,descrypt-inc_alnum,INCREMENT_alnum,DES_inc_alnum_tst.in,descrypt,N,X,(1500),(1500)
10761075
#
10771076
#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)

‎jtrts.pl

+5-5
Original file line numberDiff line numberDiff line change
@@ -423,16 +423,16 @@ sub setup {
423423
push(@caps, @encs );
424424
}
425425
}
426-
# ok, now load the md5's of the all.chr and alnum.chr files. These end up being 'required' types for the inc to run.
427-
my $file = $JOHN_PATH . "/all.chr";
426+
# ok, now load the md5's of the ascii.chr and alnum.chr files. These end up being 'required' types for the inc to run.
427+
my $file = $JOHN_PATH . "/ascii.chr";
428428
if (open(FILE, $file)) {
429429
binmode(FILE);
430-
my $sHash = "inc_all_" . Digest::MD5->new->addfile(*FILE)->hexdigest;
430+
my $sHash = "inc_ascii_" . Digest::MD5->new->addfile(*FILE)->hexdigest;
431431
close(FILE);
432432
push(@caps, $sHash);
433-
ScreenOutV("all.chr found, $sHash added as a capability\n");
433+
ScreenOutV("ascii.chr found, $sHash added as a capability\n");
434434
} else {
435-
ScreenOutV("all.chr ($file) not found\n");
435+
ScreenOutV("ascii.chr ($file) not found\n");
436436
}
437437
$file = $JOHN_PATH . "/alnum.chr";
438438
if (open(FILE, $file)) {

0 commit comments

Comments
 (0)