diff --git a/src/cq_fmt_plug.c b/src/cq_fmt_plug.c index 3e83442..89a89dd 100644 --- a/src/cq_fmt_plug.c +++ b/src/cq_fmt_plug.c @@ -34,7 +34,7 @@ john_register_one(&fmt_cq); #define TAG_LENGTH (sizeof(FORMAT_TAG) - 1) #define ALGORITHM_NAME "CQWeb" #define BENCHMARK_COMMENT "" -#define BENCHMARK_LENGTH -1 +#define BENCHMARK_LENGTH 0 #define PLAINTEXT_LENGTH 32 #define SALT_SIZE 64 // XXX double check this #define SALT_ALIGN MEM_ALIGN_NONE @@ -43,6 +43,14 @@ john_register_one(&fmt_cq); #define MIN_KEYS_PER_CRYPT 1 #define MAX_KEYS_PER_CRYPT 512 +static struct fmt_tests cq_tests[] = { + {"$cq$admin$a9db7ca6", ""}, + {"$cq$admin$10200218", "admin"}, + {"$cq$admin$4cfb73f2", "password"}, + {"$cq$clearquest$a279b184", "clearquest"}, + {NULL} +}; + static char (*saved_key)[PLAINTEXT_LENGTH + 1]; static ARCH_WORD_32 (*crypt_key)[BINARY_SIZE / sizeof(ARCH_WORD_32)]; static char saved_salt[SALT_SIZE]; @@ -344,13 +352,6 @@ static void done(void) MEM_FREE(crypt_key); MEM_FREE(saved_key); } -static struct fmt_tests cq_tests[] = { - {"$cq$admin$a9db7ca6", ""}, - {"$cq$admin$10200218", "admin"}, - {"$cq$admin$4cfb73f2", "password"}, - {"$cq$clearquest$a279b184", "clearquest"}, - {NULL} -}; static int valid(char *ciphertext, struct fmt_main *self) {