added zip-aes formats, all 3 types

Author: jfoug

jtrts.dat

@@ -402,11 +402,15 @@
 (base)(office)(office_2010),(full),(jumbo),40,office_2010,pw,office_2010_tst.in,office,Y,X,(1500),(1500)
 (base)(office)(office_2013),(full),(jumbo),40,office_2013,pw,office_2013_tst.in,office,Y,X,(1500),(1500)
 (base)(office)(office-2k),(full),(jumbo),40,office,pw,office_2k7_2k10_2k13_tst.in,office,Y,X,(1500),(1500)
-(base)(sip),(full),(jumbo),10000,sip,pw,sip_tst.in,sip,Y,X,(1500),(1500)
-(base)(saph),(full),(jumbo),80,saph-sha1,pw,saph_sha1_tst.in,saph,Y,X,(1500),(1500)
-(base)(saph),(full),(jumbo),80,saph-sha256,pw,saph_sha256_tst.in,saph,Y,X,(1500),(1500)
-(base)(saph),(full),(jumbo),80,saph-sha384,pw,saph_sha384_tst.in,saph,Y,X,(1500),(1500)
-(base)(saph),(full),(jumbo),80,saph-sha512,pw,saph_sha512_tst.in,saph,Y,X,(1500),(1500)
+(base)(sip),(X),(jumbo),10000,sip,pw,sip_tst.in,sip,Y,X,(1500),(1500)
+(base)(saph),(X),(jumbo),80,saph-sha1,pw,saph_sha1_tst.in,saph,Y,X,(1500),(1500)
+(base)(saph),(X),(jumbo),80,saph-sha256,pw,saph_sha256_tst.in,saph,Y,X,(1500),(1500)
+(base)(saph),(X),(jumbo),80,saph-sha384,pw,saph_sha384_tst.in,saph,Y,X,(1500),(1500)
+(base)(saph),(X),(jumbo),80,saph-sha512,pw,saph_sha512_tst.in,saph,Y,X,(1500),(1500)
+(base)(zip),(X),(jumbo),40,zip-type1,pw,zip_1_tst.in,zip,Y,X,(1500),(1500)
+(base)(zip),(X),(jumbo),40,zip-type2,pw,zip_2_tst.in,zip,Y,X,(1500),(1500)
+(base)(zip),(X),(jumbo),40,zip-type3,pw,zip_3_tst.in,zip,Y,X,(1500),(1500)
+(base)(zip),(X),(jumbo),40,zip,pw,zip_123_tst.in,zip,Y,X,(1500),(1500)
 
 ###############################################
 (mschapv2-utf8)(utf8)(utf-8)(enc),(full),(jumbo)&(encode_valid),10000,mschapv2-utf8,pw-utf8,mschapv2_tst_utf8.in,mschapv2,Y,-enc=utf8,(1442)(1500),(1442)(1500)
@@ -638,6 +642,10 @@
 (opencl)(gpu)(office-opencl),(x),(jumbo),40,office_2007-opencl,pw,office_2007_tst.in,office2007-opencl,Y,X,(1500),(1500)
 (opencl)(gpu)(office-opencl),(X),(jumbo),40,office_2010-opencl,pw,office_2010_tst.in,office2010-opencl,Y,X,(1500),(1500)
 (opencl)(gpu)(office-opencl),(X),(jumbo),40,office_2013-opencl,pw,office_2013_tst.in,office2013-opencl,Y,X,(1500),(1500)
+(opencl)(gpu)(zip-opencl),(X),(jumbo),40,zip-type1,pw,zip_1_tst.in,zip-opencl,Y,X,(1500),(1500)
+(opencl)(gpu)(zip-opencl),(X),(jumbo),40,zip-type2,pw,zip_2_tst.in,zip-opencl,Y,X,(1500),(1500)
+(opencl)(gpu)(zip-opencl),(X),(jumbo),40,zip-type3,pw,zip_3_tst.in,zip-opencl,Y,X,(1500),(1500)
+(opencl)(gpu)(zip-opencl),(X),(jumbo),40,zip,pw,zip_123_tst.in,zip-opencl,Y,X,(1500),(1500)
 
 # This is a very slow, and VERY large input file hash.
 (ssh),(full),(jumbo),1600,ssh,pass,ssh_1500_tst.in,ssh,N,X,(1500),(1500)