TS 1.12.4 (WIP)

Author: jfoug

JtrTestSuite.Manifest

@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------
-# John, testing suite, v1.12.2   Jim Fougeron.
+# John, testing suite, v1.12.4   Jim Fougeron.
 #
 # No copyright is claimed, and the software is hereby 
 # placed in the public domain. In case this attempt to disclaim 
@@ -101,5 +101,18 @@
 #               PO now required a forced test (gost 'grabbed' it ;) )
 #               Raw SHA1 required a forced test.
 # v1.12.2 Fixed sapG and added sapB (per magnum).
+# v1.12.3 Added gost, gost_cp, raw-sha1_ng (faster on some cpu's).
+#				Added some extra test using crc32, for dupe suppression, and for files having
+#				and lacking
+#				final EOL in the file.
+#				Numerous other changes (-enc:utf changed to --encode=utf)
+#               Changed the cut statement in .pot testing, adding the -s to only cut lines
+#				with  a : char.
+# v1.12.4  Added a bunch of new formats:
+#                 raw-ssh224, raw-ssh256, raw-sha384, raw-sha512, dragonfly3_32, dragonfly4_32,
+#                 hmac-sha1, hmac-sha224, hmac-sha256, hmac-sha384, hmac-sha512,
+# Todo (1.13)
+#				Add tests for -pipe, files with \r\n \n \r and \r\r\n, which are 'real'
+#				file formats seen in the wild.  These tests are in -w= and -pipe modes
 #--------------------------------------------------------------------
 

dragonfly3_32_tst.in

@@ -91,10 +91,23 @@
 (base),(X),(jumbo),10000,raw-md5u,pw,rawmd5u_tst.in,raw-md5u,Y,X,(1500),(1500)
 (base),(X),(jumbo),10000,raw-md5u-raw,pw,rawmd5u_raw_tst.in,raw-md5u,Y,X,(1500),(1500)
 (utf8)(utf-8)(enc),(X),(jumbo)&(encode_valid),10000,raw-md5u-utf8,pw-utf8,rawmd5u_tst_utf8.in,raw-md5u,Y,--encoding=utf-8,(1500),(1500)
-(base),(X),(jumbo),10000,raw-sha1,pw,rawsha1_tst.in,raw-sha1,Y,X,(1500),(1500)
-(raw-sha1),(X),(jumbo),10000,rawsha1-ng,pw,rawsha1_tst.in,raw-sha1-ng,Y,X,(1430),(1430)
-(sha1-gens)(base),(X),(jumbo),10000,sha1-gens,pw,sha1s_tst.in,sha1-gen,Y,X,(1500),(1500)
-(sha1-genp)(base),(X),(jumbo),10000,sha1-genp,pw,sha1p_tst.in,sha1-gen,Y,X,(1500),(1500)
+(base)(sha)(sha1),(X),(jumbo),10000,raw-sha1,pw,rawsha1_tst.in,raw-sha1,Y,X,(1500),(1500)
+(raw-sha1)(sha)(sha1),(X),(jumbo),10000,rawsha1-ng,pw,rawsha1_tst.in,raw-sha1-ng,Y,X,(1430),(1430)
+(sha1-gens)(base)(sha)(sha1),(X),(jumbo),10000,sha1-gens,pw,sha1s_tst.in,sha1-gen,Y,X,(1500),(1500)
+(sha1-genp)(base)(sha)(sha1),(X),(jumbo),10000,sha1-genp,pw,sha1p_tst.in,sha1-gen,Y,X,(1500),(1500)
+# Data added June 28, 2112
+(base)(sha)(sha2),(X),(jumbo),10000,raw-sha224,pw,rawsha224_tst.in,raw-sha224,Y,X,(1500),(1500)
+(base)(sha)(sha2),(X),(jumbo),10000,raw-sha256,pw,rawsha256_tst.in,raw-sha256,Y,X,(1500),(1500)
+(base)(sha)(sha2),(X),(jumbo),10000,raw-sha384,pw,rawsha384_tst.in,raw-sha384,Y,X,(1500),(1500)
+(base)(sha)(sha2),(X),(jumbo),10000,raw-sha512,pw,rawsha512_tst.in,raw-sha512,Y,X,(1500),(1500)
+(base)(sha)(sha1),(X),(jumbo),10000,hmac-sha1,pw,hmacSHA1_tst.in,hmac-sha1,Y,X,(1500),(1500)
+(base)(sha)(sha2),(X),(jumbo),10000,hmac-sha224,pw,hmacSHA224_tst.in,hmac-sha224,Y,X,(1500),(1500)
+(base)(sha)(sha2),(X),(jumbo),10000,hmac-sha256,pw,hmacSHA256_tst.in,hmac-sha256,Y,X,(1500),(1500)
+(base)(sha)(sha2),(X),(jumbo),10000,hmac-sha384,pw,hmacSHA384_tst.in,hmac-sha384,Y,X,(1500),(1500)
+(base)(sha)(sha2),(X),(jumbo),10000,hmac-sha512,pw,hmacSHA512_tst.in,hmac-sha512,Y,X,(1500),(1500)
+#
+(base),(X),(jumbo),10000,dragonfly3-32,pw,dragonfly3_32_tst.in,dragonfly3-32,Y,X,(1500),(1500)
+(base),(X),(jumbo),10000,dragonfly4-32,pw,dragonfly4_32_tst.in,dragonfly4-32,Y,X,(1500),(1500)
 #
 (base),(X),(jumbo),10000,NT,pw,NT_tst.in,nt,Y,X,(1500),(1500)
 (base),(X),(jumbo),10000,NT-raw,pw,NT_raw_tst.in,nt,Y,X,(1500),(1500)
