@ -920,11 +920,9 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
memset ( hashes_buf [ hashes_cnt ] . hook_salt , 0 , hashconfig - > hook_salt_size ) ;
}
const int decode_sz = sizeof ( hccapx_t ) ;
hash_t * hash = & hashes_buf [ hashes_cnt ] ;
parser_status = module_ctx - > module_hash_decode ( hashconfig , hash - > digest , hash - > salt , hash - > esalt , in , & decode_sz ) ;
parser_status = module_ctx - > module_hash_decode ( hashconfig , hash - > digest , hash - > salt , hash - > esalt , in , sizeof ( hccapx_t ) ) ;
if ( parser_status ! = PARSER_OK )
{
@ -944,13 +942,11 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
{
if ( hash_len = = 32 )
{
const int decode_sz = 16 ;
hash_t * hash ;
hash = & hashes_buf [ hashes_cnt ] ;
parser_status = module_ctx - > module_hash_decode ( hashconfig , hash - > digest , hash - > salt , hash - > esalt , hash_buf + 0 , & decode_sz ) ;
parser_status = module_ctx - > module_hash_decode ( hashconfig , hash - > digest , hash - > salt , hash - > esalt , hash_buf + 0 , 16 ) ;
if ( parser_status = = PARSER_OK )
{
@ -966,7 +962,7 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
hash = & hashes_buf [ hashes_cnt ] ;
parser_status = module_ctx - > module_hash_decode ( hashconfig , hash - > digest , hash - > salt , hash - > esalt , hash_buf + 16 , & decode_sz ) ;
parser_status = module_ctx - > module_hash_decode ( hashconfig , hash - > digest , hash - > salt , hash - > esalt , hash_buf + 16 , 16 ) ;
if ( parser_status = = PARSER_OK )
{
@ -984,7 +980,7 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
{
hash_t * hash = & hashes_buf [ hashes_cnt ] ;
parser_status = module_ctx - > module_hash_decode ( hashconfig , hash - > digest , hash - > salt , hash - > esalt , hash_buf , & hash_len ) ;
parser_status = module_ctx - > module_hash_decode ( hashconfig , hash - > digest , hash - > salt , hash - > esalt , hash_buf , hash_len ) ;
if ( parser_status = = PARSER_OK )
{
@ -1024,7 +1020,7 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
{
hash_t * hash = & hashes_buf [ hashes_cnt ] ;
parser_status = module_ctx - > module_hash_decode ( hashconfig , hash - > digest , hash - > salt , hash - > esalt , hash_buf , & hash_len ) ;
parser_status = module_ctx - > module_hash_decode ( hashconfig , hash - > digest , hash - > salt , hash - > esalt , hash_buf , hash_len ) ;
if ( parser_status = = PARSER_OK )
{
@ -1154,13 +1150,11 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
{
if ( hash_len = = 32 )
{
const int decode_sz = 16 ;
hash_t * hash ;
hash = & hashes_buf [ hashes_cnt ] ;
int parser_status = module_ctx - > module_hash_decode ( hashconfig , hash - > digest , hash - > salt , hash - > esalt , hash_buf + 0 , & decode_sz ) ;
int parser_status = module_ctx - > module_hash_decode ( hashconfig , hash - > digest , hash - > salt , hash - > esalt , hash_buf + 0 , 16 ) ;
if ( parser_status < PARSER_GLOBAL_ZERO )
{
@ -1184,7 +1178,7 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
hash = & hashes_buf [ hashes_cnt ] ;
parser_status = module_ctx - > module_hash_decode ( hashconfig , hash - > digest , hash - > salt , hash - > esalt , hash_buf + 16 , & decode_sz ) ;
parser_status = module_ctx - > module_hash_decode ( hashconfig , hash - > digest , hash - > salt , hash - > esalt , hash_buf + 16 , 16 ) ;
if ( parser_status < PARSER_GLOBAL_ZERO )
{
@ -1210,7 +1204,7 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
{
hash_t * hash = & hashes_buf [ hashes_cnt ] ;
int parser_status = module_ctx - > module_hash_decode ( hashconfig , hash - > digest , hash - > salt , hash - > esalt , hash_buf , & hash_len ) ;
int parser_status = module_ctx - > module_hash_decode ( hashconfig , hash - > digest , hash - > salt , hash - > esalt , hash_buf , hash_len ) ;
if ( parser_status < PARSER_GLOBAL_ZERO )
{
@ -1237,7 +1231,7 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
{
hash_t * hash = & hashes_buf [ hashes_cnt ] ;
int parser_status = module_ctx - > module_hash_decode ( hashconfig , hash - > digest , hash - > salt , hash - > esalt , hash_buf , & hash_len ) ;
int parser_status = module_ctx - > module_hash_decode ( hashconfig , hash - > digest , hash - > salt , hash - > esalt , hash_buf , hash_len ) ;
if ( parser_status < PARSER_GLOBAL_ZERO )
{
@ -1766,9 +1760,7 @@ int hashes_init_selftest (hashcat_ctx_t *hashcat_ctx)
tmpdata [ i ] = c ;
}
const int decode_sz = sizeof ( hccapx_t ) ;
parser_status = module_ctx - > module_hash_decode ( hashconfig , hash . digest , hash . salt , hash . esalt , tmpdata , & decode_sz ) ;
parser_status = module_ctx - > module_hash_decode ( hashconfig , hash . digest , hash . salt , hash . esalt , tmpdata , sizeof ( hccapx_t ) ) ;
hcfree ( tmpdata ) ;
@ -1798,9 +1790,7 @@ int hashes_init_selftest (hashcat_ctx_t *hashcat_ctx)
fclose ( fp ) ;
const int decode_sz = strlen ( tmpfile_bin ) ;
parser_status = module_ctx - > module_hash_decode ( hashconfig , hash . digest , hash . salt , hash . esalt , tmpfile_bin , & decode_sz ) ;
parser_status = module_ctx - > module_hash_decode ( hashconfig , hash . digest , hash . salt , hash . esalt , tmpfile_bin , strlen ( tmpfile_bin ) ) ;
unlink ( tmpfile_bin ) ;
@ -1824,9 +1814,7 @@ int hashes_init_selftest (hashcat_ctx_t *hashcat_ctx)
}
}
const int decode_sz = strlen ( hashconfig - > st_hash ) ;
parser_status = module_ctx - > module_hash_decode ( hashconfig_st , hash . digest , hash . salt , hash . esalt , hashconfig - > st_hash , & decode_sz ) ;
parser_status = module_ctx - > module_hash_decode ( hashconfig_st , hash . digest , hash . salt , hash . esalt , hashconfig - > st_hash , strlen ( hashconfig - > st_hash ) ) ;
hcfree ( hashconfig_st ) ;
}