From fcebe9fadbe3e66e8959166ead40355229aa3b52 Mon Sep 17 00:00:00 2001 From: jsteube Date: Wed, 23 Jan 2019 15:05:22 +0100 Subject: [PATCH] Add module and unit test for hash-mode 1800 --- include/interface_migrate.h | 17 -- src/interface_migrate.c | 459 ---------------------------- src/modules/module_01800.c | 573 +++++++++++++++++++++++++++++++++++ tools/test_modules/m01800.pm | 260 ++++++++++++++++ 4 files changed, 833 insertions(+), 476 deletions(-) create mode 100644 src/modules/module_01800.c create mode 100644 tools/test_modules/m01800.pm diff --git a/include/interface_migrate.h b/include/interface_migrate.h index dc7e797db..55f494cec 100644 --- a/include/interface_migrate.h +++ b/include/interface_migrate.h @@ -404,20 +404,6 @@ typedef struct sha256crypt_tmp } sha256crypt_tmp_t; -typedef struct sha512crypt_tmp -{ - u64 l_alt_result[8]; - u64 l_p_bytes[2]; - u64 l_s_bytes[2]; - - // pure version - - u32 alt_result[16]; - u32 p_bytes[64]; - u32 s_bytes[64]; - -} sha512crypt_tmp_t; - typedef struct bitcoin_wallet_tmp { u64 dgst[8]; @@ -878,7 +864,6 @@ typedef enum kern_type KERN_TYPE_SHA512_SLTPWU = 1740, KERN_TYPE_HMACSHA512_PW = 1750, KERN_TYPE_HMACSHA512_SLT = 1760, - KERN_TYPE_SHA512CRYPT = 1800, KERN_TYPE_STDOUT = 2000, KERN_TYPE_DCC2 = 2100, KERN_TYPE_MD5ASA = 2410, @@ -1053,7 +1038,6 @@ typedef enum rounds_count ROUNDS_SHA256AIX = (1 << 6), ROUNDS_SHA512AIX = (1 << 6), ROUNDS_SHA256CRYPT = 5000, - ROUNDS_SHA512CRYPT = 5000, ROUNDS_GRUB = 10000, ROUNDS_SHA512MACOS = 35000, ROUNDS_AGILEKEY = 1000, @@ -1147,7 +1131,6 @@ int sha256s_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_bu int sha384_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED hashconfig_t *hashconfig); int sha512_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED hashconfig_t *hashconfig); int sha512s_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED hashconfig_t *hashconfig); -int sha512crypt_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED hashconfig_t *hashconfig); int vb30_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED hashconfig_t *hashconfig); int psafe2_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED hashconfig_t *hashconfig); int psafe3_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED hashconfig_t *hashconfig); diff --git a/src/interface_migrate.c b/src/interface_migrate.c index f5f960684..05a60b816 100644 --- a/src/interface_migrate.c +++ b/src/interface_migrate.c @@ -115,7 +115,6 @@ " 12800 | MS-AzureSync PBKDF2-HMAC-SHA256 | Operating Systems", " 12400 | BSDi Crypt, Extended DES | Operating Systems", " 7400 | sha256crypt $5$, SHA256 (Unix) | Operating Systems", - " 1800 | sha512crypt $6$, SHA512 (Unix) | 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", @@ -303,7 +302,6 @@ static const char *ST_HASH_01722 = "07543781b07e905f6f947db8ae305c248b9e12f509b4 static const char *ST_HASH_01731 = "0x02003788006711b2e74e7d8cb4be96b1d187c962c5591a02d5a6ae81b3a4a094b26b7877958b26733e45016d929a756ed30d0a5ee65d3ce1970f9b7bf946e705c595f07625b1"; static const char *ST_HASH_01750 = "138c00f17a1a0363f274817c91118f019aff09f937bfdaea844280a0c0e7811267cc4735d967d8640eed1218268c1c4a76fec8f7aa551491b353829f3a654270:885142"; static const char *ST_HASH_01760 = "7d02921299935179d509e6dd4f3d0f2944e3451ea9de3af16baead6a7297e5653577d2473a0fff743d9fe78a89bd49296114319989dc7e7870fc7f62bc96accb:114"; -static const char *ST_HASH_01800 = "$6$72820166$U4DVzpcYxgw7MVVDGGvB2/H5lRistD5.Ah4upwENR5UtffLR4X4SxSzfREv8z6wVl0jRFX40/KnYVvK4829kD1"; static const char *ST_HASH_02100 = "$DCC2$10240#6848#e2829c8af2232fa53797e2f0e35e4626"; static const char *ST_HASH_02410 = "YjDBNr.A0AN7DA8s:4684"; static const char *ST_HASH_02600 = "a936af92b0ae20b1ff6c3347a72e5fbe"; @@ -505,7 +503,6 @@ static const char *HT_01730 = "sha512(utf16le($pass).$salt)"; static const char *HT_01740 = "sha512($salt.utf16le($pass))"; static const char *HT_01750 = "HMAC-SHA512 (key = $pass)"; static const char *HT_01760 = "HMAC-SHA512 (key = $salt)"; -static const char *HT_01800 = "sha512crypt $6$, SHA512 (Unix)"; static const char *HT_02100 = "Domain Cached Credentials 2 (DCC2), MS Cache 2"; static const char *HT_02410 = "Cisco-ASA MD5"; static const char *HT_02600 = "md5(md5($pass))"; @@ -771,7 +768,6 @@ static const char *SIGNATURE_SHA256B64S = "{SSHA256}"; static const char *SIGNATURE_SHA256CRYPT = "$5$"; 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_SHA512MACOS = "$ml$"; static const char *SIGNATURE_SIP_AUTH = "$sip$"; @@ -800,362 +796,6 @@ static const char *SIGNATURE_APFS = "$fvde$"; * decoder / encoder */ -static void sha512crypt_decode (u8 digest[64], const u8 buf[86]) -{ - int l; - - l = itoa64_to_int (buf[ 0]) << 0; - l |= itoa64_to_int (buf[ 1]) << 6; - l |= itoa64_to_int (buf[ 2]) << 12; - l |= itoa64_to_int (buf[ 3]) << 18; - - digest[ 0] = (l >> 16) & 0xff; - digest[21] = (l >> 8) & 0xff; - digest[42] = (l >> 0) & 0xff; - - l = itoa64_to_int (buf[ 4]) << 0; - l |= itoa64_to_int (buf[ 5]) << 6; - l |= itoa64_to_int (buf[ 6]) << 12; - l |= itoa64_to_int (buf[ 7]) << 18; - - digest[22] = (l >> 16) & 0xff; - digest[43] = (l >> 8) & 0xff; - digest[ 1] = (l >> 0) & 0xff; - - l = itoa64_to_int (buf[ 8]) << 0; - l |= itoa64_to_int (buf[ 9]) << 6; - l |= itoa64_to_int (buf[10]) << 12; - l |= itoa64_to_int (buf[11]) << 18; - - digest[44] = (l >> 16) & 0xff; - digest[ 2] = (l >> 8) & 0xff; - digest[23] = (l >> 0) & 0xff; - - l = itoa64_to_int (buf[12]) << 0; - l |= itoa64_to_int (buf[13]) << 6; - l |= itoa64_to_int (buf[14]) << 12; - l |= itoa64_to_int (buf[15]) << 18; - - digest[ 3] = (l >> 16) & 0xff; - digest[24] = (l >> 8) & 0xff; - digest[45] = (l >> 0) & 0xff; - - l = itoa64_to_int (buf[16]) << 0; - l |= itoa64_to_int (buf[17]) << 6; - l |= itoa64_to_int (buf[18]) << 12; - l |= itoa64_to_int (buf[19]) << 18; - - digest[25] = (l >> 16) & 0xff; - digest[46] = (l >> 8) & 0xff; - digest[ 4] = (l >> 0) & 0xff; - - l = itoa64_to_int (buf[20]) << 0; - l |= itoa64_to_int (buf[21]) << 6; - l |= itoa64_to_int (buf[22]) << 12; - l |= itoa64_to_int (buf[23]) << 18; - - digest[47] = (l >> 16) & 0xff; - digest[ 5] = (l >> 8) & 0xff; - digest[26] = (l >> 0) & 0xff; - - l = itoa64_to_int (buf[24]) << 0; - l |= itoa64_to_int (buf[25]) << 6; - l |= itoa64_to_int (buf[26]) << 12; - l |= itoa64_to_int (buf[27]) << 18; - - digest[ 6] = (l >> 16) & 0xff; - digest[27] = (l >> 8) & 0xff; - digest[48] = (l >> 0) & 0xff; - - l = itoa64_to_int (buf[28]) << 0; - l |= itoa64_to_int (buf[29]) << 6; - l |= itoa64_to_int (buf[30]) << 12; - l |= itoa64_to_int (buf[31]) << 18; - - digest[28] = (l >> 16) & 0xff; - digest[49] = (l >> 8) & 0xff; - digest[ 7] = (l >> 0) & 0xff; - - l = itoa64_to_int (buf[32]) << 0; - l |= itoa64_to_int (buf[33]) << 6; - l |= itoa64_to_int (buf[34]) << 12; - l |= itoa64_to_int (buf[35]) << 18; - - digest[50] = (l >> 16) & 0xff; - digest[ 8] = (l >> 8) & 0xff; - digest[29] = (l >> 0) & 0xff; - - l = itoa64_to_int (buf[36]) << 0; - l |= itoa64_to_int (buf[37]) << 6; - l |= itoa64_to_int (buf[38]) << 12; - l |= itoa64_to_int (buf[39]) << 18; - - digest[ 9] = (l >> 16) & 0xff; - digest[30] = (l >> 8) & 0xff; - digest[51] = (l >> 0) & 0xff; - - l = itoa64_to_int (buf[40]) << 0; - l |= itoa64_to_int (buf[41]) << 6; - l |= itoa64_to_int (buf[42]) << 12; - l |= itoa64_to_int (buf[43]) << 18; - - digest[31] = (l >> 16) & 0xff; - digest[52] = (l >> 8) & 0xff; - digest[10] = (l >> 0) & 0xff; - - l = itoa64_to_int (buf[44]) << 0; - l |= itoa64_to_int (buf[45]) << 6; - l |= itoa64_to_int (buf[46]) << 12; - l |= itoa64_to_int (buf[47]) << 18; - - digest[53] = (l >> 16) & 0xff; - digest[11] = (l >> 8) & 0xff; - digest[32] = (l >> 0) & 0xff; - - l = itoa64_to_int (buf[48]) << 0; - l |= itoa64_to_int (buf[49]) << 6; - l |= itoa64_to_int (buf[50]) << 12; - l |= itoa64_to_int (buf[51]) << 18; - - digest[12] = (l >> 16) & 0xff; - digest[33] = (l >> 8) & 0xff; - digest[54] = (l >> 0) & 0xff; - - l = itoa64_to_int (buf[52]) << 0; - l |= itoa64_to_int (buf[53]) << 6; - l |= itoa64_to_int (buf[54]) << 12; - l |= itoa64_to_int (buf[55]) << 18; - - digest[34] = (l >> 16) & 0xff; - digest[55] = (l >> 8) & 0xff; - digest[13] = (l >> 0) & 0xff; - - l = itoa64_to_int (buf[56]) << 0; - l |= itoa64_to_int (buf[57]) << 6; - l |= itoa64_to_int (buf[58]) << 12; - l |= itoa64_to_int (buf[59]) << 18; - - digest[56] = (l >> 16) & 0xff; - digest[14] = (l >> 8) & 0xff; - digest[35] = (l >> 0) & 0xff; - - l = itoa64_to_int (buf[60]) << 0; - l |= itoa64_to_int (buf[61]) << 6; - l |= itoa64_to_int (buf[62]) << 12; - l |= itoa64_to_int (buf[63]) << 18; - - digest[15] = (l >> 16) & 0xff; - digest[36] = (l >> 8) & 0xff; - digest[57] = (l >> 0) & 0xff; - - l = itoa64_to_int (buf[64]) << 0; - l |= itoa64_to_int (buf[65]) << 6; - l |= itoa64_to_int (buf[66]) << 12; - l |= itoa64_to_int (buf[67]) << 18; - - digest[37] = (l >> 16) & 0xff; - digest[58] = (l >> 8) & 0xff; - digest[16] = (l >> 0) & 0xff; - - l = itoa64_to_int (buf[68]) << 0; - l |= itoa64_to_int (buf[69]) << 6; - l |= itoa64_to_int (buf[70]) << 12; - l |= itoa64_to_int (buf[71]) << 18; - - digest[59] = (l >> 16) & 0xff; - digest[17] = (l >> 8) & 0xff; - digest[38] = (l >> 0) & 0xff; - - l = itoa64_to_int (buf[72]) << 0; - l |= itoa64_to_int (buf[73]) << 6; - l |= itoa64_to_int (buf[74]) << 12; - l |= itoa64_to_int (buf[75]) << 18; - - digest[18] = (l >> 16) & 0xff; - digest[39] = (l >> 8) & 0xff; - digest[60] = (l >> 0) & 0xff; - - l = itoa64_to_int (buf[76]) << 0; - l |= itoa64_to_int (buf[77]) << 6; - l |= itoa64_to_int (buf[78]) << 12; - l |= itoa64_to_int (buf[79]) << 18; - - digest[40] = (l >> 16) & 0xff; - digest[61] = (l >> 8) & 0xff; - digest[19] = (l >> 0) & 0xff; - - l = itoa64_to_int (buf[80]) << 0; - l |= itoa64_to_int (buf[81]) << 6; - l |= itoa64_to_int (buf[82]) << 12; - l |= itoa64_to_int (buf[83]) << 18; - - digest[62] = (l >> 16) & 0xff; - digest[20] = (l >> 8) & 0xff; - digest[41] = (l >> 0) & 0xff; - - l = itoa64_to_int (buf[84]) << 0; - l |= itoa64_to_int (buf[85]) << 6; - - digest[63] = (l >> 0) & 0xff; -} - -static void sha512crypt_encode (const u8 digest[64], u8 buf[86]) -{ - int l; - - l = (digest[ 0] << 16) | (digest[21] << 8) | (digest[42] << 0); - - buf[ 0] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[ 1] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[ 2] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[ 3] = int_to_itoa64 (l & 0x3f); //l >>= 6; - - l = (digest[22] << 16) | (digest[43] << 8) | (digest[ 1] << 0); - - buf[ 4] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[ 5] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[ 6] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[ 7] = int_to_itoa64 (l & 0x3f); //l >>= 6; - - l = (digest[44] << 16) | (digest[ 2] << 8) | (digest[23] << 0); - - buf[ 8] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[ 9] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[10] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[11] = int_to_itoa64 (l & 0x3f); //l >>= 6; - - l = (digest[ 3] << 16) | (digest[24] << 8) | (digest[45] << 0); - - buf[12] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[13] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[14] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[15] = int_to_itoa64 (l & 0x3f); //l >>= 6; - - l = (digest[25] << 16) | (digest[46] << 8) | (digest[ 4] << 0); - - buf[16] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[17] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[18] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[19] = int_to_itoa64 (l & 0x3f); //l >>= 6; - - l = (digest[47] << 16) | (digest[ 5] << 8) | (digest[26] << 0); - - buf[20] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[21] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[22] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[23] = int_to_itoa64 (l & 0x3f); //l >>= 6; - - l = (digest[ 6] << 16) | (digest[27] << 8) | (digest[48] << 0); - - buf[24] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[25] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[26] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[27] = int_to_itoa64 (l & 0x3f); //l >>= 6; - - l = (digest[28] << 16) | (digest[49] << 8) | (digest[ 7] << 0); - - buf[28] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[29] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[30] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[31] = int_to_itoa64 (l & 0x3f); //l >>= 6; - - l = (digest[50] << 16) | (digest[ 8] << 8) | (digest[29] << 0); - - buf[32] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[33] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[34] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[35] = int_to_itoa64 (l & 0x3f); //l >>= 6; - - l = (digest[ 9] << 16) | (digest[30] << 8) | (digest[51] << 0); - - buf[36] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[37] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[38] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[39] = int_to_itoa64 (l & 0x3f); //l >>= 6; - - l = (digest[31] << 16) | (digest[52] << 8) | (digest[10] << 0); - - buf[40] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[41] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[42] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[43] = int_to_itoa64 (l & 0x3f); //l >>= 6; - - l = (digest[53] << 16) | (digest[11] << 8) | (digest[32] << 0); - - buf[44] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[45] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[46] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[47] = int_to_itoa64 (l & 0x3f); //l >>= 6; - - l = (digest[12] << 16) | (digest[33] << 8) | (digest[54] << 0); - - buf[48] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[49] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[50] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[51] = int_to_itoa64 (l & 0x3f); //l >>= 6; - - l = (digest[34] << 16) | (digest[55] << 8) | (digest[13] << 0); - - buf[52] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[53] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[54] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[55] = int_to_itoa64 (l & 0x3f); //l >>= 6; - - l = (digest[56] << 16) | (digest[14] << 8) | (digest[35] << 0); - - buf[56] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[57] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[58] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[59] = int_to_itoa64 (l & 0x3f); //l >>= 6; - - l = (digest[15] << 16) | (digest[36] << 8) | (digest[57] << 0); - - buf[60] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[61] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[62] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[63] = int_to_itoa64 (l & 0x3f); //l >>= 6; - - l = (digest[37] << 16) | (digest[58] << 8) | (digest[16] << 0); - - buf[64] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[65] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[66] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[67] = int_to_itoa64 (l & 0x3f); //l >>= 6; - - l = (digest[59] << 16) | (digest[17] << 8) | (digest[38] << 0); - - buf[68] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[69] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[70] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[71] = int_to_itoa64 (l & 0x3f); //l >>= 6; - - l = (digest[18] << 16) | (digest[39] << 8) | (digest[60] << 0); - - buf[72] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[73] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[74] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[75] = int_to_itoa64 (l & 0x3f); //l >>= 6; - - l = (digest[40] << 16) | (digest[61] << 8) | (digest[19] << 0); - - buf[76] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[77] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[78] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[79] = int_to_itoa64 (l & 0x3f); //l >>= 6; - - l = (digest[62] << 16) | (digest[20] << 8) | (digest[41] << 0); - - buf[80] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[81] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[82] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[83] = int_to_itoa64 (l & 0x3f); //l >>= 6; - - l = (digest[63] << 0); - - buf[84] = int_to_itoa64 (l & 0x3f); l >>= 6; - buf[85] = int_to_itoa64 (l & 0x3f); //l >>= 6; -} - static void sha1aix_decode (u8 digest[20], const u8 buf[27]) { int l; @@ -5159,58 +4799,6 @@ int sha512s_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UN return (PARSER_OK); } -int sha512crypt_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED hashconfig_t *hashconfig) -{ - u64 *digest = (u64 *) hash_buf->digest; - - salt_t *salt = hash_buf->salt; - - token_t token; - - token.token_cnt = 3; - - token.signatures_cnt = 1; - token.signatures_buf[0] = SIGNATURE_SHA512CRYPT; - - token.len[0] = 3; - token.attr[0] = TOKEN_ATTR_FIXED_LENGTH - | TOKEN_ATTR_VERIFY_SIGNATURE; - - token.len_min[1] = 0; - token.len_max[1] = 16; - token.sep[1] = '$'; - token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH - | TOKEN_ATTR_OPTIONAL_ROUNDS; - - token.len[2] = 86; - token.attr[2] = TOKEN_ATTR_FIXED_LENGTH - | TOKEN_ATTR_VERIFY_BASE64B; - - const int rc_tokenizer = input_tokenizer (input_buf, input_len, &token); - - if (rc_tokenizer != PARSER_OK) return (rc_tokenizer); - - salt->salt_iter = ROUNDS_SHA512CRYPT; - - if (token.opt_len != -1) - { - salt->salt_iter = hc_strtoul ((const char *) token.opt_buf + 7, NULL, 10); // 7 = "rounds=" - } - - const u8 *salt_pos = token.buf[1]; - const int salt_len = token.len[1]; - - const bool parse_rc = parse_and_store_generic_salt ((u8 *) salt->salt_buf, (int *) &salt->salt_len, salt_pos, salt_len, hashconfig); - - if (parse_rc == false) return (PARSER_SALT_LENGTH); - - const u8 *hash_pos = token.buf[2]; - - sha512crypt_decode ((u8 *) digest, hash_pos); - - return (PARSER_OK); -} - int keccak_256_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED hashconfig_t *hashconfig) { u64 *digest = (u64 *) hash_buf->digest; @@ -16697,8 +16285,6 @@ void hashconfig_benchmark_defaults (hashcat_ctx_t *hashcat_ctx, salt_t *salt, vo switch (hashconfig->hash_mode) { - case 1800: salt->salt_iter = ROUNDS_SHA512CRYPT; - break; case 2100: salt->salt_iter = ROUNDS_DCC2; break; case 5200: salt->salt_iter = ROUNDS_PSAFE3; @@ -17189,30 +16775,6 @@ int ascii_digest (hashcat_ctx_t *hashcat_ctx, char *out_buf, const int out_size, ptr[13], ptr[12], ptr[15], ptr[14]); } - else if (hash_mode == 1800) - { - // temp workaround - - digest_buf64[0] = byte_swap_64 (digest_buf64[0]); - digest_buf64[1] = byte_swap_64 (digest_buf64[1]); - digest_buf64[2] = byte_swap_64 (digest_buf64[2]); - digest_buf64[3] = byte_swap_64 (digest_buf64[3]); - digest_buf64[4] = byte_swap_64 (digest_buf64[4]); - digest_buf64[5] = byte_swap_64 (digest_buf64[5]); - digest_buf64[6] = byte_swap_64 (digest_buf64[6]); - digest_buf64[7] = byte_swap_64 (digest_buf64[7]); - - sha512crypt_encode ((unsigned char *) digest_buf64, (unsigned char *) ptr_plain); - - if (salt.salt_iter == ROUNDS_SHA512CRYPT) - { - snprintf (out_buf, out_size, "$6$%s$%s", (char *) salt.salt_buf, ptr_plain); - } - else - { - snprintf (out_buf, out_size, "$6$rounds=%u$%s$%s", salt.salt_iter, (char *) salt.salt_buf, ptr_plain); - } - } else if (hash_mode == 2100) { u32 pos = 0; @@ -21207,24 +20769,6 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx) hashconfig->st_pass = ST_PASS_HASHCAT_PLAIN; break; - case 1800: hashconfig->hash_type = HASH_TYPE_SHA512; - hashconfig->salt_type = SALT_TYPE_EMBEDDED; - hashconfig->attack_exec = ATTACK_EXEC_OUTSIDE_KERNEL; - hashconfig->opts_type = OPTS_TYPE_PT_GENERATE_LE - | OPTS_TYPE_PREFERED_THREAD; - hashconfig->kern_type = KERN_TYPE_SHA512CRYPT; - hashconfig->dgst_size = DGST_SIZE_8_8; - hashconfig->parse_func = sha512crypt_parse_hash; - hashconfig->opti_type = OPTI_TYPE_ZERO_BYTE - | OPTI_TYPE_USES_BITS_64; - hashconfig->dgst_pos0 = 0; - hashconfig->dgst_pos1 = 1; - hashconfig->dgst_pos2 = 2; - hashconfig->dgst_pos3 = 3; - hashconfig->st_hash = ST_HASH_01800; - hashconfig->st_pass = ST_PASS_HASHCAT_PLAIN; - break; - case 2000: hashconfig->hash_type = HASH_TYPE_STDOUT; hashconfig->salt_type = SALT_TYPE_NONE; hashconfig->attack_exec = ATTACK_EXEC_INSIDE_KERNEL; @@ -24764,7 +24308,6 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx) switch (hashconfig->hash_mode) { - case 1800: hashconfig->tmp_size = sizeof (sha512crypt_tmp_t); break; case 2100: hashconfig->tmp_size = sizeof (dcc2_tmp_t); break; case 5200: hashconfig->tmp_size = sizeof (pwsafe3_tmp_t); break; case 5800: hashconfig->tmp_size = sizeof (androidpin_tmp_t); break; @@ -24895,8 +24438,6 @@ u32 default_pw_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED co switch (hashconfig->hash_mode) { - case 1800: pw_max = MIN (pw_max, 16); // pure kernel available - break; case 5800: pw_max = MIN (pw_max, 16); // pure kernel available break; case 6900: pw_max = MIN (pw_max, 32); // todo diff --git a/src/modules/module_01800.c b/src/modules/module_01800.c new file mode 100644 index 000000000..c0e5a946a --- /dev/null +++ b/src/modules/module_01800.c @@ -0,0 +1,573 @@ +/** + * Author......: See docs/credits.txt + * License.....: MIT + */ + +#include "common.h" +#include "types.h" +#include "modules.h" +#include "bitops.h" +#include "convert.h" +#include "shared.h" + +static const u32 ATTACK_EXEC = ATTACK_EXEC_OUTSIDE_KERNEL; +static const u32 DGST_POS0 = 0; +static const u32 DGST_POS1 = 1; +static const u32 DGST_POS2 = 2; +static const u32 DGST_POS3 = 3; +static const u32 DGST_SIZE = DGST_SIZE_8_8; +static const u32 HASH_CATEGORY = HASH_CATEGORY_OS; +static const char *HASH_NAME = "sha512crypt $6$, SHA512 (Unix)"; +static const u32 HASH_TYPE = HASH_TYPE_GENERIC; +static const u64 KERN_TYPE = 1800; +static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE + | OPTI_TYPE_USES_BITS_64; +static const u64 OPTS_TYPE = OPTS_TYPE_STATE_BUFFER_LE + | OPTS_TYPE_PT_GENERATE_LE + | OPTS_TYPE_PREFERED_THREAD; +static const u32 SALT_TYPE = SALT_TYPE_EMBEDDED; +static const char *ST_PASS = "hashcat"; +static const char *ST_HASH = "$6$72820166$U4DVzpcYxgw7MVVDGGvB2/H5lRistD5.Ah4upwENR5UtffLR4X4SxSzfREv8z6wVl0jRFX40/KnYVvK4829kD1"; + +u32 module_attack_exec (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 ATTACK_EXEC; } +u32 module_dgst_pos0 (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 DGST_POS0; } +u32 module_dgst_pos1 (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 DGST_POS1; } +u32 module_dgst_pos2 (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 DGST_POS2; } +u32 module_dgst_pos3 (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 DGST_POS3; } +u32 module_dgst_size (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 DGST_SIZE; } +u32 module_hash_category (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 HASH_CATEGORY; } +const char *module_hash_name (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 HASH_NAME; } +u32 module_hash_type (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 HASH_TYPE; } +u64 module_kern_type (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 KERN_TYPE; } +u32 module_opti_type (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 OPTI_TYPE; } +u64 module_opts_type (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 OPTS_TYPE; } +u32 module_salt_type (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 SALT_TYPE; } +const char *module_st_hash (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_HASH; } +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 sha512crypt_tmp +{ + u64 l_alt_result[8]; + u64 l_p_bytes[2]; + u64 l_s_bytes[2]; + + // pure version + + u32 alt_result[16]; + u32 p_bytes[64]; + u32 s_bytes[64]; + +} sha512crypt_tmp_t; + +static const u32 ROUNDS_SHA512CRYPT = 5000; +static const char *SIGNATURE_SHA512CRYPT = "$6$"; + +static void sha512crypt_decode (u8 digest[64], const u8 buf[86]) +{ + int l; + + l = itoa64_to_int (buf[ 0]) << 0; + l |= itoa64_to_int (buf[ 1]) << 6; + l |= itoa64_to_int (buf[ 2]) << 12; + l |= itoa64_to_int (buf[ 3]) << 18; + + digest[ 0] = (l >> 16) & 0xff; + digest[21] = (l >> 8) & 0xff; + digest[42] = (l >> 0) & 0xff; + + l = itoa64_to_int (buf[ 4]) << 0; + l |= itoa64_to_int (buf[ 5]) << 6; + l |= itoa64_to_int (buf[ 6]) << 12; + l |= itoa64_to_int (buf[ 7]) << 18; + + digest[22] = (l >> 16) & 0xff; + digest[43] = (l >> 8) & 0xff; + digest[ 1] = (l >> 0) & 0xff; + + l = itoa64_to_int (buf[ 8]) << 0; + l |= itoa64_to_int (buf[ 9]) << 6; + l |= itoa64_to_int (buf[10]) << 12; + l |= itoa64_to_int (buf[11]) << 18; + + digest[44] = (l >> 16) & 0xff; + digest[ 2] = (l >> 8) & 0xff; + digest[23] = (l >> 0) & 0xff; + + l = itoa64_to_int (buf[12]) << 0; + l |= itoa64_to_int (buf[13]) << 6; + l |= itoa64_to_int (buf[14]) << 12; + l |= itoa64_to_int (buf[15]) << 18; + + digest[ 3] = (l >> 16) & 0xff; + digest[24] = (l >> 8) & 0xff; + digest[45] = (l >> 0) & 0xff; + + l = itoa64_to_int (buf[16]) << 0; + l |= itoa64_to_int (buf[17]) << 6; + l |= itoa64_to_int (buf[18]) << 12; + l |= itoa64_to_int (buf[19]) << 18; + + digest[25] = (l >> 16) & 0xff; + digest[46] = (l >> 8) & 0xff; + digest[ 4] = (l >> 0) & 0xff; + + l = itoa64_to_int (buf[20]) << 0; + l |= itoa64_to_int (buf[21]) << 6; + l |= itoa64_to_int (buf[22]) << 12; + l |= itoa64_to_int (buf[23]) << 18; + + digest[47] = (l >> 16) & 0xff; + digest[ 5] = (l >> 8) & 0xff; + digest[26] = (l >> 0) & 0xff; + + l = itoa64_to_int (buf[24]) << 0; + l |= itoa64_to_int (buf[25]) << 6; + l |= itoa64_to_int (buf[26]) << 12; + l |= itoa64_to_int (buf[27]) << 18; + + digest[ 6] = (l >> 16) & 0xff; + digest[27] = (l >> 8) & 0xff; + digest[48] = (l >> 0) & 0xff; + + l = itoa64_to_int (buf[28]) << 0; + l |= itoa64_to_int (buf[29]) << 6; + l |= itoa64_to_int (buf[30]) << 12; + l |= itoa64_to_int (buf[31]) << 18; + + digest[28] = (l >> 16) & 0xff; + digest[49] = (l >> 8) & 0xff; + digest[ 7] = (l >> 0) & 0xff; + + l = itoa64_to_int (buf[32]) << 0; + l |= itoa64_to_int (buf[33]) << 6; + l |= itoa64_to_int (buf[34]) << 12; + l |= itoa64_to_int (buf[35]) << 18; + + digest[50] = (l >> 16) & 0xff; + digest[ 8] = (l >> 8) & 0xff; + digest[29] = (l >> 0) & 0xff; + + l = itoa64_to_int (buf[36]) << 0; + l |= itoa64_to_int (buf[37]) << 6; + l |= itoa64_to_int (buf[38]) << 12; + l |= itoa64_to_int (buf[39]) << 18; + + digest[ 9] = (l >> 16) & 0xff; + digest[30] = (l >> 8) & 0xff; + digest[51] = (l >> 0) & 0xff; + + l = itoa64_to_int (buf[40]) << 0; + l |= itoa64_to_int (buf[41]) << 6; + l |= itoa64_to_int (buf[42]) << 12; + l |= itoa64_to_int (buf[43]) << 18; + + digest[31] = (l >> 16) & 0xff; + digest[52] = (l >> 8) & 0xff; + digest[10] = (l >> 0) & 0xff; + + l = itoa64_to_int (buf[44]) << 0; + l |= itoa64_to_int (buf[45]) << 6; + l |= itoa64_to_int (buf[46]) << 12; + l |= itoa64_to_int (buf[47]) << 18; + + digest[53] = (l >> 16) & 0xff; + digest[11] = (l >> 8) & 0xff; + digest[32] = (l >> 0) & 0xff; + + l = itoa64_to_int (buf[48]) << 0; + l |= itoa64_to_int (buf[49]) << 6; + l |= itoa64_to_int (buf[50]) << 12; + l |= itoa64_to_int (buf[51]) << 18; + + digest[12] = (l >> 16) & 0xff; + digest[33] = (l >> 8) & 0xff; + digest[54] = (l >> 0) & 0xff; + + l = itoa64_to_int (buf[52]) << 0; + l |= itoa64_to_int (buf[53]) << 6; + l |= itoa64_to_int (buf[54]) << 12; + l |= itoa64_to_int (buf[55]) << 18; + + digest[34] = (l >> 16) & 0xff; + digest[55] = (l >> 8) & 0xff; + digest[13] = (l >> 0) & 0xff; + + l = itoa64_to_int (buf[56]) << 0; + l |= itoa64_to_int (buf[57]) << 6; + l |= itoa64_to_int (buf[58]) << 12; + l |= itoa64_to_int (buf[59]) << 18; + + digest[56] = (l >> 16) & 0xff; + digest[14] = (l >> 8) & 0xff; + digest[35] = (l >> 0) & 0xff; + + l = itoa64_to_int (buf[60]) << 0; + l |= itoa64_to_int (buf[61]) << 6; + l |= itoa64_to_int (buf[62]) << 12; + l |= itoa64_to_int (buf[63]) << 18; + + digest[15] = (l >> 16) & 0xff; + digest[36] = (l >> 8) & 0xff; + digest[57] = (l >> 0) & 0xff; + + l = itoa64_to_int (buf[64]) << 0; + l |= itoa64_to_int (buf[65]) << 6; + l |= itoa64_to_int (buf[66]) << 12; + l |= itoa64_to_int (buf[67]) << 18; + + digest[37] = (l >> 16) & 0xff; + digest[58] = (l >> 8) & 0xff; + digest[16] = (l >> 0) & 0xff; + + l = itoa64_to_int (buf[68]) << 0; + l |= itoa64_to_int (buf[69]) << 6; + l |= itoa64_to_int (buf[70]) << 12; + l |= itoa64_to_int (buf[71]) << 18; + + digest[59] = (l >> 16) & 0xff; + digest[17] = (l >> 8) & 0xff; + digest[38] = (l >> 0) & 0xff; + + l = itoa64_to_int (buf[72]) << 0; + l |= itoa64_to_int (buf[73]) << 6; + l |= itoa64_to_int (buf[74]) << 12; + l |= itoa64_to_int (buf[75]) << 18; + + digest[18] = (l >> 16) & 0xff; + digest[39] = (l >> 8) & 0xff; + digest[60] = (l >> 0) & 0xff; + + l = itoa64_to_int (buf[76]) << 0; + l |= itoa64_to_int (buf[77]) << 6; + l |= itoa64_to_int (buf[78]) << 12; + l |= itoa64_to_int (buf[79]) << 18; + + digest[40] = (l >> 16) & 0xff; + digest[61] = (l >> 8) & 0xff; + digest[19] = (l >> 0) & 0xff; + + l = itoa64_to_int (buf[80]) << 0; + l |= itoa64_to_int (buf[81]) << 6; + l |= itoa64_to_int (buf[82]) << 12; + l |= itoa64_to_int (buf[83]) << 18; + + digest[62] = (l >> 16) & 0xff; + digest[20] = (l >> 8) & 0xff; + digest[41] = (l >> 0) & 0xff; + + l = itoa64_to_int (buf[84]) << 0; + l |= itoa64_to_int (buf[85]) << 6; + + digest[63] = (l >> 0) & 0xff; +} + +static void sha512crypt_encode (const u8 digest[64], u8 buf[86]) +{ + int l; + + l = (digest[ 0] << 16) | (digest[21] << 8) | (digest[42] << 0); + + buf[ 0] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[ 1] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[ 2] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[ 3] = int_to_itoa64 (l & 0x3f); //l >>= 6; + + l = (digest[22] << 16) | (digest[43] << 8) | (digest[ 1] << 0); + + buf[ 4] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[ 5] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[ 6] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[ 7] = int_to_itoa64 (l & 0x3f); //l >>= 6; + + l = (digest[44] << 16) | (digest[ 2] << 8) | (digest[23] << 0); + + buf[ 8] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[ 9] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[10] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[11] = int_to_itoa64 (l & 0x3f); //l >>= 6; + + l = (digest[ 3] << 16) | (digest[24] << 8) | (digest[45] << 0); + + buf[12] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[13] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[14] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[15] = int_to_itoa64 (l & 0x3f); //l >>= 6; + + l = (digest[25] << 16) | (digest[46] << 8) | (digest[ 4] << 0); + + buf[16] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[17] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[18] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[19] = int_to_itoa64 (l & 0x3f); //l >>= 6; + + l = (digest[47] << 16) | (digest[ 5] << 8) | (digest[26] << 0); + + buf[20] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[21] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[22] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[23] = int_to_itoa64 (l & 0x3f); //l >>= 6; + + l = (digest[ 6] << 16) | (digest[27] << 8) | (digest[48] << 0); + + buf[24] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[25] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[26] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[27] = int_to_itoa64 (l & 0x3f); //l >>= 6; + + l = (digest[28] << 16) | (digest[49] << 8) | (digest[ 7] << 0); + + buf[28] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[29] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[30] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[31] = int_to_itoa64 (l & 0x3f); //l >>= 6; + + l = (digest[50] << 16) | (digest[ 8] << 8) | (digest[29] << 0); + + buf[32] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[33] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[34] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[35] = int_to_itoa64 (l & 0x3f); //l >>= 6; + + l = (digest[ 9] << 16) | (digest[30] << 8) | (digest[51] << 0); + + buf[36] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[37] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[38] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[39] = int_to_itoa64 (l & 0x3f); //l >>= 6; + + l = (digest[31] << 16) | (digest[52] << 8) | (digest[10] << 0); + + buf[40] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[41] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[42] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[43] = int_to_itoa64 (l & 0x3f); //l >>= 6; + + l = (digest[53] << 16) | (digest[11] << 8) | (digest[32] << 0); + + buf[44] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[45] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[46] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[47] = int_to_itoa64 (l & 0x3f); //l >>= 6; + + l = (digest[12] << 16) | (digest[33] << 8) | (digest[54] << 0); + + buf[48] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[49] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[50] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[51] = int_to_itoa64 (l & 0x3f); //l >>= 6; + + l = (digest[34] << 16) | (digest[55] << 8) | (digest[13] << 0); + + buf[52] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[53] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[54] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[55] = int_to_itoa64 (l & 0x3f); //l >>= 6; + + l = (digest[56] << 16) | (digest[14] << 8) | (digest[35] << 0); + + buf[56] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[57] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[58] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[59] = int_to_itoa64 (l & 0x3f); //l >>= 6; + + l = (digest[15] << 16) | (digest[36] << 8) | (digest[57] << 0); + + buf[60] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[61] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[62] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[63] = int_to_itoa64 (l & 0x3f); //l >>= 6; + + l = (digest[37] << 16) | (digest[58] << 8) | (digest[16] << 0); + + buf[64] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[65] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[66] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[67] = int_to_itoa64 (l & 0x3f); //l >>= 6; + + l = (digest[59] << 16) | (digest[17] << 8) | (digest[38] << 0); + + buf[68] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[69] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[70] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[71] = int_to_itoa64 (l & 0x3f); //l >>= 6; + + l = (digest[18] << 16) | (digest[39] << 8) | (digest[60] << 0); + + buf[72] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[73] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[74] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[75] = int_to_itoa64 (l & 0x3f); //l >>= 6; + + l = (digest[40] << 16) | (digest[61] << 8) | (digest[19] << 0); + + buf[76] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[77] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[78] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[79] = int_to_itoa64 (l & 0x3f); //l >>= 6; + + l = (digest[62] << 16) | (digest[20] << 8) | (digest[41] << 0); + + buf[80] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[81] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[82] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[83] = int_to_itoa64 (l & 0x3f); //l >>= 6; + + l = (digest[63] << 0); + + buf[84] = int_to_itoa64 (l & 0x3f); l >>= 6; + buf[85] = int_to_itoa64 (l & 0x3f); //l >>= 6; +} + +u64 module_tmp_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) +{ + const u64 tmp_size = (const u64) sizeof (sha512crypt_tmp_t); + + return tmp_size; +} + +u32 module_pw_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) +{ + const bool optimized_kernel = (hashconfig->opti_type & OPTI_TYPE_OPTIMIZED_KERNEL); + + const u32 pw_max = (optimized_kernel == true) ? 15 : PW_MAX; + + return pw_max; +} + +int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED void *digest_buf, MAYBE_UNUSED salt_t *salt, MAYBE_UNUSED void *esalt_buf, MAYBE_UNUSED hashinfo_t *hash_info, const char *line_buf, MAYBE_UNUSED const int line_len) +{ + u64 *digest = (u64 *) digest_buf; + + token_t token; + + token.token_cnt = 3; + + token.signatures_cnt = 1; + token.signatures_buf[0] = SIGNATURE_SHA512CRYPT; + + token.len[0] = 3; + token.attr[0] = TOKEN_ATTR_FIXED_LENGTH + | TOKEN_ATTR_VERIFY_SIGNATURE; + + token.len_min[1] = 0; + token.len_max[1] = 16; + token.sep[1] = '$'; + token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH + | TOKEN_ATTR_OPTIONAL_ROUNDS; + + token.len[2] = 86; + token.attr[2] = TOKEN_ATTR_FIXED_LENGTH + | TOKEN_ATTR_VERIFY_BASE64B; + + const int rc_tokenizer = input_tokenizer ((const u8 *) line_buf, line_len, &token); + + if (rc_tokenizer != PARSER_OK) return (rc_tokenizer); + + salt->salt_iter = ROUNDS_SHA512CRYPT; + + if (token.opt_len != -1) + { + salt->salt_iter = hc_strtoul ((const char *) token.opt_buf + 7, NULL, 10); // 7 = "rounds=" + } + + const u8 *salt_pos = token.buf[1]; + const int salt_len = token.len[1]; + + const bool parse_rc = parse_and_store_generic_salt ((u8 *) salt->salt_buf, (int *) &salt->salt_len, salt_pos, salt_len, hashconfig); + + if (parse_rc == false) return (PARSER_SALT_LENGTH); + + const u8 *hash_pos = token.buf[2]; + + sha512crypt_decode ((u8 *) digest, hash_pos); + + return (PARSER_OK); +} + +int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const void *digest_buf, MAYBE_UNUSED const salt_t *salt, MAYBE_UNUSED const void *esalt_buf, MAYBE_UNUSED const hashinfo_t *hash_info, char *line_buf, MAYBE_UNUSED const int line_size) +{ + u8 tmp[100] = { 0 }; + + sha512crypt_encode (digest_buf, tmp); + + int line_len = 0; + + if (salt->salt_iter == ROUNDS_SHA512CRYPT) + { + line_len = snprintf (line_buf, line_size, "$6$%s$%s", (char *) salt->salt_buf, tmp); + } + else + { + line_len = snprintf (line_buf, line_size, "$6$rounds=%u$%s$%s", salt->salt_iter, (char *) salt->salt_buf, tmp); + } + + return line_len; +} + +void module_init (module_ctx_t *module_ctx) +{ + module_ctx->module_context_size = MODULE_CONTEXT_SIZE_CURRENT; + module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT; + + module_ctx->module_attack_exec = module_attack_exec; + module_ctx->module_benchmark_esalt = MODULE_DEFAULT; + module_ctx->module_benchmark_hook_salt = MODULE_DEFAULT; + module_ctx->module_benchmark_mask = MODULE_DEFAULT; + module_ctx->module_benchmark_salt = MODULE_DEFAULT; + module_ctx->module_build_plain_postprocess = MODULE_DEFAULT; + module_ctx->module_deep_comp_kernel = MODULE_DEFAULT; + module_ctx->module_dgst_pos0 = module_dgst_pos0; + module_ctx->module_dgst_pos1 = module_dgst_pos1; + module_ctx->module_dgst_pos2 = module_dgst_pos2; + module_ctx->module_dgst_pos3 = module_dgst_pos3; + module_ctx->module_dgst_size = module_dgst_size; + module_ctx->module_dictstat_disable = MODULE_DEFAULT; + module_ctx->module_esalt_size = MODULE_DEFAULT; + module_ctx->module_extra_buffer_size = MODULE_DEFAULT; + module_ctx->module_forced_outfile_format = MODULE_DEFAULT; + module_ctx->module_hash_binary_count = MODULE_DEFAULT; + module_ctx->module_hash_binary_parse = MODULE_DEFAULT; + module_ctx->module_hash_binary_save = MODULE_DEFAULT; + module_ctx->module_hash_binary_verify = MODULE_DEFAULT; + module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; + module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; + module_ctx->module_hash_decode = module_hash_decode; + module_ctx->module_hash_encode_status = MODULE_DEFAULT; + module_ctx->module_hash_encode = module_hash_encode; + module_ctx->module_hash_init_selftest = MODULE_DEFAULT; + module_ctx->module_hash_mode = MODULE_DEFAULT; + module_ctx->module_hash_category = module_hash_category; + module_ctx->module_hash_name = module_hash_name; + module_ctx->module_hash_type = module_hash_type; + module_ctx->module_hlfmt_disable = MODULE_DEFAULT; + module_ctx->module_hook12 = MODULE_DEFAULT; + module_ctx->module_hook23 = MODULE_DEFAULT; + module_ctx->module_hook_salt_size = MODULE_DEFAULT; + module_ctx->module_hook_size = MODULE_DEFAULT; + module_ctx->module_jit_build_options = MODULE_DEFAULT; + module_ctx->module_kernel_accel_max = MODULE_DEFAULT; + module_ctx->module_kernel_accel_min = MODULE_DEFAULT; + module_ctx->module_kernel_loops_max = MODULE_DEFAULT; + module_ctx->module_kernel_loops_min = MODULE_DEFAULT; + module_ctx->module_kernel_threads_max = MODULE_DEFAULT; + module_ctx->module_kernel_threads_min = MODULE_DEFAULT; + module_ctx->module_kern_type = module_kern_type; + module_ctx->module_opti_type = module_opti_type; + module_ctx->module_opts_type = module_opts_type; + module_ctx->module_outfile_check_disable = MODULE_DEFAULT; + module_ctx->module_outfile_check_nocomp = MODULE_DEFAULT; + module_ctx->module_potfile_disable = MODULE_DEFAULT; + module_ctx->module_potfile_keep_all_hashes = MODULE_DEFAULT; + module_ctx->module_pwdump_column = MODULE_DEFAULT; + module_ctx->module_pw_max = module_pw_max; + module_ctx->module_pw_min = MODULE_DEFAULT; + module_ctx->module_salt_max = MODULE_DEFAULT; + module_ctx->module_salt_min = MODULE_DEFAULT; + module_ctx->module_salt_type = module_salt_type; + module_ctx->module_separator = MODULE_DEFAULT; + module_ctx->module_st_hash = module_st_hash; + module_ctx->module_st_pass = module_st_pass; + module_ctx->module_tmp_size = module_tmp_size; + module_ctx->module_unstable_warning = MODULE_DEFAULT; + module_ctx->module_warmup_disable = MODULE_DEFAULT; +} diff --git a/tools/test_modules/m01800.pm b/tools/test_modules/m01800.pm new file mode 100644 index 000000000..250062190 --- /dev/null +++ b/tools/test_modules/m01800.pm @@ -0,0 +1,260 @@ +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## + +use strict; +use warnings; + +use Digest::SHA qw (sha512); + +sub module_constraints { [[0, 255], [0, 16], [0, 15], [0, 16], [-1, -1]] } + +sub module_generate_hash +{ + my $word = shift; + my $salt = shift; + my $iter = shift; + + my $iterations = 5000; + + if (defined ($iter)) + { + if ($iter > 0) + { + $iterations = int ($iter); + } + } + + my $hash_buf = sha512_crypt ('$6$', $iterations, $word, $salt); + + return $hash_buf; +} + +sub module_verify_hash +{ + my $line = shift; + + my ($hash, $word) = split (':', $line); + + return unless defined $hash; + return unless defined $word; + + my $index1 = index ($hash, ',', 1); + my $index2 = index ($hash, '$', 1); + + if ($index1 != -1) + { + if ($index1 < $index2) + { + $index2 = $index1; + } + } + + $index2++; + + # rounds= if available + my $iter = 0; + + if (substr ($hash, $index2, 7) eq "rounds=") + { + my $old_index = $index2; + + $index2 = index ($hash, '$', $index2 + 1); + + next if $index2 < 1; + + $iter = substr ($hash, $old_index + 7, $index2 - $old_index - 7); + + $index2++; + } + + # get salt + my $index3 = rindex ($hash, '$'); + + next if $index3 < 1; + + my $salt = substr ($hash, $index2, $index3 - $index2); + + my $word_packed = pack_if_HEX_notation ($word); + + my $new_hash = module_generate_hash ($word_packed, $salt, $iter); + + return ($new_hash, $word); +} + +sub sha512_crypt +{ + my $magic = shift; + my $iter = shift; + my $pass = shift; + my $salt = shift; + + my $hash = ""; # hash to be returned by this function + + my $final = sha512 ($pass . $salt . $pass); + + $salt = substr ($salt, 0, 16); + + my $tmp = $pass . $salt; + + my $pass_len = length ($pass); + my $salt_len = length ($salt); + + my $i; + + for ($i = $pass_len; $i > 0; $i -= 16) + { + my $len = 16; + + if ($i < $len) + { + $len = $i; + } + + $tmp .= substr ($final, 0, $len); + } + + $i = $pass_len; + + while ($i > 0) + { + if ($i & 1) + { + $tmp .= $final; + } + else + { + $tmp .= $pass; + } + + $i >>= 1; + } + + $final = sha512 ($tmp); + + # p_bytes + + my $p_bytes = ""; + + for ($i = 0; $i < $pass_len; $i++) + { + $p_bytes .= $pass; + } + + $p_bytes = sha512 ($p_bytes); + $p_bytes = substr ($p_bytes, 0, $pass_len); + + # s_bytes + + my $final_first_byte = ord (substr ($final, 0, 1)); + + my $s_bytes = ""; + + for ($i = 0; $i < (16 + $final_first_byte); $i++) + { + $s_bytes .= $salt; + } + + $s_bytes = sha512 ($s_bytes); + $s_bytes = substr ($s_bytes, 0, $salt_len); + + for ($i = 0; $i < $iter; $i++) + { + $tmp = ""; + + if ($i & 1) + { + $tmp .= $p_bytes; + } + else + { + $tmp .= $final; + } + + if ($i % 3) + { + $tmp .= $s_bytes; + } + + if ($i % 7) + { + $tmp .= $p_bytes; + } + + if ($i & 1) + { + $tmp .= $final; + } + else + { + $tmp .= $p_bytes; + } + + $final = sha512 ($tmp); + } + + # done + # now format the output string ("hash") + + my $hash_buf; + + $hash .= to64 ((ord (substr ($final, 0, 1)) << 16) | (ord (substr ($final, 21, 1)) << 8) | (ord (substr ($final, 42, 1))), 4); + $hash .= to64 ((ord (substr ($final, 22, 1)) << 16) | (ord (substr ($final, 43, 1)) << 8) | (ord (substr ($final, 1, 1))), 4); + $hash .= to64 ((ord (substr ($final, 44, 1)) << 16) | (ord (substr ($final, 2, 1)) << 8) | (ord (substr ($final, 23, 1))), 4); + $hash .= to64 ((ord (substr ($final, 3, 1)) << 16) | (ord (substr ($final, 24, 1)) << 8) | (ord (substr ($final, 45, 1))), 4); + $hash .= to64 ((ord (substr ($final, 25, 1)) << 16) | (ord (substr ($final, 46, 1)) << 8) | (ord (substr ($final, 4, 1))), 4); + $hash .= to64 ((ord (substr ($final, 47, 1)) << 16) | (ord (substr ($final, 5, 1)) << 8) | (ord (substr ($final, 26, 1))), 4); + $hash .= to64 ((ord (substr ($final, 6, 1)) << 16) | (ord (substr ($final, 27, 1)) << 8) | (ord (substr ($final, 48, 1))), 4); + $hash .= to64 ((ord (substr ($final, 28, 1)) << 16) | (ord (substr ($final, 49, 1)) << 8) | (ord (substr ($final, 7, 1))), 4); + $hash .= to64 ((ord (substr ($final, 50, 1)) << 16) | (ord (substr ($final, 8, 1)) << 8) | (ord (substr ($final, 29, 1))), 4); + $hash .= to64 ((ord (substr ($final, 9, 1)) << 16) | (ord (substr ($final, 30, 1)) << 8) | (ord (substr ($final, 51, 1))), 4); + $hash .= to64 ((ord (substr ($final, 31, 1)) << 16) | (ord (substr ($final, 52, 1)) << 8) | (ord (substr ($final, 10, 1))), 4); + $hash .= to64 ((ord (substr ($final, 53, 1)) << 16) | (ord (substr ($final, 11, 1)) << 8) | (ord (substr ($final, 32, 1))), 4); + $hash .= to64 ((ord (substr ($final, 12, 1)) << 16) | (ord (substr ($final, 33, 1)) << 8) | (ord (substr ($final, 54, 1))), 4); + $hash .= to64 ((ord (substr ($final, 34, 1)) << 16) | (ord (substr ($final, 55, 1)) << 8) | (ord (substr ($final, 13, 1))), 4); + $hash .= to64 ((ord (substr ($final, 56, 1)) << 16) | (ord (substr ($final, 14, 1)) << 8) | (ord (substr ($final, 35, 1))), 4); + $hash .= to64 ((ord (substr ($final, 15, 1)) << 16) | (ord (substr ($final, 36, 1)) << 8) | (ord (substr ($final, 57, 1))), 4); + $hash .= to64 ((ord (substr ($final, 37, 1)) << 16) | (ord (substr ($final, 58, 1)) << 8) | (ord (substr ($final, 16, 1))), 4); + $hash .= to64 ((ord (substr ($final, 59, 1)) << 16) | (ord (substr ($final, 17, 1)) << 8) | (ord (substr ($final, 38, 1))), 4); + $hash .= to64 ((ord (substr ($final, 18, 1)) << 16) | (ord (substr ($final, 39, 1)) << 8) | (ord (substr ($final, 60, 1))), 4); + $hash .= to64 ((ord (substr ($final, 40, 1)) << 16) | (ord (substr ($final, 61, 1)) << 8) | (ord (substr ($final, 19, 1))), 4); + $hash .= to64 ((ord (substr ($final, 62, 1)) << 16) | (ord (substr ($final, 20, 1)) << 8) | (ord (substr ($final, 41, 1))), 4); + $hash .= to64 (ord (substr ($final, 63, 1)), 2); + + if ($iter == 5000) # default + { + $hash_buf = sprintf ("%s%s\$%s", $magic, $salt , $hash); + } + else + { + $hash_buf = sprintf ("%srounds=%i\$%s\$%s", $magic, $iter, $salt , $hash); + } + + return $hash_buf; +} + +sub to64 +{ + my $v = shift; + my $n = shift; + + my $itoa64 = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; + + my $ret = ""; + + while (($n - 1) >= 0) + { + $n = $n - 1; + + $ret .= substr ($itoa64, $v & 0x3f, 1); + + $v = $v >> 6; + } + + return $ret +} + +1;