office rework

Author: jfoug

jtrts.dat

@@ -407,9 +407,9 @@
 (base)(aix)(aix-ssha),(X),(jumbo),40,aix-ssha256,pw,aix-ssha256_tst.in,aix-ssha256,Y,X,(1500),(1500)
 (base)(aix)(aix-ssha),(X),(jumbo),40,aix-ssha512,pw,aix-ssha512_tst.in,aix-ssha512,Y,X,(1500),(1500)
 (base)(office)(office_2007),(X),(jumbo),200,office_2007,pw,office_2007_tst.in,office,Y,X,(1500),(1500)
-(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)(office)(office_2010),(X),(jumbo),12,office_2010,pw,office_2010_tst.in,office,Y,X,(48),(48)
+(base)(office)(office_2013),(X),(jumbo),12,office_2013,pw,office_2013_tst.in,office,Y,X,(48),(48)
+(base)(office)(office-2k),(full),(jumbo),200,office_all-2k7-2k13,pw,office_2k7_2k10_2k13_tst.in,office,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)
@@ -674,29 +674,29 @@
 (opencl)(gpu),(X),(jumbo)&(opencl),10000,des-opencl,pw,DES_tst.in,des-opencl,Y,X,(1500),(1500)
 (opencl)(gpu),(X),(jumbo)&(opencl),10000,descrypt-opencl,pw,DES_tst.in,descrypt-opencl,Y,X,(1500),(1500)
 (opencl)(gpu),(X),(jumbo)&(opencl),10000,ntlmv2-opencl,pw,netntlmv2_tst.in,ntlmv2-opencl,Y,X,(1452)(1500),(1452)(1500)
-(opencl)(gpu),(X),(jumbo)&(encode_valid)&(opencl),10000,ntlmv2-opencl-utf8,pw-utf8,netntlmv2_tst_utf8.in,ntlmv2-opencl,Y,-enc=utf8,(1442)(1500),(1442)(1500)
-(opencl)(gpu),(X),(jumbo)&(encode_valid)&(opencl),10000,ntlmv2-opencl-koi8r,pw-koi8r,netntlmv2_tst_koi8r.in,ntlmv2-opencl,Y,-enc=koi8r,(1429)(1500),(1429)(1500)
+(opencl)(gpu),(X),(jumbo)&(encode_valid)&(opencl),10000,netntlmv2-utf8,pw-utf8,netntlmv2_tst_utf8.in,ntlmv2-opencl,Y,-enc=utf8,(1442)(1500),(1442)(1500)
+(opencl)(gpu),(X),(jumbo)&(encode_valid)&(opencl),10000,netntlmv2-koi8r,pw-koi8r,netntlmv2_tst_koi8r.in,ntlmv2-opencl,Y,-enc=koi8r,(1429)(1500),(1429)(1500)
 (opencl)(gpu)(sha)(sha2),(X),(jumbo)&(opencl),10000,raw-sha256-opencl,pw,rawsha256_tst.in,raw-sha256-opencl,Y,X,(1500),(1500)
 (opencl)(gpu),(X),(jumbo)&(opencl),40,rar-opencl,pw,rar_tst.in,rar-opencl,Y,X,(130),(130)
 (opencl)(gpu),(X),(jumbo)&(opencl),60,rar-opencl,pw,rar2_tst.in,rar-opencl,Y,X,(297),(297)
 (opencl)(gpu)(cisco8-opencl),(X),(jumbo),70,pbkdf2-hmac-sha256-opencl,pw,cisco8_tst.in,pbkdf2-hmac-sha256-opencl,Y,X,(1500),(1500)
 (opencl)(gpu),(X),(jumbo),40,pbkdf2-hmac-sha1-opencl,pw,pbkdf2-hmac-sha1_tst.in,pbkdf2-hmac-sha1-opencl,Y,X,(1500),(1500)
 (opencl)(gpu)(pbkdf2-hmac-sha1-opencl),(X),(jumbo),40,pbkdf2-hmac-sha1-p5k2-opencl,pw,pbkdf2-hmac-sha1-p5k2_tst.in,pbkdf2-hmac-sha1-opencl,Y,X,(1500),(1500)
