DeforaNetworks/hashcat
3
0
Fork 0
Code Releases Activity

Rename instances of OSX to MacOS

Browse Source
This commit is contained in:
jsteube
2017-10-20 11:58:31 +02:00
parent 793b8e581d
commit 980f04a7b6
12 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Makefile
+4 -4
View File
@@ -89,7 +89,7 @@ SED_IN_PLACE := -i
ifeq ($(UNAME),Darwin)
CC := clang
# the sed -i option of OSX requires a parameter for the backup file (we just use "")
# the sed -i option of MacOS requires a parameter for the backup file (we just use "")
SED_IN_PLACE := -i ""
endif
@@ -163,9 +163,9 @@ CFLAGS += -Wno-sizeof-pointer-memaccess
#CFLAGS += -Wno-used-but-marked-unused // ^^
endif
# default linux and freebsd thread stack size is 2MB
# default windows thread stack size is 1MB
# default OSX thread stack size is 512kB
# default Linux and freebsd thread stack size is 2MB
# default Windows thread stack size is 1MB
# default MacOS thread stack size is 512kB
# unfortunately, this option isn't supported by older GCC and clang versions
#CFLAGS += -Wstack-usage=524288
src/interface.c
+13 -13
View File
@@ -408,7 +408,7 @@ static const char HT_06700[] = "AIX {ssha1}";
static const char HT_06800[] = "LastPass + LastPass sniffed";
static const char HT_06900[] = "GOST R 34.11-94";
static const char HT_07000[] = "FortiGate (FortiOS)";
static const char HT_07100[] = "OSX v10.8+ (PBKDF2-SHA512)";
static const char HT_07100[] = "MacOS v10.8+ (PBKDF2-SHA512)";
static const char HT_07200[] = "GRUB 2";
static const char HT_07300[] = "IPMI2 RAKP HMAC-SHA1";
static const char HT_07400[] = "sha256crypt $5$, SHA256 (Unix)";
@@ -508,7 +508,7 @@ static const char HT_00101[] = "nsldap, SHA-1(Base64), Netscape LDAP SHA";
static const char HT_00111[] = "nsldaps, SSHA-1(Base64), Netscape LDAP SSHA";
static const char HT_00112[] = "Oracle S: Type (Oracle 11+)";
static const char HT_00121[] = "SMF (Simple Machines Forum) > v1.1";
static const char HT_00122[] = "OSX v10.4, OSX v10.5, OSX v10.6";
static const char HT_00122[] = "MacOS v10.4, MacOS v10.5, MacOS v10.6";
static const char HT_00124[] = "Django (SHA-1)";
static const char HT_00125[] = "ArubaOS";
static const char HT_00131[] = "MSSQL (2000)";
@@ -519,7 +519,7 @@ static const char HT_01411[] = "SSHA-256(Base64), LDAP {SSHA256}";
static const char HT_01421[] = "hMailServer";
static const char HT_01441[] = "Episerver 6.x >= .NET 4";
static const char HT_01711[] = "SSHA-512(Base64), LDAP {SSHA512}";
static const char HT_01722[] = "OSX v10.7";
static const char HT_01722[] = "MacOS v10.7";
static const char HT_01731[] = "MSSQL (2012, 2014)";
static const char HT_02611[] = "vBulletin < v3.8.5";
static const char HT_02612[] = "PHPS";
@@ -625,7 +625,7 @@ static const char SIGNATURE_SHA512AIX[] = "{ssha512}";
static const char SIGNATURE_SHA512B64S[] = "{SSHA512}";
static const char SIGNATURE_SHA512CRYPT[] = "$6$";
static const char SIGNATURE_SHA512GRUB[] = "grub.pbkdf2.sha512.";
static const char SIGNATURE_SHA512OSX[] = "$ml$";
static const char SIGNATURE_SHA512MACOS[] = "$ml$";
static const char SIGNATURE_SIP_AUTH[] = "$sip$*";
static const char SIGNATURE_SSHA1B64_lower[] = "{ssha}";
static const char SIGNATURE_SSHA1B64_upper[] = "{SSHA}";
@@ -2735,7 +2735,7 @@ int arubaos_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UN
return (PARSER_OK);
}
int osx1_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig)
int macos1_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig)
{
if ((input_len < DISPLAY_LEN_MIN_122) || (input_len > DISPLAY_LEN_MAX_122)) return (PARSER_GLOBAL_LENGTH);
@@ -2781,7 +2781,7 @@ int osx1_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSE
return (PARSER_OK);
}
int osx512_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig)
int macos512_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig)
{
if ((input_len < DISPLAY_LEN_MIN_1722) || (input_len > DISPLAY_LEN_MAX_1722)) return (PARSER_GLOBAL_LENGTH);
@@ -6832,13 +6832,13 @@ int sha256crypt_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYB
return (PARSER_OK);
}
int sha512osx_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig)
int sha512macos_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig)
{
u32 max_len = DISPLAY_LEN_MAX_7100 + (2 * 128);
if ((input_len < DISPLAY_LEN_MIN_7100) || (input_len > max_len)) return (PARSER_GLOBAL_LENGTH);
if (memcmp (SIGNATURE_SHA512OSX, input_buf, 4)) return (PARSER_SIGNATURE_UNMATCHED);
if (memcmp (SIGNATURE_SHA512MACOS, input_buf, 4)) return (PARSER_SIGNATURE_UNMATCHED);
u64 *digest = (u64 *) hash_buf->digest;
@@ -17456,7 +17456,7 @@ int ascii_digest (hashcat_ctx_t *hashcat_ctx, char *out_buf, const size_t out_le
esalt[7] = byte_swap_32 (pbkdf2_sha512->salt_buf[7]);
snprintf (out_buf, out_len - 1, "%s%u$%08x%08x%08x%08x%08x%08x%08x%08x$%08x%08x%08x%08x%08x%08x%08x%08x%08x%08x%08x%08x%08x%08x%08x%08x",
SIGNATURE_SHA512OSX,
SIGNATURE_SHA512MACOS,
salt.salt_iter + 1,
esalt[ 0], esalt[ 1],
esalt[ 2], esalt[ 3],
@@ -20298,7 +20298,7 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
| OPTS_TYPE_ST_HEX;
hashconfig->kern_type = KERN_TYPE_SHA1_SLTPW;
hashconfig->dgst_size = DGST_SIZE_4_5;
hashconfig->parse_func = osx1_parse_hash;
hashconfig->parse_func = macos1_parse_hash;
hashconfig->opti_type = OPTI_TYPE_ZERO_BYTE
| OPTI_TYPE_PRECOMPUTE_INIT
| OPTI_TYPE_PRECOMPUTE_MERKLE
@@ -21139,7 +21139,7 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
| OPTS_TYPE_ST_HEX;
hashconfig->kern_type = KERN_TYPE_SHA512_SLTPW;
hashconfig->dgst_size = DGST_SIZE_8_8;
hashconfig->parse_func = osx512_parse_hash;
hashconfig->parse_func = macos512_parse_hash;
hashconfig->opti_type = OPTI_TYPE_ZERO_BYTE
| OPTI_TYPE_PRECOMPUTE_INIT
| OPTI_TYPE_PRECOMPUTE_MERKLE
@@ -22458,7 +22458,7 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
hashconfig->opts_type = OPTS_TYPE_PT_GENERATE_LE;
hashconfig->kern_type = KERN_TYPE_PBKDF2_SHA512;
hashconfig->dgst_size = DGST_SIZE_8_16;
hashconfig->parse_func = sha512osx_parse_hash;
hashconfig->parse_func = sha512macos_parse_hash;
hashconfig->opti_type = OPTI_TYPE_ZERO_BYTE
| OPTI_TYPE_USES_BITS_64
| OPTI_TYPE_SLOW_HASH_SIMD_LOOP;
@@ -25535,7 +25535,7 @@ void hashconfig_benchmark_defaults (hashcat_ctx_t *hashcat_ctx, salt_t *salt, vo
break;
case 6800: salt->salt_iter = ROUNDS_LASTPASS;
break;
case 7100: salt->salt_iter = ROUNDS_SHA512OSX;
case 7100: salt->salt_iter = ROUNDS_SHA512MACOS;
break;
case 7200: salt->salt_iter = ROUNDS_GRUB;
break;
src/opencl.c
+2 -2
View File
@@ -4214,7 +4214,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx)
#endif
// include check
// this test needs to be done manually because of osx opencl runtime
// this test needs to be done manually because of MacOS opencl runtime
// if there's a problem with permission, its not reporting back and erroring out silently
#define files_cnt 16
@@ -5483,7 +5483,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx)
hardware_power_all += device_param->hardware_power;
}
// Prevent exit from benchmark mode if all devices are skipped due to unstable hash-modes (OSX)
// Prevent exit from benchmark mode if all devices are skipped due to unstable hash-modes (MacOS)
bool has_skipped_temp = false;
src/usage.c
+3 -3
View File
@@ -257,9 +257,9 @@ static const char *USAGE_BIG[] =
" 3200 | bcrypt $2*$, Blowfish (Unix) | Operating Systems",
" 7400 | sha256crypt $5$, SHA256 (Unix) | Operating Systems",
" 1800 | sha512crypt $6$, SHA512 (Unix) | Operating Systems",
" 122 | OSX v10.4, OSX v10.5, OSX v10.6 | Operating Systems",
" 1722 | OSX v10.7 | Operating Systems",
" 7100 | OSX v10.8+ (PBKDF2-SHA512) | Operating Systems",
" 122 | MacOS v10.4, MacOS v10.5, MacOS v10.6 | Operating Systems",
" 1722 | MacOS v10.7 | Operating Systems",
" 7100 | MacOS v10.8+ (PBKDF2-SHA512) | Operating Systems",
" 6300 | AIX {smd5} | Operating Systems",
" 6700 | AIX {ssha1} | Operating Systems",
" 6400 | AIX {ssha256} | Operating Systems",