bcrypt, pbkdf2-hmac-sha256/512 and truecrypt. Improved performance, and proper salt-dupe input files

Author: jfoug

BF_tst.in

@@ -45,7 +45,7 @@
 (dynamic)(base),(X),(jumbo),10000,dynamic_14,pw,dynamic_14_tst.in,dynamic_14,N,X,(1500),(1500)
 (dynamic)(base),(X),(jumbo),10000,dynamic_15,pw,dynamic_15_tst.in,dynamic_15,N,X,(1500),(1500)
 (dynamic)(base),(X),(jumbo),10000,dynamic_16,pw,dynamic_16_tst.in,dynamic_16,N,X,(1500),(1500)
-(dynamic),(full),(jumbo),150,dynamic_17,pw,dynamic_17_tst.in,dynamic_17,N,X,(1500),(1500)
+(dynamic)(base),(X),(jumbo),150,dynamic_17,pw,dynamic_17_tst.in,dynamic_17,N,X,(1500),(1500)
 (dynamic)(base),(X),(jumbo),10000,dynamic_18,pw,dynamic_18_tst.in,dynamic_18,N,X,(1500),(1500)
 (dynamic)(base),(X),(jumbo),10000,dynamic_19,pw,dynamic_19_tst.in,dynamic_19,N,X,(1500),(1500)
 (dynamic)(base)(asa-md5),(X),(jumbo),10000,dynamic_20,pw,dynamic_20_tst.in,dynamic_20,N,X,(1500),(1500)
@@ -56,8 +56,8 @@
 (dynamic)(base)(sha1),(X),(jumbo),10000,dynamic_24,pw,dynamic_24_tst.in,dynamic_24,N,X,(1500),(1500)
 (dynamic)(base)(sha1),(X),(jumbo),10000,dynamic_25,pw,dynamic_25_tst.in,dynamic_25,N,X,(1500),(1500)
 (dynamic)(base)(sha1),(X),(jumbo),10000,dynamic_26,pw,dynamic_26_tst.in,dynamic_26,N,X,(1500),(1500)
-(dynamic),(full),(jumbo),200,dynamic_27,pw,dynamic_27_tst.in,dynamic_27,N,X,(1500),(1500)
-(dynamic),(full),(jumbo),200,dynamic_28,pw,dynamic_28_tst.in,dynamic_28,N,X,(1500),(1500)
+(dynamic)(base),(X),(jumbo),200,dynamic_27,pw,dynamic_27_tst.in,dynamic_27,N,X,(1500),(1500)
+(dynamic)(base),(X),(jumbo),200,dynamic_28,pw,dynamic_28_tst.in,dynamic_28,N,X,(1500),(1500)
 #
 (dynamic)(base),(X),(jumbo),10000,dynamic_29-raw,pw,rawmd5u_raw_tst.in,dynamic_29,Y,X,(1500),(1500)
 (dynamic)(base),(X),(jumbo),10000,dynamic_29,pw,rawmd5u_tst.in,dynamic_29,Y,X,(1500),(1500)
@@ -263,13 +263,13 @@
 ,(X),(jumbo),80,aix_smd5_1,pw,md5_1_tst.in,aix-smd5,Y,X,(1500),(1500)
 
 ,(X),(core),220,BSDI,pw,BSDI_tst.in,bsdi,N,X,(1500),(1500)
-,(full),(core),40,BF,pw,BF_tst.in,bf,N,X,(1500),(1500)
-,(full),(core),40,BF_broken,pw,BFx_tst.in,bf,N,X,(1500),(1500)
+,(X),(core),200,BF,pw,BF_tst.in,bf,N,X,(1500),(1500)
+,(X),(core),200,BF_broken,pw,BFx_tst.in,bf,N,X,(1500),(1500)
 ,(X),(core),220,BSDIcrypt,pw,BSDI_tst.in,bsdicrypt,N,X,(1500),(1500)
-,(full),(core),40,Bcrypt,pw,BF_tst.in,bcrypt,N,X,(1500),(1500)
-,(full),(core),40,Bcrypt_broken,pw,BFx_tst.in,bcrypt,N,X,(1500),(1500)
-(phpass),(full),(jumbo),150,PHPass-md5,pw,phpass_tst.in,phpass-md5,N,X,(1500),(1500)
-(phpass),(full),(jumbo),150,PHPass,pw,phpass_tst.in,phpass,N,X,(1500),(1500)
+,(X),(core),200,Bcrypt,pw,BF_tst.in,bcrypt,N,X,(1500),(1500)
+,(X),(core),200,Bcrypt_broken,pw,BFx_tst.in,bcrypt,N,X,(1500),(1500)
+(phpass),(X),(jumbo),150,PHPass-md5,pw,phpass_tst.in,phpass-md5,N,X,(1500),(1500)
+(phpass),(X),(jumbo),150,PHPass,pw,phpass_tst.in,phpass,N,X,(1500),(1500)
 ,(X),(jumbo),50,mscash2,pw,MSCash2_tst.in,mscash2,Y,X,(1500),(1500)
 (base),(X),(core),10000,des,pw,DES_tst.in,des,N,X,(1500),(1500)
 (bigcrypt)(base),(X),(core),10000,des,pw,BigCrypt_tst.in,des,N,X,(1500),(1500)
@@ -401,8 +401,8 @@
 (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),(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)(sha2),(X),(jumbo),200,pbkdf2-hmac-sha256,pw,pbkdf2-hmac-sha256_tst.in,pbkdf2-hmac-sha256,Y,X,(1500),(1500)
+(base)(sha2),(X),(jumbo),200,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)
@@ -736,7 +736,8 @@
 (base)(rar),(full),(jumbo),40,rar,pw,rar_tst.in,rar,Y,X,(130),(130)
 (base)(rar)(rarx2),(full),(jumbo),60,rar,pw,rar2_tst.in,rar,Y,X,(297),(297)
 
-(base)(tc_sha512)(tc)(truecrypt),(X),(jumbo),40,tc_sha512,pw,tc_sha512_tst.in,tc_sha512,Y,X,(1500),(1500)
-(base)(tc_sha512)(tc)(truecrypt),(full),(jumbo),40,tc_whirlpool,pw,tc_whirlpool_tst.in,tc_whirlpool,Y,X,(1500),(1500)
-(base)(tc_sha512)(tc)(ripemd160),(full),(jumbo),40,tc_ripemd160,pw,tc_ripemd160_tst.in,tc_ripemd160,Y,X,(1500),(1500)
-(base)(ecryptfs),(full),(jumbo),10000,ecryptfs,pw,ecryptfs_tst.in,ecryptfs,Y,X,(1500),(1500)
+(base)(tc)(truecrypt),(X),(jumbo),35,tc_aes_xts (3-types),pw,tc_aes_xts_all_tst.in,tc_aes_xts,Y,X,(1500),(1500)
+(base)(tc)(truecrypt),(X),(jumbo),35,tc_sha512,pw,tc_sha512_tst.in,tc_sha512,Y,X,(1500),(1500)
+(base)(tc)(truecrypt),(full),(jumbo),35,tc_whirlpool,pw,tc_whirlpool_tst.in,tc_whirlpool,Y,X,(1500),(1500)
+(base)(tc)(ripemd160),(full),(jumbo),35,tc_ripemd160,pw,tc_ripemd160_tst.in,tc_ripemd160,Y,X,(1500),(1500)
+(base)(ecryptfs),(full),(jumbo),200,ecryptfs,pw,ecryptfs_tst.in,ecryptfs,Y,X,(1500),(1500)