>From 8c80412e67204c1c51eb637676d46fe957797bcf Mon Sep 17 00:00:00 2001 From: Frank Dittrich Date: Wed, 27 Jun 2012 09:54:24 +0200 Subject: [PATCH] --list=format-details: add benchmark comment and length and binary and salt size --- doc/OPTIONS | 4 ++++ src/john.c | 12 ++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/doc/OPTIONS b/doc/OPTIONS index 55abe41..853b8d2 100644 --- a/doc/OPTIONS +++ b/doc/OPTIONS @@ -312,6 +312,10 @@ The different variants of list externals may be worth mentioning: -number of hard coded test cases for --test -algorithm name -format name + -benchmark comment + -benchmark length + -binary size + -salt size (the individual columns are separated by [tab]) --list=format-all-details list all the suported formats and their attributes in the same sequence as with --list=format-details, diff --git a/src/john.c b/src/john.c index b2e0b3f..2ce3971 100644 --- a/src/john.c +++ b/src/john.c @@ -787,7 +787,7 @@ static void john_init(char *name, int argc, char **argv) while (format->params.tests[ntests++].ciphertext); ntests--; } - printf("%s\t%d\t%d\t%d\t%08x\t%d\t%s\t%s\n", + printf("%s\t%d\t%d\t%d\t%08x\t%d\t%s\t%s\t%s\t%d\t%d\t%d\n", format->params.label, format->params.plaintext_length, format->params.min_keys_per_crypt, @@ -795,7 +795,11 @@ static void john_init(char *name, int argc, char **argv) format->params.flags, ntests, format->params.algorithm_name, - format->params.format_name); + format->params.format_name, + format->params.benchmark_comment, + format->params.benchmark_length, + format->params.binary_size, + format->params.salt_size); } while ((format = format->next)); exit(0); } @@ -832,6 +836,10 @@ static void john_init(char *name, int argc, char **argv) printf("Number of test cases for --test \t%d\n", ntests); printf("Algorithm name \t%s\n", format->params.algorithm_name); printf("Format name \t%s\n", format->params.format_name); + printf("Benchmark comment \t%s\n", format->params.benchmark_comment); + printf("Benchmark length \t%d\n", format->params.benchmark_length); + printf("Binary size \t%d\n", format->params.binary_size); + printf("Salt size \t%d\n", format->params.salt_size); printf("\n"); } while ((format = format->next)); exit(0); -- 1.7.7.6