>From c393ba4120f36b520cd665ad77d2c8dbc88d1e56 Mon Sep 17 00:00:00 2001 From: Frank Dittrich Date: Mon, 25 Jun 2012 11:57:00 +0200 Subject: [PATCH] fix hccap2john usage output --- src/hccap2john.c | 2 +- src/john.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/hccap2john.c b/src/hccap2john.c index 70c86c2..5643584 100644 --- a/src/hccap2john.c +++ b/src/hccap2john.c @@ -77,7 +77,7 @@ int hccap2john(int argc, char **argv) int i; assert(sizeof(hccap_t) == HCCAP_SIZE); if (argc < 2) { - puts("Usage: hccap2john [RACF binary files]"); + fprintf(stderr, "Usage: hccap2john [RACF binary files]\n"); return -1; } for (i = 1; i < argc; i++) diff --git a/src/john.c b/src/john.c index bdf447b..35d598e 100644 --- a/src/john.c +++ b/src/john.c @@ -136,6 +136,7 @@ extern struct fmt_main fmt_SKEY; extern struct fmt_main mozilla_fmt; extern int mozilla2john(int argc, char **argv); #endif +extern int hccap2john(int argc, char **argv); #ifdef CL_VERSION_1_0 extern struct fmt_main fmt_opencl_NSLDAPS; @@ -1035,6 +1036,10 @@ int main(int argc, char **argv) CPU_detect_or_fallback(argv, 0); return zip2john(argc, argv); } + if (!strcmp(name, "hccap2john")) { + CPU_detect_or_fallback(argv, 0); + return hccap2john(argc, argv); + } #ifdef HAVE_MPI mpi_setup(argc, argv); -- 1.7.7.6