-(opencl)(gpu)(pbkdf2-hmac-sha1-opencl),(X),(jumbo),200,pbkdf2-hmac-sha1-pkcs5s2-opencl,pw,pbkdf2-hmac-sha1-pkcs5s2_tst.in,pbkdf2-hmac-sha1-opencl,Y,X,(1500),(1500)
-(opencl)(gpu),(X),(jumbo),200,pbkdf2-hmac-sha256-opencl,pw,pbkdf2-hmac-sha256_tst.in,pbkdf2-hmac-sha256-opencl,Y,X,(1500),(1500)
-(opencl)(gpu),(X),(jumbo),200,pbkdf2-hmac-sha512-opencl,pw,pbkdf2-hmac-sha512_tst.in,pbkdf2-hmac-sha512-opencl,Y,X,(1500),(1500)
+(opencl)(gpu)(pbkdf2-hmac-sha1-opencl),(X),(jumbo),40,pbkdf2-hmac-sha1-pkcs5s2-opencl,pw,pbkdf2-hmac-sha1-pkcs5s2_tst.in,pbkdf2-hmac-sha1-opencl,Y,X,(1500),(1500)
+(opencl)(gpu),(X),(jumbo),40,pbkdf2-hmac-sha256-opencl,pw,pbkdf2-hmac-sha256_tst.in,pbkdf2-hmac-sha256-opencl,Y,X,(1500),(1500)
+(opencl)(gpu),(X),(jumbo),40,pbkdf2-hmac-sha512-opencl,pw,pbkdf2-hmac-sha512_tst.in,pbkdf2-hmac-sha512-opencl,Y,X,(1500),(1500)
 (opencl)(gpu),(X),(jumbo)&(opencl),10000,rakp-opencl,pw,rakp_tst.in,rakp-opencl,Y,X,(1500)(1451),(1500)(1451)
 (opencl)(gpu),(X),(jumbo),10000,krb5pa-md5-opencl,pw,mskrb5_tst.in,krb5pa-md5-opencl,Y,X,(1500),(1500)
 (opencl)(gpu),(X),(jumbo),10000,lotus5-opencl,pw,lotus5_tst.in,lotus5-opencl,Y,X,(1500),(1500)
-(opencl)(gpu),(X),(jumbo),10000,odf-opencl,pw,odf_tst.in,odf-opencl,Y,X,(1500),(1500)
-(opencl)(gpu)(odf-opencl),(X),(jumbo),10000,odf-opencl_1,pw,odf_1_tst.in,odf-aes-opencl,Y,X,(1500),(1500)
-(opencl)(gpu)(office-opencl),(X),(jumbo),200,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-opencl-type1,pw,zip_1_tst.in,zip-opencl,Y,X,(1500),(1500)
-(opencl)(gpu)(zip-opencl),(X),(jumbo),40,zip-opencl-type2,pw,zip_2_tst.in,zip-opencl,Y,X,(1500),(1500)
-(opencl)(gpu)(zip-opencl),(X),(jumbo),40,zip-opencl-type3,pw,zip_3_tst.in,zip-opencl,Y,X,(1500),(1500)
-(opencl)(gpu)(zip-opencl),(X),(jumbo),40,zip-opencl,pw,zip_123_tst.in,zip-opencl,Y,X,(1500),(1500)
+(opencl)(gpu),(X),(jumbo),10000,odf,pw,odf_tst.in,odf-opencl,Y,X,(1500),(1500)
+(opencl)(gpu)(odf-opencl),(X),(jumbo),10000,odf_1,pw,odf_1_tst.in,odf-aes-opencl,Y,X,(1500),(1500)
+(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,(48),(48)
+(opencl)(gpu)(office-opencl),(X),(jumbo),40,office_2013-opencl,pw,office_2013_tst.in,office2013-opencl,Y,X,(48),(48)
+(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)
 (opencl)(gpu),(X),(jumbo),50,wpapsk-opencl,pw,wpapsk_tst.in,wpapsk-opencl,Y,X,(500),(500)
 (opencl)(gpu),(X),(jumbo),40,keychain-opencl,pw,keychain_tst.in,keychain-opencl,Y,X,(1500),(1500)
 (opencl)(gpu),(X),(jumbo),40,sha1crypt-opencl,pw,sha1crypt_tst.in,sha1crypt-opencl,Y,X,(1500),(1500)