updated IPB2, Drupal7, cisco9, scrypt, django-scrypt, pbkdf2-hmac-sha1, office-2007, sunmd5. All formats work much faster, with better duplicate salt values

Author: jfoug

IPB2_tst.in

@@ -347,7 +347,7 @@
 (base),(X),(jumbo),10000,mskrb5,pw,mskrb5_tst.in,mskrb5,N,X,(1500),(1500)
 (base),(X),(jumbo),10000,krb5pa-md5,pw,mskrb5_tst.in,krb5pa-md5,N,X,(1500),(1500)
 (base),(X),(jumbo),10000,BFegg,pw,BFegg_tst.in,bfegg,Y,X,(1500),(1500)
-(base),(X),(jumbo),10000,IPB2,pw,IPB2_tst.in,ipb2,N,X,(1500),(1500)
+(base),(X),(jumbo),40,IPB2,pw,IPB2_tst.in,ipb2,N,X,(1500),(1500)
 (base),(X),(jumbo),10000,MSSql12,pw,MsSql12_tst.in,mssql12,N,X,(1500),(1500)
 (base),(X),(jumbo),10000,MSSql05,pw,MSSql05_tst.in,mssql05,N,X,(1500),(1500)
 (base),(X),(jumbo),10000,MSSql,pw,mssql_tst.in,mssql,N,X,(1500),(1500)
@@ -387,26 +387,26 @@
 (base)(raw-sha)(raw-sha0)(rawsha),(X),(jumbo),10000,raw-sha,pw,rawsha0_tst.in,raw-sha,Y,X,(1500),(1500)
 (base)(sybasease),(X),(jumbo),10000,sybasease,pw,sybasease_tst.in,sybasease,Y,X,(1500),(1500)
 (base)(wbb3),(X),(jumbo),10000,wbb3,pw,wbb3_tst.in,wbb3,Y,X,(1500),(1500)
-(base)(drupal7),(X),(jumbo),40,drupal7,pw,drupal7_tst.in,drupal7,Y,X,(1485),(1485)
+(base)(drupal7),(X),(jumbo),40,drupal7,pw,drupal7_tst.in,drupal7,Y,X,(1500),(1500)
 (base)(krb5-18),(X),(jumbo),50,krb5-18,pw,krb5-18_tst.in,krb5-18,Y,X,(1500),(1500)
 
 (mssql-utf8)(utf8)(utf-8)(enc),(X),(jumbo)&(encode_valid),10000,mssql-utf8,pw,mssql_tst.in,mssql,Y,-enc=utf8,(1229),(1229)
 (mssql05-utf8)(utf8)(utf-8)(enc),(X),(jumbo)&(encode_valid),10000,mssql05-utf8,pw,MSSql05_tst.in,mssql05,Y,-enc=utf8,(1229),(1229)
 
 (base)(sha)(sha2)(cisco4),(X),(jumbo),10000,cisco4,pw,cisco4_tst.in,raw-sha256,Y,X,(1500),(1500)
 (base)(sha)(sha2)(cisco8),(X),(jumbo),70,cisco8,pw,cisco8_tst.in,pbkdf2-hmac-sha256,Y,X,(1500),(1500)
-(base)(cisco9),(full),(jumbo),35,cisco9,pw,cisco9_tst.in,scrypt,Y,X,(1500),(1500)
-(base)(django-scrypt)(scrypt),(full),(jumbo),35,django-scrypt,pw,django-scrypt_tst.in,django-scrypt,Y,X,(1500),(1500)
-(base)(scrypt),(full),(jumbo),35,scrypt,pw,scrypt_tst.in,scrypt,Y,X,(1500),(1500)
+(base)(cisco9),(X),(jumbo),200,cisco9,pw,cisco9_tst.in,scrypt,Y,X,(1500),(1500)
+(base)(django-scrypt)(scrypt),(X),(jumbo),200,django-scrypt,pw,django-scrypt_tst.in,django-scrypt,Y,X,(1500),(1500)
+(base),(X),(jumbo),200,scrypt,pw,scrypt_tst.in,scrypt,Y,X,(1500),(1500)
 (base)(sha),(X),(jumbo),40,pbkdf2-hmac-sha1,pw,pbkdf2-hmac-sha1_tst.in,pbkdf2-hmac-sha1,Y,X,(1500),(1500)
 (base)(sha)(pbkdf2-hmac-sha1),(X),(jumbo),40,pbkdf2-hmac-sha1-p5k2,pw,pbkdf2-hmac-sha1-p5k2_tst.in,pbkdf2-hmac-sha1,Y,X,(1500),(1500)
-(base)(sha)(pbkdf2-hmac-sha1),(full),(jumbo),40,pbkdf2-hmac-sha1-pkcs5s2,pw,pbkdf2-hmac-sha1-pkcs5s2_tst.in,pbkdf2-hmac-sha1,Y,X,(1500),(1500)
+(base)(sha)(pbkdf2-hmac-sha1),(X),(jumbo),200,pbkdf2-hmac-sha1-pkcs5s2,pw,pbkdf2-hmac-sha1-pkcs5s2_tst.in,pbkdf2-hmac-sha1,Y,X,(1500),(1500)
 (base)(sha2),(full),(jumbo),40,pbkdf2-hmac-sha256,pw,pbkdf2-hmac-sha256_tst.in,pbkdf2-hmac-sha256,Y,X,(1500),(1500)
 (base)(sha2),(X),(jumbo),40,pbkdf2-hmac-sha512,pw,pbkdf2-hmac-sha512_tst.in,pbkdf2-hmac-sha512,Y,X,(1500),(1500)
 (base)(aix)(aix-ssha),(X),(jumbo),40,aix-ssha1,pw,aix-ssha1_tst.in,aix-ssha1,Y,X,(1500),(1500)
 (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),(full),(jumbo),200,office_2007,pw,office_2007_tst.in,office,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)
@@ -433,7 +433,7 @@
 (base),(X),(jumbo),10000,tiger,pw,raw-tiger_tst.in,tiger,Y,X,(1500),(1500)
 (base),(X),(jumbo),10000,whirlpool,pw,raw-whirlpool_tst.in,whirlpool,Y,X,(1500),(1500)
 (base),(X),(jumbo),10000,dummy,pw,dummy_tst.in,dummy,Y,X,(1500),(1500)
-(base),(X),(jumbo),40,sunmd5,pw,sunmd5_tst.in,sunmd5,Y,X,(1500),(1500)
+(base),(X),(jumbo),200,sunmd5,pw,sunmd5_tst.in,sunmd5,Y,X,(1500),(1500)
 (base),(X),(jumbo),50,wpapsk,pw,wpapsk_tst.in,wpapsk,Y,X,(500),(500)
 (base),(x),(jumbo),40,keychain,pw,keychain_tst.in,keychain,Y,X,(1500),(1500)
 (base),(x),(jumbo),40,sha1crypt,pw,sha1crypt_tst.in,sha1crypt,Y,X,(1500),(1500)