arno
/
hashcat
mirror of https://github.com/hashcat/hashcat.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Update loopback.c function parameters

Browse Source
pull/533/head
jsteube 8 years ago
parent 3f05b7c0a7
commit 0885c0ec6b
4 changed files with 74 additions and 61 deletions
Show Stats Download Patch File Download Diff File

15
include/loopback.h
Unescape View File

@ -11,14 +11,13 @@
#include <errno.h>
#include <time.h>
#define LOOPBACK_FILE "hashcat.loopback"
static const char LOOPBACK_FILE[] = "hashcat.loopback";
void loopback_init (loopback_ctx_t *loopback_ctx, const user_options_t *user_options);
void loopback_destroy (loopback_ctx_t *loopback_ctx);
int loopback_write_open (loopback_ctx_t *loopback_ctx, const induct_ctx_t *induct_ctx);
void loopback_write_close (loopback_ctx_t *loopback_ctx);
void loopback_format_plain (loopback_ctx_t *loopback_ctx, const u8 *plain_ptr, const unsigned int plain_len);
void loopback_write_append (loopback_ctx_t *loopback_ctx, const u8 *plain_ptr, const unsigned int plain_len);
void loopback_write_unlink (loopback_ctx_t *loopback_ctx);
void loopback_init (hashcat_ctx_t *hashcat_ctx);
void loopback_destroy (hashcat_ctx_t *hashcat_ctx);
int loopback_write_open (hashcat_ctx_t *hashcat_ctx);
void loopback_write_close (hashcat_ctx_t *hashcat_ctx);
void loopback_write_append (hashcat_ctx_t *hashcat_ctx, const u8 *plain_ptr, const unsigned int plain_len);
void loopback_write_unlink (hashcat_ctx_t *hashcat_ctx);
#endif // _LOOPBACK_H

10
src/hashcat.c
Unescape View File

