Many formats: Benchmark a single cost

Also add and use hashcat's test vectors when available, for comparisons. Closes #5612
openwall · Dec 23, 2024 · cf162ca · cf162ca
1 parent 4c35660
commit cf162ca
Show file tree

Hide file tree

Showing 26 changed files with 38 additions and 19 deletions.
diff --git a/src/7z_common.h b/src/7z_common.h
@@ -25,7 +25,7 @@
  * The format exploits the fact that the salt is usually empty,
  * so KDF result can be reused.
  */
-#define BENCHMARK_LENGTH        7
+#define BENCHMARK_LENGTH        0x507
 #define BINARY_SIZE             0
 #define BINARY_ALIGN            1
 #define SALT_SIZE               sizeof(sevenzip_salt_t*)

diff --git a/src/cloudkeychain_common.h b/src/cloudkeychain_common.h
@@ -8,6 +8,8 @@
 #include "formats.h"
 
 #define FORMAT_NAME             "1Password Cloud Keychain"
+#define BENCHMARK_COMMENT       ""
+#define BENCHMARK_LENGTH        0x507
 #define FORMAT_TAG              "$cloudkeychain$"
 #define FORMAT_TAG_LEN          (sizeof(FORMAT_TAG)-1)
 

diff --git a/src/cloudkeychain_fmt_plug.c b/src/cloudkeychain_fmt_plug.c
@@ -50,8 +50,6 @@ john_register_one(&fmt_cloud_keychain);
 #else
 #define ALGORITHM_NAME          "PBKDF2-SHA512 32/" ARCH_BITS_STR
 #endif
-#define BENCHMARK_COMMENT       ""
-#define BENCHMARK_LENGTH        0x107
 #define BINARY_SIZE             0
 #define BINARY_ALIGN            1
 #define PLAINTEXT_LENGTH        111

diff --git a/src/diskcryptor_common.h b/src/diskcryptor_common.h
@@ -9,6 +9,8 @@
 #include "formats.h"
 #include "jumbo.h"
 
+#define BENCHMARK_COMMENT       ""
+#define BENCHMARK_LENGTH        0x107
 #define FORMAT_TAG              "$diskcryptor$"
 #define TAG_LENGTH              (sizeof(FORMAT_TAG) - 1)
 

diff --git a/src/diskcryptor_fmt_plug.c b/src/diskcryptor_fmt_plug.c
@@ -46,8 +46,6 @@ john_register_one(&fmt_diskcryptor);
 #define ALGORITHM_NAME          "PBKDF2-SHA512 32/" ARCH_BITS_STR
 #endif
 #endif
-#define BENCHMARK_COMMENT       ""
-#define BENCHMARK_LENGTH        0x107
 #define BINARY_SIZE             0
 #define BINARY_ALIGN            1
 #define SALT_SIZE               sizeof(struct custom_salt)

diff --git a/src/fvde_common.h b/src/fvde_common.h
@@ -4,6 +4,8 @@
 
 #include "formats.h"
 
+#define BENCHMARK_COMMENT       ""
+#define BENCHMARK_LENGTH        0x507
 #define SALTLEN                 16
 #define BLOBLEN                 40  // 24 for AES-128
 #define FORMAT_NAME             "FileVault 2"

