arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-07-04 05:42:35 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3193 from philsmd/philsmd-cleanup-code-style

Browse Source 
cleanup and code style fixes
This commit is contained in:
Jens Steube 2022-02-20 12:33:54 +01:00 committed by GitHub
commit e5d441320d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 249 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/modules/module_28600.c
View File

@ -20,9 +20,10 @@ static const u32 DGST_SIZE = DGST_SIZE_4_8;
static const u32 HASH_CATEGORY = HASH_CATEGORY_DATABASE_SERVER;
static const char *HASH_NAME = "PostgreSQL SCRAM-SHA-256";
static const u64 KERN_TYPE = 28600;
static const u32 OPTI_TYPE =
OPTI_TYPE_ZERO_BYTE | OPTI_TYPE_SLOW_HASH_SIMD_LOOP;
static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE | OPTS_TYPE_ST_BASE64;
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
| OPTI_TYPE_SLOW_HASH_SIMD_LOOP;
static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE
| OPTS_TYPE_ST_BASE64;
static const u32 SALT_TYPE = SALT_TYPE_EMBEDDED;
static const char *ST_PASS = "hashcat";
static const char *ST_HASH = "SCRAM-SHA-256$4096:IKfxzJ8Nq4PkLJCfgKcPmA==$"
@ -45,7 +46,8 @@ const char *module_st_hash (MAYBE_UNUSED const hashconfig_t *hashconfig,
const char *module_st_pass (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return ST_PASS; }
typedef struct postgres_sha256_tmp {
typedef struct postgres_sha256_tmp
{
u32 ipad[8];
u32 opad[8];
@ -54,7 +56,8 @@ typedef struct postgres_sha256_tmp {
} postgres_sha256_tmp_t;
typedef struct postgres_sha256 {
typedef struct postgres_sha256
{
u32 salt[16];
u32 storedKey[16];
@ -70,23 +73,27 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
char *jit_build_options = NULL;
// Extra treatment for Apple systems
if (device_param->opencl_platform_vendor_id == VENDOR_ID_APPLE) {
if (device_param->opencl_platform_vendor_id == VENDOR_ID_APPLE)
{
return jit_build_options;
}
// NVIDIA GPU
if (device_param->opencl_device_vendor_id == VENDOR_ID_NV) {
if (device_param->opencl_device_vendor_id == VENDOR_ID_NV)
{
hc_asprintf(&jit_build_options, "-D _unroll");
}
// HIP
if (device_param->opencl_device_vendor_id == VENDOR_ID_AMD_USE_HIP) {
if (device_param->opencl_device_vendor_id == VENDOR_ID_AMD_USE_HIP)
{
hc_asprintf(&jit_build_options, "-D _unroll");
}
// ROCM
if ((device_param->opencl_device_vendor_id == VENDOR_ID_AMD) &&
(device_param->has_vperm == true)) {
(device_param->has_vperm == true))
{
hc_asprintf(&jit_build_options, "-D _unroll");
}
@ -133,31 +140,34 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
token.sep[0] = '$';
token.len_min[0] = 13;
token.len_max[0] = 13;
token.attr[0] = TOKEN_ATTR_VERIFY_LENGTH | TOKEN_ATTR_VERIFY_SIGNATURE;
token.attr[0] = TOKEN_ATTR_VERIFY_LENGTH
| TOKEN_ATTR_VERIFY_SIGNATURE;
token.sep[1] = ':';
token.len_min[1] = 1;
token.len_max[1] = 7;
token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH | TOKEN_ATTR_VERIFY_DIGIT;
token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH
| TOKEN_ATTR_VERIFY_DIGIT;
token.sep[2] = '$';
token.len_min[2] = 0;
token.len_max[2] = 88;
token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH | TOKEN_ATTR_VERIFY_BASE64A;
token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH
| TOKEN_ATTR_VERIFY_BASE64A;
token.sep[3] = ':';
token.len_min[3] = 44;
token.len_max[3] = 44;
token.attr[3] = TOKEN_ATTR_VERIFY_LENGTH | TOKEN_ATTR_VERIFY_BASE64A;
token.attr[3] = TOKEN_ATTR_VERIFY_LENGTH
| TOKEN_ATTR_VERIFY_BASE64A;
token.len[4] = 44;
token.attr[4] = TOKEN_ATTR_FIXED_LENGTH | TOKEN_ATTR_VERIFY_BASE64A;
token.attr[4] = TOKEN_ATTR_FIXED_LENGTH
| TOKEN_ATTR_VERIFY_BASE64A;
const int rc_tokenizer =
input_tokenizer((const u8 *)line_buf, line_len, &token);
const int rc_tokenizer = input_tokenizer ((const u8 *) line_buf, line_len, &token);
if (rc_tokenizer != PARSER_OK)
return (rc_tokenizer);
if (rc_tokenizer != PARSER_OK) return (rc_tokenizer);
// iter
@ -165,8 +175,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
const u32 iter = hc_strtoul ((const char *) iter_pos, NULL, 10);
if (iter < 1)
return (PARSER_SALT_ITERATION);
if (iter < 1) return (PARSER_SALT_ITERATION);
salt->salt_iter = iter - 1;
@ -178,8 +187,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
int tmp_len = base64_decode (base64_to_int, salt_pos, salt_len, tmp_buf);
if (tmp_len > 64)
return (PARSER_SALT_LENGTH);
if (tmp_len > 64) return (PARSER_SALT_LENGTH);
memcpy (postgres_sha256->salt, tmp_buf, tmp_len);
@ -241,8 +249,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
tmp_len = base64_decode (base64_to_int, hash_pos, hash_len, tmp_buf);
if (tmp_len != 32)
return (PARSER_HASH_LENGTH);
if (tmp_len != 32) return (PARSER_HASH_LENGTH);
memcpy (digest, tmp_buf, 32);
@ -279,8 +286,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
u8 salt_base64[64] = { 0 };
base64_encode(int_to_base64, (const u8 *)salt_buf, salt->salt_len,
salt_base64);
base64_encode (int_to_base64, (const u8 *) salt_buf, salt->salt_len, salt_base64);
// server key
@ -311,9 +317,12 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
// print final line
const int line_len =
snprintf(line_buf, line_size, "%s$%u:%s$%s:%s", SIGNATURE_POSTGRES_SHA256,
salt->salt_iter + 1, salt_base64, stored_key_base64, server_key_base64);
const int line_len = snprintf (line_buf, line_size, "%s$%u:%s$%s:%s",
SIGNATURE_POSTGRES_SHA256,
salt->salt_iter + 1,
salt_base64,
stored_key_base64,
server_key_base64);
return line_len;
}

25
src/wordlist.c
View File

@ -108,7 +108,9 @@ void get_next_word_lm_gen (char *buf, u64 sz, u64 *len, u64 *off, u64 cutlen)
if (i == cutlen)
{
if (cutlen == 20) buf[i - 1]= ']'; // add ] in $HEX[] format
*len = i;
// but continue a loop to skip rest of the line
}
@ -124,14 +126,16 @@ void get_next_word_lm_gen (char *buf, u64 sz, u64 *len, u64 *off, u64 cutlen)
}
*off = sz;
if (sz < cutlen) *len = sz;
}
void get_next_word_lm_hex (char *buf, u64 sz, u64 *len, u64 *off)
{
// this one is called if --hex-wordlist is uesed
// this one is called if --hex-wordlist is used
// we need 14 hex-digits to get 7 characters
// but first convert 7 chars to upper case if thay are a-z
// but first convert 7 chars to upper case if they are a-z
for (u64 i = 5; i < sz; i++)
{
if ((i & 1) == 0)
@ -147,9 +151,12 @@ void get_next_word_lm_hex (char *buf, u64 sz, u64 *len, u64 *off)
buf[i] = '5';
}
}
if (i == 12) break; // stop when 7 chars are converted
}
// call generic next_word
get_next_word_lm_gen (buf, sz, len, off, 14);
}
@ -157,14 +164,19 @@ void get_next_word_lm_hex_or_text (char *buf, u64 sz, u64 *len, u64 *off)
{
// check if not $HEX[..] format
bool hex = true;
if (sz < 8) hex = false;
if (hex && (buf[0] != '$')) hex = false;
if (hex && (buf[1] != 'H')) hex = false;
if (hex && (buf[2] != 'E')) hex = false;
if (hex && (buf[3] != 'X')) hex = false;
if (hex && (buf[4] != '[')) hex = false;
if (hex){
if (hex)
{
char *ptr = buf + 5; // starting after '['
for (u64 i = 5; i < sz; i++, ptr++)
{
if (*ptr == ']')
@ -699,7 +711,8 @@ int wl_data_init (hashcat_ctx_t *hashcat_ctx)
if (hashconfig->opts_type & OPTS_TYPE_PT_LM)
{
if (hashconfig->opts_type & OPTS_TYPE_PT_HEX){
if (hashconfig->opts_type & OPTS_TYPE_PT_HEX)
{
wl_data->func = get_next_word_lm_hex; // all hex in file
}
else
@ -707,7 +720,9 @@ int wl_data_init (hashcat_ctx_t *hashcat_ctx)
if (user_options->wordlist_autohex_disable == false)
{
wl_data->func = get_next_word_lm_hex_or_text; // might be $HEX[] notation
}else{
}
else
{
wl_data->func = get_next_word_lm_text; // treat as nromal text
}
}