diff --git a/src/potfile.c b/src/potfile.c index cc589bb66..a912e1f50 100644 --- a/src/potfile.c +++ b/src/potfile.c @@ -699,23 +699,6 @@ int potfile_handle_show (hashcat_ctx_t *hashcat_ctx) out_buf[out_len] = 0; - // dynamic-x - - unsigned char *dynamicx_buf = NULL; - - u32 dynamicx_len = 0; - - dynamicx_t *dynamicx = hash1->hash_info->dynamicx; - - if (dynamicx) - { - dynamicx_buf = (unsigned char *) (dynamicx->dynamicx_buf); - - dynamicx_len = dynamicx->dynamicx_len; - - dynamicx_buf[dynamicx_len] = 0; - } - // user unsigned char *username = NULL; @@ -732,6 +715,22 @@ int potfile_handle_show (hashcat_ctx_t *hashcat_ctx) username[user_len] = 0; } + // dynamic-x + unsigned char *dynamicx_buf = NULL; + + u32 dynamicx_len = 0; + + dynamicx_t *dynamicx = hash1->hash_info->dynamicx; + + if (dynamicx) + { + dynamicx_buf = (unsigned char *) (dynamicx->dynamicx_buf); + + dynamicx_len = dynamicx->dynamicx_len; + + dynamicx_buf[dynamicx_len] = 0; + } + u8 *tmp_buf = potfile_ctx->tmp_buf; tmp_buf[0] = 0; @@ -828,6 +827,25 @@ int potfile_handle_show (hashcat_ctx_t *hashcat_ctx) } } + // dynamicx + unsigned char *dynamicx_buf = NULL; + + u32 dynamicx_len = 0; + + if (hash->hash_info != NULL) + { + dynamicx_t *dynamicx = hash->hash_info->dynamicx; + + if (dynamicx) + { + dynamicx_buf = (unsigned char *) (dynamicx->dynamicx_buf); + + dynamicx_len = dynamicx->dynamicx_len; + + dynamicx_buf[dynamicx_len] = 0; + } + } + u8 *tmp_buf = potfile_ctx->tmp_buf; tmp_buf[0] = 0; @@ -974,6 +992,22 @@ int potfile_handle_left (hashcat_ctx_t *hashcat_ctx) username[user_len] = 0; } + // dynamic-x + unsigned char *dynamicx_buf = NULL; + + u32 dynamicx_len = 0; + + dynamicx_t *dynamicx = hash1->hash_info->dynamicx; + + if (dynamicx) + { + dynamicx_buf = (unsigned char *) (dynamicx->dynamicx_buf); + + dynamicx_len = dynamicx->dynamicx_len; + + dynamicx_buf[dynamicx_len] = 0; + } + u8 *tmp_buf = potfile_ctx->tmp_buf; tmp_buf[0] = 0; @@ -1059,6 +1093,25 @@ int potfile_handle_left (hashcat_ctx_t *hashcat_ctx) } } + // dynamicx + unsigned char *dynamicx_buf = NULL; + + u32 dynamicx_len = 0; + + if (hash->hash_info != NULL) + { + dynamicx_t *dynamicx = hash->hash_info->dynamicx; + + if (dynamicx) + { + dynamicx_buf = (unsigned char *) (dynamicx->dynamicx_buf); + + dynamicx_len = dynamicx->dynamicx_len; + + dynamicx_buf[dynamicx_len] = 0; + } + } + const bool print_eol = (hashconfig->opts_type & OPTS_TYPE_BINARY_HASHFILE) == 0; u8 *tmp_buf = potfile_ctx->tmp_buf;