@ -120,7 +120,6 @@ static int inner2_loop (hashcat_ctx_t *hashcat_ctx)
hashes_t *hashes = hashcat_ctx->hashes;
induct_ctx_t *induct_ctx = hashcat_ctx->induct_ctx;
logfile_ctx_t *logfile_ctx = hashcat_ctx->logfile_ctx;
loopback_ctx_t *loopback_ctx = hashcat_ctx->loopback_ctx;
mask_ctx_t *mask_ctx = hashcat_ctx->mask_ctx;
opencl_ctx_t *opencl_ctx = hashcat_ctx->opencl_ctx;
restore_ctx_t *restore_ctx = hashcat_ctx->restore_ctx;
@ -399,7 +398,7 @@ static int inner2_loop (hashcat_ctx_t *hashcat_ctx)
if (user_options->loopback == true)
{
loopback_write_open (loopback_ctx, induct_ctx);
loopback_write_open (hashcat_ctx);
}
/**
@ -500,7 +499,7 @@ static int inner2_loop (hashcat_ctx_t *hashcat_ctx)
if (user_options->loopback == true)
{
loopback_write_close (loopback_ctx);
loopback_write_close (hashcat_ctx);
}
// print final status
@ -1237,7 +1236,6 @@ int hashcat (hashcat_ctx_t *hashcat_ctx, char *install_folder, char *shared_fold
*/
logfile_ctx_t *logfile_ctx = hashcat_ctx->logfile_ctx;
loopback_ctx_t *loopback_ctx = hashcat_ctx->loopback_ctx;
status_ctx_t *status_ctx = hashcat_ctx->status_ctx;
user_options_extra_t *user_options_extra = hashcat_ctx->user_options_extra;
user_options_t *user_options = hashcat_ctx->user_options;
@ -1348,7 +1346,7 @@ int hashcat (hashcat_ctx_t *hashcat_ctx, char *install_folder, char *shared_fold
* loopback init
*/
loopback_init (loopback_ctx, user_options);
loopback_init (hashcat_ctx);
/**
* debugfile init
@ -1489,7 +1487,7 @@ int hashcat (hashcat_ctx_t *hashcat_ctx, char *install_folder, char *shared_fold
tuning_db_destroy (hashcat_ctx);
loopback_destroy (loopback_ctx);
loopback_destroy (hashcat_ctx);
dictstat_destroy (hashcat_ctx);

2
src/hashes.c
Unescape View File

@ -289,7 +289,7 @@ void check_hash (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, pl
if (loopback_ctx->fp != NULL)
{
loopback_write_append (loopback_ctx, plain_ptr, plain_len);
loopback_write_append (hashcat_ctx, plain_ptr, plain_len);
}
// if enabled, update also the (rule) debug file

108
src/loopback.c
Unescape View File

@ -10,8 +10,53 @@
#include "shared.h"
#include "loopback.h"
void loopback_init (loopback_ctx_t *loopback_ctx, const user_options_t *user_options)
static void loopback_format_plain (hashcat_ctx_t *hashcat_ctx, const u8 *plain_ptr, const unsigned int plain_len)
{
loopback_ctx_t *loopback_ctx = hashcat_ctx->loopback_ctx;
if (loopback_ctx->enabled == false) return;
int needs_hexify = 0;
for (u32 i = 0; i < plain_len; i++)
{
if (plain_ptr[i] < 0x20)
{
needs_hexify = 1;
break;
}
if (plain_ptr[i] > 0x7f)
{
needs_hexify = 1;
break;
}
}
if (needs_hexify == 1)
{
fprintf (loopback_ctx->fp, "$HEX[");
for (u32 i = 0; i < plain_len; i++)
{
fprintf (loopback_ctx->fp, "%02x", plain_ptr[i]);
}
fprintf (loopback_ctx->fp, "]");
}
else
{
fwrite (plain_ptr, plain_len, 1, loopback_ctx->fp);
}
}
void loopback_init (hashcat_ctx_t *hashcat_ctx)
{
loopback_ctx_t *loopback_ctx = hashcat_ctx->loopback_ctx;
user_options_t *user_options = hashcat_ctx->user_options;
loopback_ctx->enabled = false;
if (user_options->benchmark == true) return;
@ -30,15 +75,20 @@ void loopback_init (loopback_ctx_t *loopback_ctx, const user_options_t *user_opt
loopback_ctx->filename = (char *) mymalloc (HCBUFSIZ_TINY);
}
void loopback_destroy (loopback_ctx_t *loopback_ctx)
void loopback_destroy (hashcat_ctx_t *hashcat_ctx)
{
loopback_ctx_t *loopback_ctx = hashcat_ctx->loopback_ctx;
if (loopback_ctx->enabled == false) return;
memset (loopback_ctx, 0, sizeof (loopback_ctx_t));
}
int loopback_write_open (loopback_ctx_t *loopback_ctx, const induct_ctx_t *induct_ctx)
int loopback_write_open (hashcat_ctx_t *hashcat_ctx)
{
induct_ctx_t *induct_ctx = hashcat_ctx->induct_ctx;
loopback_ctx_t *loopback_ctx = hashcat_ctx->loopback_ctx;
if (loopback_ctx->enabled == false) return 0;
if (induct_ctx->enabled == false) return 0;
@ -63,8 +113,10 @@ int loopback_write_open (loopback_ctx_t *loopback_ctx, const induct_ctx_t *induc
return 0;
}
void loopback_write_unlink (loopback_ctx_t *loopback_ctx)
void loopback_write_unlink (hashcat_ctx_t *hashcat_ctx)
{
loopback_ctx_t *loopback_ctx = hashcat_ctx->loopback_ctx;
if (loopback_ctx->enabled == false) return;
if (loopback_ctx->filename == NULL) return;
@ -72,8 +124,10 @@ void loopback_write_unlink (loopback_ctx_t *loopback_ctx)
unlink (loopback_ctx->filename);
}
void loopback_write_close (loopback_ctx_t *loopback_ctx)
void loopback_write_close (hashcat_ctx_t *hashcat_ctx)
{
loopback_ctx_t *loopback_ctx = hashcat_ctx->loopback_ctx;
if (loopback_ctx->enabled == false) return;
if (loopback_ctx->fp == NULL) return;
@ -81,53 +135,15 @@ void loopback_write_close (loopback_ctx_t *loopback_ctx)
fclose (loopback_ctx->fp);
}
void loopback_format_plain (loopback_ctx_t *loopback_ctx, const u8 *plain_ptr, const unsigned int plain_len)
void loopback_write_append (hashcat_ctx_t *hashcat_ctx, const u8 *plain_ptr, const unsigned int plain_len)
{
if (loopback_ctx->enabled == false) return;
int needs_hexify = 0;
loopback_ctx_t *loopback_ctx = hashcat_ctx->loopback_ctx;
for (u32 i = 0; i < plain_len; i++)
{
if (plain_ptr[i] < 0x20)
{
needs_hexify = 1;
break;
}
if (plain_ptr[i] > 0x7f)
{
needs_hexify = 1;
break;
}
}
if (needs_hexify == 1)
{
fprintf (loopback_ctx->fp, "$HEX[");
for (u32 i = 0; i < plain_len; i++)
{
fprintf (loopback_ctx->fp, "%02x", plain_ptr[i]);
}
fprintf (loopback_ctx->fp, "]");
}
else
{
fwrite (plain_ptr, plain_len, 1, loopback_ctx->fp);
}
}
void loopback_write_append (loopback_ctx_t *loopback_ctx, const u8 *plain_ptr, const unsigned int plain_len)
{
if (loopback_ctx->enabled == false) return;
FILE *fp = loopback_ctx->fp;
loopback_format_plain (loopback_ctx, plain_ptr, plain_len);
loopback_format_plain (hashcat_ctx, plain_ptr, plain_len);
fputc ('\n', fp);

Write Preview
Loading…
Cancel
Save