diff --git a/src/fvde_common_plug.c b/src/fvde_common_plug.c
@@ -10,6 +10,7 @@
 #include "johnswap.h"
 
 struct fmt_tests fvde_tests[] = {
+	{"$fvde$1$16$84286044060108438487434858307513$20000$f1620ab93192112f0a23eea89b5d4df065661f974b704191", "hashcat"},
 	// https://github.com/kholia/fvde2john/blob/master/fvde-1.raw.tar.xz
 	{"$fvde$1$16$e7eebaabacaffe04dd33d22fd09e30e5$41000$e9acbb4bc6dafb74aadb72c576fecf69c2ad45ccd4776d76", "openwall"},
 	// external disk encrypted by macOS 10.12.2

diff --git a/src/fvde_fmt_plug.c b/src/fvde_fmt_plug.c
@@ -42,8 +42,6 @@ john_register_one(&fmt_fvde);
 #else
 #define ALGORITHM_NAME          "PBKDF2-SHA256 AES 32/" ARCH_BITS_STR
 #endif
-#define BENCHMARK_COMMENT       ""
-#define BENCHMARK_LENGTH        0x107
 #define BINARY_SIZE             0
 #define PLAINTEXT_LENGTH        125
 #define SALT_SIZE               sizeof(*cur_salt)

diff --git a/src/geli_common.h b/src/geli_common.h
@@ -23,6 +23,8 @@
 #define G_ELI_MKEYLEN           (G_ELI_DATAIVKEYLEN + SHA512_MDLEN)
 
 #define FORMAT_NAME             "FreeBSD GELI"
+#define BENCHMARK_COMMENT       ""
+#define BENCHMARK_LENGTH        0x507
 #define FORMAT_TAG              "$geli$"
 #define TAG_LENGTH              (sizeof(FORMAT_TAG) - 1)
 

diff --git a/src/geli_fmt_plug.c b/src/geli_fmt_plug.c
@@ -39,8 +39,6 @@ john_register_one(&fmt_geli);
 #else
 #define ALGORITHM_NAME          "PBKDF2-SHA512 32/" ARCH_BITS_STR
 #endif
-#define BENCHMARK_COMMENT       ""
-#define BENCHMARK_LENGTH        0x107
 #define BINARY_SIZE             0
 #define PLAINTEXT_LENGTH        125
 #define SALT_SIZE               sizeof(*cur_salt)

diff --git a/src/odf_common.h b/src/odf_common.h
@@ -9,6 +9,8 @@
 #define FORMAT_TAG              "$odf$*"
 #define FORMAT_TAG_LEN          (sizeof(FORMAT_TAG)-1)
 #define FORMAT_NAME             "OpenDocument Star/Libre/OpenOffice"
+#define BENCHMARK_COMMENT       ""
+#define BENCHMARK_LENGTH        0x507
 
 struct custom_salt {
 	int cipher_type;

diff --git a/src/odf_common_plug.c b/src/odf_common_plug.c
@@ -21,6 +21,8 @@
 #include "pbkdf2_hmac_sha1.h"
 
 struct fmt_tests odf_tests[] = {
+	{"$odf$*1*1*100000*32*751854d8b90731ce0579f96bea6f0d4ac2fb2f546b31f1b6af9a5f66952a0bf4*16*2185a966155baa9e2fb597298febecbc*16*c18eaae34bcbbe9119be017fe5f8b52d*0*051e0f1ce0e866f2b771029e03a6c7119aad132af54c4e45824f16f61f357a40407ab82744fe6370c7b2346075fcd4c2e58ab244411b3ab1d532a46e2321599ef13c3d3472fc2f14d480d8c33215e473da67f90540279d3ef1f62dde314fa222796046e496c951235ddf88aa754620b7810d22ebc8835c90dce9276946f52b8ea7d95d2f86e4cc725366a8b3edacc2ce88518e535991a5f84d5ea8795dc02bfb731b5f202ecaf7d4b245d928c4248709fcdf3fba2acf1a08be0c1eee7dbeda07e8c3a6983565635e99952b8ad79d31c965f245ae90b5cc3dba6387898c66fa35cad9ac9595c41b62e68efcdd73185b38e220cf004269b77ec6974474b03b7569afc3b503a2bf8b2d035756f3f4cb880d9ba815e5c944508a0bde214076c35bf0e0814a96d21ccaa744c9056948ed935209f5c7933841d2ede3d28dd84da89d477d4a0041ce6d8ddab891d929340db6daa921d69b46fd5aee306d0bcef88c38acbb495d0466df7e2f744e3d10201081215c02db5dd479a4cda15a3338969c7baec9d3d2c378a8dd30449319b149dc3b4e7f00996a59fcb5f243d0df2cbaf749241033f7865aefa960adfeb8ebf205b270f90b1f82c34f80d5a8a0db7aec89972a32f5daa2a73c5895d1fced01b3ab8e576bd2630eff01cad97781f4966d4b528e1b15f011f28ae907a352073c96b203adc7742d2b79b2e2f440b17e7856ae119e08d15d8bdf951f6d4a3f9b516da2d9a8f9dd93488f8e0119f3da19138ab787f0d7098a652cccd914aa0ff81d375bd6a5a165acc936f591639059287975cfc3ca4342e5f9501b3249a76d14e56d6d56b319e036bc0449ac7b5afa24ffbea11babed8183edf8d4fdca1c3f0d23bfd4a02797627d556634f1a9304e03737604bd86f6b5a26aa687d6df73383e0f7dfe62a131e8dbb8c3f4f13d24857dd29d76984eac6c45df7428fc79323ffa1f4e7962d705df74320141ed1f16d1ad483b872168df60315ffadbfa1b7f4afaed8a0017421bf5e05348cb5c707a5e852d6fee6077ec1c33bc707bcd97b7701ee05a03d6fa78b0d31c8c97ea16e0edf434961bd5cc7cbb7eb2553730f0405c9bd21cee09b3f7c1bc57779fdfc15f3935985737a1b522004c4436b631a39a66e8577a03f5020e6aa41952c0662c8c57f66caa483b47af38b8cb5d457245fd3241749e17433e6f929233e8862d7c584111b1991b2d6e94278e7e6e1908cee5a83d94c78b75a84a695d25aeb9fdde72174fe6dd75e8d406671f44892a385a4a1e249f61ebc993e985607423a0a5742e668d52c1ebf5cecae7c2b7908f4627b92ec49354a9ccff8cb5763ad074a00e65a485a41bf4c25ce7e6fae49358a58547b1c0ca79713e297310c0a367c3de196f1dd685ca4be643bdf1e4f6b034211d020557e37a3b6614d061010b4a3416b6b279728c245d3322", "hashcat"},
+	{"$odf$*0*0*1024*16*bff753835f4ea15644b8a2f8e4b5be3d147b9576*8*ee371da34333b69d*16*a902eff54a4d782a26a899a31f97bef4*0*dae7e41fbc3a500d3ce152edd8876c4f38fb17d673ee2ac44ef1e0e283622cd2ae298a82d8d98f2ea737247881fc353e73a2f535c6e13e0cdc60821c1a61c53a4b0c46ff3a3b355d7b793fad50de15999fc7c1194321d1c54316c3806956c4a3ade7daabb912a2a36398eba883af088b3cb69b43365d9ba9fce3fb0c1524f73947a7e9fc1bf3adb5f85a367035feacb5d97c578b037144c2793f34aa09dcd04bdaa455aee0d4c52fe377248611dd56f2bd4eb294673525db905f5d905a28dec0909348e6bf94bcebf03ddd61a48797cd5728ce6dbb71037b268f526e806401abcf495f6edd0b5d87118671ec690d4627f86a43e51c7f6d42a75a56eec51204d47e115e813ed4425c97b16b195e02ce776c185194b9de43ae89f356e29face016cb393d6fb93af8ea305d921d5592dd184051ac790b9b90266f52b8d53ce1cb1d762942d6d5bbd0e3821be21af9fa6874ba0c60e64f41d3e5b6caca1c53b575afdc5d8f6a3edbf874dbe009c6cb296466fe9637aed4aed8a43a95ea7d26b4090ad33d4ee7a83844b0893e8bc0f04944205fb9576cb5720f019028cd75ca9ac47b3e5fa231354d74135564df43b659cfaea7e195c4a896e0e0e0c85dc9ce3a9ce9ba552bc2a6dbac4901c19558818e1957ed72d78662bb5ba53475ca584371f1825ae0c92322a4404e63c2baad92665aac29b5c6f96e1e6338d48fb0aef4d0b686063974f58b839484f8dcf0a02537cba67a7d2c4de13125d74820cb07ec72782035af1ea6c4db61c77016d1c021b63c8b07adb4e8510f5c41bbc501f60f3dd16462399b52eb146787e38e700147c7aa23ac4d5d22d9d1c93e67a01c92a197d4765cbf8d56a862a1205abb450a182913a69b8d5334a59924f86fb3ccd0dcfe7426053e26ba26b57c05f38d85863fff1f81135b0366e8cd8680663ae8aaf7d005317b849d5e08be882708fa0d8d02d47e89150124b507c34845c922b95e62aa0b3fef218773d7aeb572c67b35ad8787f31ecc6e1846b673b8ba6172223176eabf0020b6aa3aa71405b40b2fc2127bf9741a103f1d8eca21bf27328cdf15153f2f223eff7b831a72ed8ecacf4ea8df4ea44f3a3921e5a88fb2cfa355ece0f05cbc88fdd1ecd368d6e3b2dfabd999e5b708f1bccaeebb296c9d7b76659967742fe966aa6871cbbffe710b0cd838c6e02e6eb608cb5c81d066b60b5b3604396331d97d4a2c4c2317406e48c9f5387a2c72511d1e6899bd450e9ca88d535755bcfddb53a6df118cd9cdc7d8b4b814f7bc17684d8e5975defaa25d06f410ed0724c16b8f69ec3869bc1f05c71483666968d1c04509875dadd72c6182733d564eb1a7d555dc34f6b817c5418626214d0b2c3901c5a46f5b20fddfdf9f71a7dfd75b9928778a3f65e1832dff22be973c2b259744d500a3027c2a2e08972eaaad4c5c4ec871", "hashcat"},
 	{"$odf$*0*0*1024*16*df6c10f64d191a841812af53874b636d014ce3fe*8*07e28aff39d2660e*16*b124be9f3346fb77e0ebcc3bb80028f8*0*2276a1077f6a2a027bd565ce89824d6a20086e378876be05c4b8e3796a460e828c9803a692caf7a53492c220d1d7ecbf4e2d336c7abf5a7672acc804ca267318252cbc13676616d1fde38820f9fbeef1360067d9de096ba8c1032ae947bde1d0fedaf37b6020663d49faf36b7c095c5b9aae11c8fc2be74148f008edbdbb180b44028ad8259f1215b483542bf3027f56dee5f962448333b30f88e6ae4790b60d24abb286edff9adee831a4b3351fc47259043f0d683d7a25be7e47aff3aedca140005d866e218c8efcca32093c19bbece50bd96656d0f94a712d3c60d1e5342db86482fc73f05faf513ca0b137378126597b95986c372b412c953e97011259aab0839fe453c756559497a28ba88dce009e1e7980436131029d38e56a34f608e6471970d9959068808c898608024db9eb394c4feae7a364ea9272ec4ea2315a9f0407a4b27d5e49a8ab1e3ddce5c84927d5aecd7e68e4437a820ea8743c6b5b4e2abbb47b0001e2f77ceac4603e8774e4ccbc1adde794428c11ae4a7492727b620334302e63f72b0c06c1cf83800366916ee8295176819272d557863a831ee0a576841191482959aad69095831fa1d64e3e0e6f6c6a751bcdadf0fbaa27a17458709f708c04587cb208984c9525da6786e0e5aabefe30ad1dbbef66e85ce9d6dbe456fd85e4135de5cf16d9455976d7ca8de7b1b530661c74c0fae90c0fff1a2b5fcdfab19fcff75fadcec445ed8af6ab5babf1463e08458918be8045083de6db988c37e4be582cfac5cdf741d1f0322fb2902665c7ff347813348109e5d442e91fcb010c28f042da481e807084fcb4759b40ccf2cae77bad00cdfbfba4acf36aa1f74c30a315e3d7f1ca522b6306e8903352aafa51dc523d582d418934398d5eb88120e3656bfb640a239db507b285302a86855ea850ddc9af72fc62dc79336c9bc29ee8314c65adb0574e9c701d73d7fa977edd1d52a1ff2da5b8b94e1a0fdd01ffcc6583758f0a1f51750e45f12b58c6d38b140e5676cf3474224520ef7c52ca5e634f85456651f3d6f43d016ed7cc5da54ea640a3bc50c2b9d3dea8f93c0340d66ccd06efc5ae002108c33cf3a470c4a50f6a6ca2f11b8ad15511688c282b94ba6f1c332e239d10946dc46f763f08d12cb9edc1e79c0e07f7151f548e6d7d20ec13b52d911bf980cac60694e192651403c9a69abea045190e847be093fc9ba43fec55b32f77f5796ddca25b441f259d5c51e06df6c6588c6414899481ba9e06bcebec58f82ff3021b09c6beae13a5d22bc94870f72ab813d0c0be01d91f3d075192e7a5de765599d72244757d09539529a8347e077a36678166e5ed9f73a5aad2e147d8154095c397e3e5e4ba1987ca64c1301a0c6c3e438097ede9b701a105ec38fcb54abb31b367c7740cd9ac459e561094a34f01acee555e60267157e6", "test"},
 	{"$odf$*1*1*1024*32*61802eba18eab842de1d053809ba40927fd40b26c69ddeca6a8a652ed9c16a28*16*c5c0815b931f313627100d592a9c972f*16*e9a48b7daff738deaabe442007fb2ec4*0*be3b65ea09642c2b4fdc23e553e1f5304bc5df222b624c6373d53e674f5df01fdb8873cdab7a5a685fa45ad5441a9d8869401b7fa076c488ad53fd9971e97244ecc9416484450d4fb2ee4ec08af4044d7def937e6545dea2ce36bd5c57b1f46b11b9cf90c8fb3accff149ce2d54820b181b9124db9aac131f6436d77cf716423f04d42438eed6f9ca14bd24b9b17d3478176addd5fa0254bf986fccd879e326485790e28b94ad5306868734b5ac1b1ddb3f876382dee6e9428e8230e84bf11b7e85ccbae8b4b424cd73160c380f874b37fbe3c7e88c13ef4bde74b56507d17095c2c32bb8bcded0637e4403107bb33252f72f5886a91b7720fe32a8659a09c217717e4c74a7c2e09fc40b46aa288309a36e86b9f1856e1bce176bc9690555431e05c7b67ff95df64f8f40053079bfc9dda021ab2714fecf74398b867ebef675958f29eaa15eb631845e358a0c5caff0b824a2a69a6eabee069d3d6236d77709fd60438c9e3ad9e42b26810375e1e587eff105ac295327ef8bf66f6462388b7727ec32d6abde2f8d6126b185124bb437753663f6ab1f321ddfdb36d9f1f528729492e0b1bb8d3b9eda3c86c1997c92b902f5160f77587c37e45b5c133b5d9709fea910a2e9b54c0960b0ebc870cdbb858aabe07ed27cba86d29a7e64c6e3863131859314a14e64c1168d4a2d5ca0697853fb1fe969ba968e31359881d51edce287eff415de8e60cec2068bb82157fbcf0cf9a95e92cb23f32e6156daced4bee6ba8c8b41174d01fcd7662911bcc10d5b4478f8209ce3b91075d10529780be4f17e841a1f1833d432c3dc854908643e58b03c8860dfbc710a29f79f75ea262cfcef9cd67fb67d73f55b300d42f4577445af2b9f224620204cfb88de2cbf57931ac0e0f8d98259a41d744cad6a58abc7761c266f4e93aca19356b07073c09ae9d1976f4f2e1a76c350cc7764c27ae257eb69ba4213dd0a7794fa83d220439a398efd988b6dbf0de4c08bc3e4830c9e482b9e0fd1679f14e6f132cf06bae1d763dde7ce6f525ff9a0ebad28aeca16496194f2a6263a20e7afeb43d83c8c936130d6508f2bf68b5ca50375948424193a7fb1106fdf63ff72896e1b2633907f01a693218e3303436542bcf2af24cc4a41621c36768ce9a84d32cc9f3c2b108bfc78c25b1c2ea94e6e0d65406f78bdb8bc33c94a9550e5cc3e995cfbd31da03afb929418acdc89b099415f9bdb7dab7a75d44a696e14b031d601ad8d907e14a28044706c0c2955df2cb34ffea82af367e487b6cc928dc87a33fc7555173e7faa5cfd1af6d3d6f496f23a9579db22dd4a2c16e950fdc90696d95a81183765a4fbddb42c488d40ac1de28483cf1cdddf821d3f859c57b13cb7f21a916bd0d89438a17634c68637f23e2544589e8ae5ee5bced91680c087cb3105cd74a09e88d3aae17d75e", "test"},
 	{"$odf$*0*0*1024*16*43d3dbd907785c4fa5282a2e73a5914db3372505*8*b3d676d4519e6b5a*16*34e3f7fdfa67fb0078360b0df4011270*0*7eff7a7abf1e6b0c4a9fafe6bdcfcfeaa5b1886592a52bd255f1b51096973d6fa50d792c695f3ef82c6232ae7f89c771e27db658258ad029e82415962b270d2c859b0a3efb231a0519ec1c807082638a9fad7537dec22e20d59f2bfadfa84dd941d59dd07678f9e60ffcc1eb27d8a2ae47b616618e5e80e27309cd027724355bf78b03d5432499c1d2a91d9c67155b7f49e61bd8405e75420d0cfb9e64b238623a9d8ceb47a3fdb5e7495439bb96e79882b850a0c8d3c0fbef5e6d425ae359172b9a82ec0566c3578a9f07b86a70d75b5ad339569c1c8f588143948d63bdf88d6ed2e751ac07f25ecc5778dc06247e5a9edca869ee3335e5dae351666a618d00ec05a35bc73d330bef12a46fb53b2ff96e1b2919af4e692730b9c9664aca761df10d6cf55396c4d4c268e6e96c96515c527c8fe2716ac7a9f016941aa46e6b03e8a5069c29ec8e8614b7da3e2e154a77510393051a0b693ae40da6afb5712a4ce4ac0ebacda1f45bdccc8a7b21e153d1471665cae3205fbfa00129bf00c06777bfecba2c43a1481a00111b4f0bd30c2378bd1e2e219700406411c6f897a3dfa51b31613cb241d56b68f3c241428783b353be26fa8b2df68ca215d1cf892c10fdef94faf2381a13f8cb2bce1a7dbb7522ef0b2a83e5a96ca66417fd2928784054e80d74515c1582ad356dd865837b5ea90674a30286a72a715f621c9226f19a321b413543fbbdb7cd9d1f99668b19951304e7267554d87992fbf9a96116601d0cee9e23cb22ba474c3f721434400cacf15bae05bbe9fa17f69967d03689c48a26fa57ff9676c96767762f2661b6c8f8afa4f96f989086aa02b6f8d039c6f4d158cc33a56cbf77640fb5087b2d5a5251692bb9255d0ae8148c7157c40031fdb0ea90d5fab546a7e1e1c15bd6a27f3716776c8a3fdbdd4f34c19fef22c36117c124876606b1395bf96266d647aaf5208eefd729a42a4efe42367475315a979fb74dcb9cd30917a811ed8283f2b111bb5a5d2b0f5589b3652f17d23e352e1494f231027bb93209e3c6a0388f8b2214577dca8aa9d705758aa334d6947491488770ed8066f692f8922ff0d852c2d0f965ab3d8a13c6de0ef3cff5a15ee7b64f9b1003817f0cb919ad021d5f3b0b5c1ad58db22e8fbd63abfb40e61065bad008cdffbbe3c563780a548f4515df5c935d9aa2a3033bc8a4011c9c173a0366c9b7b07f2a27de0e55373fb4b0c7726997be6f410a2ee5980393ea005516e89538be796131e450403420d72cdbd75475fd11c50efce5eb340d55d2dd0a67ca45ddb53aa582a2ec56b46452e26a505bf730998513837c96a121e4ad13af5030392ff7fb660955e03f65894733862f2367d529f0e8cdb73272b9ce01491747cb3e1a22f5c85ab6d40ddd35d15b9d46d73600e0971da90f93cb0e9be357c4f1227fbf5b123e5b", "jumper9"},

diff --git a/src/odf_fmt_plug.c b/src/odf_fmt_plug.c
@@ -55,8 +55,6 @@ john_register_one(&fmt_odf);
 #else
 #define ALGORITHM_NAME          "PBKDF2-SHA1 BF/AES 32/" ARCH_BITS_STR
 #endif
-#define BENCHMARK_COMMENT       ""
-#define BENCHMARK_LENGTH        0x107
 // keep plaintext length under 52 to avoid having to deal with the Libre/Star office SHA1 bug
 #define PLAINTEXT_LENGTH        51
 #define SALT_SIZE               sizeof(struct custom_salt)

diff --git a/src/opencl_electrum_modern_fmt_plug.c b/src/opencl_electrum_modern_fmt_plug.c
@@ -51,6 +51,8 @@ john_register_one(&fmt_opencl_electrum_modern);
 #define FORMAT_TAG              "$electrum$"
 #define TAG_LENGTH              (sizeof(FORMAT_TAG) - 1)
 #define ALGORITHM_NAME          "PBKDF2-SHA512 OpenCL"
+#define BENCHMARK_COMMENT       ""
+#define BENCHMARK_LENGTH        0x107
 #define BINARY_SIZE             16
 #define BINARY_ALIGN            sizeof(uint32_t)
 #define SALT_SIZE               sizeof(struct custom_salt)

diff --git a/src/opencl_fvde_fmt_plug.c b/src/opencl_fvde_fmt_plug.c
@@ -30,8 +30,6 @@ john_register_one(&fmt_opencl_fvde);
 
 #define FORMAT_LABEL            "FVDE-opencl"
 #define ALGORITHM_NAME          "PBKDF2-SHA256 AES OpenCL"
-#define BENCHMARK_COMMENT       ""
-#define BENCHMARK_LENGTH        0x107
 #define MIN_KEYS_PER_CRYPT      1
 #define MAX_KEYS_PER_CRYPT      1
 #define BINARY_SIZE             0

diff --git a/src/opencl_odf_fmt_plug.c b/src/opencl_odf_fmt_plug.c
@@ -35,8 +35,6 @@ john_register_one(&fmt_opencl_odf_aes);
 
 #define FORMAT_LABEL            "ODF-opencl"
 #define ALGORITHM_NAME          "PBKDF2-SHA1 BF/AES OpenCL"
-#define BENCHMARK_COMMENT       ""
-#define BENCHMARK_LENGTH        0x107
 #define MIN_KEYS_PER_CRYPT      1
 #define MAX_KEYS_PER_CRYPT      1
 #define BINARY_SIZE             (256/8)

diff --git a/src/opencl_pbkdf2_hmac_md4_fmt_plug.c b/src/opencl_pbkdf2_hmac_md4_fmt_plug.c
@@ -34,6 +34,8 @@ john_register_one(&fmt_opencl_pbkdf2_md4);
 #define FORMAT_LABEL		"PBKDF2-HMAC-MD4-opencl"
 #define FORMAT_NAME			""
 #define ALGORITHM_NAME		"PBKDF2-MD4 OpenCL"
+#define BENCHMARK_COMMENT       ""
+#define BENCHMARK_LENGTH        0x107
 #define MIN_KEYS_PER_CRYPT	1
 #define MAX_KEYS_PER_CRYPT	1
 

diff --git a/src/opencl_pbkdf2_hmac_md5_fmt_plug.c b/src/opencl_pbkdf2_hmac_md5_fmt_plug.c
@@ -34,6 +34,8 @@ john_register_one(&fmt_opencl_pbkdf2_md5);
 #define FORMAT_LABEL		"PBKDF2-HMAC-MD5-opencl"
 #define FORMAT_NAME			""
 #define ALGORITHM_NAME		"PBKDF2-MD5 OpenCL"
+#define BENCHMARK_COMMENT       ""
+#define BENCHMARK_LENGTH        0x107
 #define MIN_KEYS_PER_CRYPT	1
 #define MAX_KEYS_PER_CRYPT	1
 

diff --git a/src/opencl_pbkdf2_hmac_sha1_fmt_plug.c b/src/opencl_pbkdf2_hmac_sha1_fmt_plug.c
@@ -37,6 +37,8 @@ john_register_one(&fmt_opencl_pbkdf2_sha1);
 #define FORMAT_LABEL		"PBKDF2-HMAC-SHA1-opencl"
 #define FORMAT_NAME			""
 #define ALGORITHM_NAME		"PBKDF2-SHA1 OpenCL"
+#define BENCHMARK_COMMENT       ""
+#define BENCHMARK_LENGTH        0x107
 #define MIN_KEYS_PER_CRYPT	1
 #define MAX_KEYS_PER_CRYPT	1
 

diff --git a/src/opencl_pbkdf2_hmac_sha256_fmt_plug.c b/src/opencl_pbkdf2_hmac_sha256_fmt_plug.c
@@ -33,6 +33,8 @@ john_register_one(&fmt_opencl_pbkdf2_sha256);
 #define FORMAT_NAME		""
 #define ALGORITHM_NAME		"PBKDF2-SHA256 OpenCL"
 
+#define BENCHMARK_COMMENT       ""
+#define BENCHMARK_LENGTH        0x107
 #define SALT_SIZE		sizeof(salt_t)
 #define SALT_ALIGN		1
 

diff --git a/src/opencl_pbkdf2_hmac_sha512_fmt_plug.c b/src/opencl_pbkdf2_hmac_sha512_fmt_plug.c
@@ -32,6 +32,8 @@ john_register_one(&fmt_opencl_pbkdf2_sha512);
 #define FORMAT_LABEL             "PBKDF2-HMAC-SHA512-opencl"
 #define FORMAT_NAME              "GRUB2 / OS X 10.8+"
 #define ALGORITHM_NAME           "PBKDF2-SHA512 OpenCL"
+#define BENCHMARK_COMMENT        ""
+#define BENCHMARK_LENGTH         0x107
 #define BINARY_ALIGN             8
 #define PLAINTEXT_LENGTH         110
 #define SALT_SIZE                sizeof(salt_t)

diff --git a/src/opencl_ssh_fmt_plug.c b/src/opencl_ssh_fmt_plug.c
@@ -35,8 +35,6 @@ john_register_one(&fmt_opencl_ssh);
 #define FORMAT_LABEL            "ssh-opencl"
 #define FORMAT_NAME             "SSH private key"
 #define ALGORITHM_NAME          "RSA/DSA/EC 3DES/AES OpenCL"
-#define BENCHMARK_COMMENT       ""
-#define BENCHMARK_LENGTH        0x107
 #define BINARY_SIZE             0
 #define BINARY_ALIGN            sizeof(uint32_t)
 #define SALT_SIZE               sizeof(*cur_salt)

diff --git a/src/ssh_common.h b/src/ssh_common.h
@@ -6,6 +6,8 @@
 
 #include "formats.h"
 
+#define BENCHMARK_COMMENT   ""
+#define BENCHMARK_LENGTH    0x507
 #define N                   8192
 #define FORMAT_TAG          "$sshng$"
 #define FORMAT_TAG_LEN      (sizeof(FORMAT_TAG)-1)

diff --git a/src/ssh_fmt_plug.c b/src/ssh_fmt_plug.c
@@ -62,8 +62,6 @@ john_register_one(&fmt_ssh);
 #define FORMAT_TAG          "$sshng$"
 #define FORMAT_TAG_LEN      (sizeof(FORMAT_TAG)-1)
 #define ALGORITHM_NAME      "RSA/DSA/EC/OPENSSH 3DES/AES 32/" ARCH_BITS_STR
-#define BENCHMARK_COMMENT   ""
-#define BENCHMARK_LENGTH    0x107
 #define PLAINTEXT_LENGTH    32 // XXX
 #define BINARY_SIZE         0
 #define SALT_SIZE           sizeof(struct custom_salt)