@@ -120,10 +133,10 @@
 (pwdump_lm)(base),(X),(core),10000,pwdump_lm,pw,pwdump_tst.in,lm,Y,X,(986),(986)
 (pwdump_nt)(base),(X),(jumbo),10000,pwdump_nt,pw,pwdump_tst.in,nt,Y,X,(1500),(1500)
 (base),(X),(jumbo),10000,Netscape_LDAP_SHA,pw,nsldap_tst.in,nsldap,Y,X,(1500),(1500)
-(nsldaps)(base),(X),(jumbo),10000,LDAP_SSHA-salted-sha,pw,nsldaps_tst.in,salted-sha1,Y,X,(1500),(1500)
-(openssha)(base),(X),(jumbo),10000,OpenSSHA,pw,openssha_tst.in,salted-sha1,Y,X,(1500),(1500)
+(nsldaps)(base)(sha)(sha1),(X),(jumbo),10000,LDAP_SSHA-salted-sha,pw,nsldaps_tst.in,salted-sha1,Y,X,(1500),(1500)
+(openssha)(base)(sha)(sha1),(X),(jumbo),10000,OpenSSHA,pw,openssha_tst.in,salted-sha1,Y,X,(1500),(1500)
 (ns)(netscreen)(base),(X),(jumbo),10000,Netscreen_MD5,pw,ns_tst.in,md5ns,N,X,(1500),(1500)
-(osx)(base),(X),(jumbo),10000,MAC_OSX_Salted_SHA1,pw,XSHA_tst.in,xsha,N,X,(1500),(1500)
+(osx)(base)(sha)(sha1),(X),(jumbo),10000,MAC_OSX_Salted_SHA1,pw,XSHA_tst.in,xsha,N,X,(1500),(1500)
 (base),(X),(jumbo),10000,hmacMD5,pw,hmacMD5_tst.in,hmac-md5,N,X,(1500),(1500)
 (base),(X),(jumbo),10000,mskrb5,pw,mskrb5_tst.in,mskrb5,N,X,(1500),(1500)
 (base),(X),(jumbo),10000,BFegg,pw,BFegg_tst.in,bfegg,Y,X,(1500),(1500)

dragonfly4_32_tst.in

@@ -3,7 +3,7 @@
 use Getopt::Long;
 use jtrts_inc;
 
-my $VERSION = "1.12.3";
+my $VERSION = "1.12.4";
 my $RELEASE_DATE = "June 22, 2012";
 # how to do alpha character left, so next 'alpha', or beta release will be easy.
 #use utf8;
@@ -601,8 +601,7 @@ sub process {
 			my $cmd2 = sprintf("cut -f 2- -d\"%c\" < $pot | $UNIQUE pw3 > /dev/null", 31);
 			system($cmd2);
 		} else {
-			# FIXME: shouldn't we be even more paranoid, and use cut -f 2- -d: -s
-			my $cmd2 = sprintf("cut -f 2- -d: < $pot | $UNIQUE pw3 > /dev/null");
+			my $cmd2 = sprintf("cut -f 2- -d: -s < $pot | $UNIQUE pw3 > /dev/null");
 			system($cmd2);
 		}
 		$cmd =~ s/$dict_name/--wordlist=pw3/;