mirror of
https://github.com/hashcat/hashcat.git
synced 2024-12-23 07:08:19 +00:00
Compress multiple newlines to one in host code, too
This commit is contained in:
parent
2ece9742e1
commit
dc170907ed
@ -161,7 +161,6 @@ typedef enum nvmlGom_enum
|
|||||||
* */
|
* */
|
||||||
#define nvmlClocksThrottleReasonNone 0x0000000000000000LL
|
#define nvmlClocksThrottleReasonNone 0x0000000000000000LL
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* End of declarations from nvml.h
|
* End of declarations from nvml.h
|
||||||
**/
|
**/
|
||||||
|
@ -40,7 +40,6 @@ typedef int (*XCLOSEDISPLAY) (void *);
|
|||||||
|
|
||||||
#define NV_CTRL_PCI_DEVICE 240 /* R--GI */
|
#define NV_CTRL_PCI_DEVICE 240 /* R--GI */
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* NV_CTRL_PCI_FUNCTION - Returns the PCI function number the specified device
|
* NV_CTRL_PCI_FUNCTION - Returns the PCI function number the specified device
|
||||||
* is using.
|
* is using.
|
||||||
|
@ -97,7 +97,6 @@ typedef int Bool;
|
|||||||
#define True 1
|
#define True 1
|
||||||
#define False 0
|
#define False 0
|
||||||
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#define MY_STD_CALL __stdcall
|
#define MY_STD_CALL __stdcall
|
||||||
#else
|
#else
|
||||||
@ -123,7 +122,6 @@ typedef int Bool;
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/* The following interfaces use first parameter as pointer to structure */
|
/* The following interfaces use first parameter as pointer to structure */
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
|
@ -30,7 +30,6 @@ SRes Lzma2Dec_AllocateProbs(CLzma2Dec *p, Byte prop, ISzAlloc *alloc);
|
|||||||
SRes Lzma2Dec_Allocate(CLzma2Dec *p, Byte prop, ISzAlloc *alloc);
|
SRes Lzma2Dec_Allocate(CLzma2Dec *p, Byte prop, ISzAlloc *alloc);
|
||||||
void Lzma2Dec_Init(CLzma2Dec *p);
|
void Lzma2Dec_Init(CLzma2Dec *p);
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
finishMode:
|
finishMode:
|
||||||
It has meaning only if the decoding reaches output limit (*destLen or dicLimit).
|
It has meaning only if the decoding reaches output limit (*destLen or dicLimit).
|
||||||
@ -52,7 +51,6 @@ SRes Lzma2Dec_DecodeToDic(CLzma2Dec *p, SizeT dicLimit,
|
|||||||
SRes Lzma2Dec_DecodeToBuf(CLzma2Dec *p, Byte *dest, SizeT *destLen,
|
SRes Lzma2Dec_DecodeToBuf(CLzma2Dec *p, Byte *dest, SizeT *destLen,
|
||||||
const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
|
const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
|
||||||
|
|
||||||
|
|
||||||
/* ---------- One Call Interface ---------- */
|
/* ---------- One Call Interface ---------- */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -18,7 +18,6 @@ EXTERN_C_BEGIN
|
|||||||
#define CLzmaProb UInt16
|
#define CLzmaProb UInt16
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/* ---------- LZMA Properties ---------- */
|
/* ---------- LZMA Properties ---------- */
|
||||||
|
|
||||||
#define LZMA_PROPS_SIZE 5
|
#define LZMA_PROPS_SIZE 5
|
||||||
@ -37,7 +36,6 @@ Returns:
|
|||||||
|
|
||||||
SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size);
|
SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size);
|
||||||
|
|
||||||
|
|
||||||
/* ---------- LZMA Decoder state ---------- */
|
/* ---------- LZMA Decoder state ---------- */
|
||||||
|
|
||||||
/* LZMA_REQUIRED_INPUT_MAX = number of required input bytes for worst case.
|
/* LZMA_REQUIRED_INPUT_MAX = number of required input bytes for worst case.
|
||||||
@ -106,7 +104,6 @@ typedef enum
|
|||||||
|
|
||||||
/* ELzmaStatus is used only as output value for function call */
|
/* ELzmaStatus is used only as output value for function call */
|
||||||
|
|
||||||
|
|
||||||
/* ---------- Interfaces ---------- */
|
/* ---------- Interfaces ---------- */
|
||||||
|
|
||||||
/* There are 3 levels of interfaces:
|
/* There are 3 levels of interfaces:
|
||||||
@ -116,7 +113,6 @@ typedef enum
|
|||||||
You can select any of these interfaces, but don't mix functions from different
|
You can select any of these interfaces, but don't mix functions from different
|
||||||
groups for same object. */
|
groups for same object. */
|
||||||
|
|
||||||
|
|
||||||
/* There are two variants to allocate state for Dictionary Interface:
|
/* There are two variants to allocate state for Dictionary Interface:
|
||||||
1) LzmaDec_Allocate / LzmaDec_Free
|
1) LzmaDec_Allocate / LzmaDec_Free
|
||||||
2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs
|
2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs
|
||||||
@ -179,7 +175,6 @@ Returns:
|
|||||||
SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit,
|
SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit,
|
||||||
const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
|
const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
|
||||||
|
|
||||||
|
|
||||||
/* ---------- Buffer Interface ---------- */
|
/* ---------- Buffer Interface ---------- */
|
||||||
|
|
||||||
/* It's zlib-like interface.
|
/* It's zlib-like interface.
|
||||||
@ -196,7 +191,6 @@ finishMode:
|
|||||||
SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen,
|
SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen,
|
||||||
const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
|
const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
|
||||||
|
|
||||||
|
|
||||||
/* ---------- One Call Interface ---------- */
|
/* ---------- One Call Interface ---------- */
|
||||||
|
|
||||||
/* LzmaDecode
|
/* LzmaDecode
|
||||||
|
@ -119,7 +119,6 @@ static _SORT_R_INLINE void sort_r_simple(void *base, size_t nel, size_t w,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#if defined NESTED_QSORT
|
#if defined NESTED_QSORT
|
||||||
|
|
||||||
static _SORT_R_INLINE void sort_r(void *base, size_t nel, size_t width,
|
static _SORT_R_INLINE void sort_r(void *base, size_t nel, size_t width,
|
||||||
|
@ -82,7 +82,6 @@ int fgetl (FILE *fp, char *line_buf)
|
|||||||
return (line_len);
|
return (line_len);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
size_t superchop_with_length (char *buf, const size_t len)
|
size_t superchop_with_length (char *buf, const size_t len)
|
||||||
{
|
{
|
||||||
size_t new_len = len;
|
size_t new_len = len;
|
||||||
|
@ -615,7 +615,6 @@ static int outer_loop (hashcat_ctx_t *hashcat_ctx)
|
|||||||
|
|
||||||
EVENT (EVENT_OUTERLOOP_MAINSCREEN);
|
EVENT (EVENT_OUTERLOOP_MAINSCREEN);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Tell user about cracked hashes by potfile
|
* Tell user about cracked hashes by potfile
|
||||||
*/
|
*/
|
||||||
|
@ -11358,7 +11358,6 @@ int seven_zip_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_
|
|||||||
data_buf_len = input_len - 1 - 2 - 1 - data_type_len - 1 - NumCyclesPower_len - 1 - salt_len_len - 1 - salt_buf_len - 1 - iv_len_len - 1 - iv_buf_len - 1 - crc_buf_len - 1 - data_len_len - 1 - unpack_size_len - 1;
|
data_buf_len = input_len - 1 - 2 - 1 - data_type_len - 1 - NumCyclesPower_len - 1 - salt_len_len - 1 - salt_buf_len - 1 - iv_len_len - 1 - iv_buf_len - 1 - crc_buf_len - 1 - data_len_len - 1 - unpack_size_len - 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const u32 iter = atoll ((const char *) NumCyclesPower_pos);
|
const u32 iter = atoll ((const char *) NumCyclesPower_pos);
|
||||||
const u32 crc = atoll ((const char *) crc_buf_pos);
|
const u32 crc = atoll ((const char *) crc_buf_pos);
|
||||||
const u32 data_type = atoll ((const char *) data_type_pos);
|
const u32 data_type = atoll ((const char *) data_type_pos);
|
||||||
@ -11382,7 +11381,6 @@ int seven_zip_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_
|
|||||||
crc_len = atoll ((const char *) crc_len_pos);
|
crc_len = atoll ((const char *) crc_len_pos);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* verify some data
|
* verify some data
|
||||||
*/
|
*/
|
||||||
@ -22767,7 +22765,6 @@ void hashconfig_benchmark_defaults (hashcat_ctx_t *hashcat_ctx, salt_t *salt, vo
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// set default iterations
|
// set default iterations
|
||||||
|
|
||||||
switch (hashconfig->hash_mode)
|
switch (hashconfig->hash_mode)
|
||||||
|
@ -91,7 +91,6 @@ void SetLargePageSize()
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void *BigAlloc(size_t size)
|
void *BigAlloc(size_t size)
|
||||||
{
|
{
|
||||||
if (size == 0)
|
if (size == 0)
|
||||||
@ -126,7 +125,6 @@ void BigFree(void *address)
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
static void *SzAlloc(void *p, size_t size) { UNUSED_VAR(p); return MyAlloc(size); }
|
static void *SzAlloc(void *p, size_t size) { UNUSED_VAR(p); return MyAlloc(size); }
|
||||||
static void SzFree(void *p, void *address) { UNUSED_VAR(p); MyFree(address); }
|
static void SzFree(void *p, void *address) { UNUSED_VAR(p); MyFree(address); }
|
||||||
ISzAlloc g_Alloc = { SzAlloc, SzFree };
|
ISzAlloc g_Alloc = { SzAlloc, SzFree };
|
||||||
|
@ -65,7 +65,6 @@
|
|||||||
#define TREE_DECODE_CHECK(probs, limit, i) \
|
#define TREE_DECODE_CHECK(probs, limit, i) \
|
||||||
{ i = 1; do { GET_BIT_CHECK(probs + i, i) } while (i < limit); i -= limit; }
|
{ i = 1; do { GET_BIT_CHECK(probs + i, i) } while (i < limit); i -= limit; }
|
||||||
|
|
||||||
|
|
||||||
#define kNumPosBitsMax 4
|
#define kNumPosBitsMax 4
|
||||||
#define kNumPosStatesMax (1 << kNumPosBitsMax)
|
#define kNumPosStatesMax (1 << kNumPosBitsMax)
|
||||||
|
|
||||||
@ -83,7 +82,6 @@
|
|||||||
#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits))
|
#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits))
|
||||||
#define kNumLenProbs (LenHigh + kLenNumHighSymbols)
|
#define kNumLenProbs (LenHigh + kLenNumHighSymbols)
|
||||||
|
|
||||||
|
|
||||||
#define kNumStates 12
|
#define kNumStates 12
|
||||||
#define kNumLitStates 7
|
#define kNumLitStates 7
|
||||||
|
|
||||||
@ -765,7 +763,6 @@ static ELzmaDummy LzmaDec_TryDummy(const CLzmaDec *p, const Byte *buf, SizeT inS
|
|||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
|
void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
|
||||||
{
|
{
|
||||||
p->needFlush = 1;
|
p->needFlush = 1;
|
||||||
|
@ -693,7 +693,6 @@ int user_options_sanity (hashcat_ctx_t *hashcat_ctx)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (user_options->debug_mode > 0)
|
if (user_options->debug_mode > 0)
|
||||||
{
|
{
|
||||||
if (user_options->attack_mode != ATTACK_MODE_STRAIGHT)
|
if (user_options->attack_mode != ATTACK_MODE_STRAIGHT)
|
||||||
|
Loading…
Reference in New Issue
Block a user