From 19ec4340e3b6661c0f37f3bccab256bb1c592d4f Mon Sep 17 00:00:00 2001 From: jsteube Date: Mon, 11 Feb 2019 11:07:08 +0100 Subject: [PATCH] Add -m 16200 module --- include/interface_migrate.h | 21 --- src/interface_migrate.c | 166 -------------------- src/modules/module_16200.c | 291 ++++++++++++++++++++++++++++++++++++ 3 files changed, 291 insertions(+), 187 deletions(-) create mode 100644 src/modules/module_16200.c diff --git a/include/interface_migrate.h b/include/interface_migrate.h index 23d63edab..90a1e10ba 100644 --- a/include/interface_migrate.h +++ b/include/interface_migrate.h @@ -28,15 +28,6 @@ typedef struct ethereum_presale } ethereum_presale_t; -typedef struct apple_secure_notes -{ - u32 Z_PK; - u32 ZCRYPTOITERATIONCOUNT; - u32 ZCRYPTOSALT[16]; - u32 ZCRYPTOWRAPPEDKEY[16]; - -} apple_secure_notes_t; - typedef struct jwt { u32 salt_buf[1024]; @@ -79,16 +70,6 @@ typedef struct cram_md5 } cram_md5_t; -typedef struct apple_secure_notes_tmp -{ - u32 ipad[8]; - u32 opad[8]; - - u32 dgst[8]; - u32 out[8]; - -} apple_secure_notes_tmp_t; - typedef enum kern_type { KERN_TYPE_MD5_SLTPW = 20, @@ -143,7 +124,6 @@ typedef enum kern_type KERN_TYPE_OPENCART = 13900, KERN_TYPE_SHA1CX = 14400, KERN_TYPE_JKS_SHA1 = 15500, - KERN_TYPE_APPLE_SECURE_NOTES = 16200, KERN_TYPE_ETHEREUM_PRESALE = 16300, KERN_TYPE_CRAM_MD5_DOVECOT = 16400, KERN_TYPE_JWT_HS256 = 16511, @@ -162,7 +142,6 @@ typedef enum rounds_count ROUNDS_LIBREOFFICE = 100000, ROUNDS_OPENOFFICE = 1024, ROUNDS_KEEPASS = 6000, - ROUNDS_APPLE_SECURE_NOTES = 20000, ROUNDS_ETHEREUM_PRESALE = 2000 - 1, } rounds_count_t; diff --git a/src/interface_migrate.c b/src/interface_migrate.c index 0ed9faf10..5d2431060 100644 --- a/src/interface_migrate.c +++ b/src/interface_migrate.c @@ -71,7 +71,6 @@ " 9900 | Radmin2 | Operating Systems", " 125 | ArubaOS | Operating Systems", " 133 | PeopleSoft | Enterprise Application Software (EAS)", - " 16200 | Apple Secure Notes | Documents", " 16600 | Electrum Wallet (Salt-Type 1-2) | Password Managers", " 15500 | JKS Java Key Store Private Keys (SHA1) | Password Managers", " 16300 | Ethereum Pre-Sale Wallet, PBKDF2-HMAC-SHA256 | Password Managers", @@ -154,7 +153,6 @@ static const char *ST_HASH_11860 = "bebf6831b3f9f958acb345a88cb98f30cb0374cff13e static const char *ST_HASH_13900 = "058c1c3773340c8563421e2b17e60eb7c916787e:827500576"; static const char *ST_HASH_14400 = "fcdc7ec700b887e8eaebf94c2ec52aebb5521223:63038426024388230227"; static const char *ST_HASH_15500 = "$jksprivk$*338BD2FBEBA7B3EF198A4CBFC6E18AFF1E229367*5225850113575146134463704406336350011656*D5253EB151EB92DC73E542D8C0A4D7A848A5B0C0E370E625E6547D4E6F23416FC85A27BC295731B8021CDFBD003551C66C434FFBC87DACAD1FDF39022320034A2F86E779F2B1B3325428A666518FA89507AD63E15FD9C57B9E36EF5B642A2F448A9A3F09B79AD93D65F46B8692CD07539FD140146F8F219DC262971AF019E18EDC16C3C240569E1673F4D98BC818CCF28298D5A7BFF038A663DD10FE5E48643C3217C237D342164E2D41EF15075431FBD5B34800E5AE7EB80FAA5AE9982A55F35379AA7B31217E7F1C5F1964A15024A305AE4B3981FE1C80C163BC38ECA5581F11867E5C34C5D124D0367B3737E5E5BB14D2CAB26A698C8DAAB755C82BA6B823BCAECDD4A89C831651ACE5A6029FD0D3515C5D1D53AD8B9062CE8C445373862035CBBF60D490CA2E4975EE6E0358EC32E871FAB15347E3032E21F30F543BAAB01D779BA833CA0B8C7591B42C7C59A8FDD46D7DECEC0E91ADBF331177605E7830ABED62FAD7D5D806D8EFD01C38765940B7F97168FC72C39BF4C98F944FFC310CA8F4EB1D0F960F352CC5E2BB23A1EB221072A5471EDA2CE81C04595B8D37088CFB5C14F6A4A881AD12125DEFBB8154EB4C130AB7FD9933FD36DF1A6A26B51AB169866788678FCED988C8E017CA84354F487A5508210181AFB8B3AD0753E3E28BE674DFBD4E4FBDFD1E30D592F4EA3A77A2F0F5CF9A175DBC590EF5D42971A39918F12B92DCD8BFD56BE9A3459856B5587603C7B53062663A4C8894BBC9894FB1663BF30F32D907664328138B7A50EAC7F8E3183D74562A5C90FE1889AC4C5FE43EBEB8974563B6682F92591ECA4FA0DA72236C3851DA102DB6BA0CC07BFD32F7E962AB0EDCF4A8DEA6525174F5BB5C021E2A9A3F7F761E9CA90B6E27FB7E55CD91DA184FAC5E534E8AD25314C56CE5796506A0CA70881782F9C5147D87705065D68BD67D2B0344205BA6445D562273690004CA5A303274FB283A75F49BA968D7947943AA98F2AF9CB8253B425B86225E7395A331AC4CB1B1700C64D4F458D5D642C54148AE6DA41D9E26657D331B157D76042C2CF3057B83997C23D8BF68FB3C7337CAFB8B324AD0DF7A80B554B4D7F9AD6ED527E7932F1741A573C152A41610F6517E3F4A3BC6B66685871A7CE3795C559BD47CDB8E34CB2C1DFE980518D79E2078C258C54F312EB38609F640E7DC013E0F2A16A25BB5971882B4308D27930CA99FEC231AE927B62215A1B56098C362B7F20593953B29428681875070E84BF5B60BEA3948127151634123DA77C814AAD54CE10905763C8C19BC191C0C40458C809402E1957C4C05C4EAE27576B2D30593F7FDCC9A248DB5DB23CF2FA22A92C016090F611690BF0AB5B8B2866ED25F345EFE85DF3311C9E91C37CEE709CF16E7CB09D01BECD2961D094C02D42EC85BF47FAB1B67A13B9A1741C15F7156D57A71BFFABB03B71E69707913A5C136B3D69CE3F71ABFE376F0A21D723FFA2E60AC180689D3E8AF4348C9F555CD897387327FC8BA2B9C51A7298547E556A11A60441EF5331A1BFB847A3D23DD9F7C50E636A2C6309BC82E1A8852F5A8569B6D93*14*78D6A2424484CF5149932B7EA8BF*test"; -static const char *ST_HASH_16200 = "$ASN$*1*20000*80771171105233481004850004085037*d04b17af7f6b184346aad3efefe8bec0987ee73418291a41"; static const char *ST_HASH_16300 = "$ethereum$w*e94a8e49deac2d62206bf9bfb7d2aaea7eb06c1a378cfc1ac056cc599a569793c0ecc40e6a0c242dee2812f06b644d70f43331b1fa2ce4bd6cbb9f62dd25b443235bdb4c1ffb222084c9ded8c719624b338f17e0fd827b34d79801298ac75f74ed97ae16f72fccecf862d09a03498b1b8bd1d984fc43dd507ede5d4b6223a582352386407266b66c671077eefc1e07b5f42508bf926ab5616658c984968d8eec25c9d5197a4a30eed54c161595c3b4d558b17ab8a75ccca72b3d949919d197158ea5cfbc43ac7dd73cf77807dc2c8fe4ef1e942ccd11ec24fe8a410d48ef4b8a35c93ecf1a21c51a51a08f3225fbdcc338b1e7fdafd7d94b82a81d88c2e9a429acc3f8a5974eafb7af8c912597eb6fdcd80578bd12efddd99de47b44e7c8f6c38f2af3116b08796172eda89422e9ea9b99c7f98a7e331aeb4bb1b06f611e95082b629332c31dbcfd878aed77d300c9ed5c74af9cd6f5a8c4a261dd124317fb790a04481d93aec160af4ad8ec84c04d943a869f65f07f5ccf8295dc1c876f30408eac77f62192cbb25842470b4a5bdb4c8096f56da7e9ed05c21f61b94c54ef1c2e9e417cce627521a40a99e357dd9b7a7149041d589cbacbe0302db57ddc983b9a6d79ce3f2e9ae8ad45fa40b934ed6b36379b780549ae7553dbb1cab238138c05743d0103335325bd90e27d8ae1ea219eb8905503c5ad54fa12d22e9a7d296eee07c8a7b5041b8d56b8af290274d01eb0e4ad174eb26b23b5e9fb46ff7f88398e6266052292acb36554ccb9c2c03139fe72d3f5d30bd5d10bd79d7cb48d2ab24187d8efc3750d5a24980fb12122591455d14e75421a2074599f1cc9fdfc8f498c92ad8b904d3c4307f80c46921d8128*f3abede76ac15228f1b161dd9660bb9094e81b1b*d201ccd492c284484c7824c4d37b1593"; static const char *ST_HASH_16400 = "{CRAM-MD5}5389b33b9725e5657cb631dc50017ff100000000000000000000000000000000"; static const char *ST_HASH_16600 = "$electrum$1*44358283104603165383613672586868*c43a6632d9f59364f74c395a03d8c2ea"; @@ -210,7 +208,6 @@ static const char *HT_11860 = "HMAC-Streebog-512 (key = $salt), big-endian"; static const char *HT_13900 = "OpenCart"; static const char *HT_14400 = "sha1(CX)"; static const char *HT_15500 = "JKS Java Key Store Private Keys (SHA1)"; -static const char *HT_16200 = "Apple Secure Notes"; static const char *HT_16300 = "Ethereum Pre-Sale Wallet, PBKDF2-HMAC-SHA256"; static const char *HT_16400 = "CRAM-MD5 Dovecot"; static const char *HT_16500 = "JWT (JSON Web Token)"; @@ -258,7 +255,6 @@ static const char *SIGNATURE_SSHA1B64_upper = "{SSHA}"; static const char *SIGNATURE_JKS_SHA1 = "$jksprivk$"; static const char *SIGNATURE_ETHEREUM_PRESALE = "$ethereum$w"; static const char *SIGNATURE_ELECTRUM_WALLET = "$electrum$"; -static const char *SIGNATURE_APPLE_SECURE_NOTES = "$ASN$"; /** * decoder / encoder @@ -4033,128 +4029,6 @@ int jks_sha1_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_U return (PARSER_OK); } -int apple_secure_notes_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED hashconfig_t *hashconfig) -{ - u32 *digest = (u32 *) hash_buf->digest; - - salt_t *salt = hash_buf->salt; - - apple_secure_notes_t *apple_secure_notes = (apple_secure_notes_t *) hash_buf->esalt; - - token_t token; - - token.token_cnt = 5; - - token.signatures_cnt = 1; - token.signatures_buf[0] = SIGNATURE_APPLE_SECURE_NOTES; - - token.sep[0] = '*'; - token.len_min[0] = 5; - token.len_max[0] = 5; - token.attr[0] = TOKEN_ATTR_VERIFY_LENGTH - | TOKEN_ATTR_VERIFY_SIGNATURE; - - token.sep[1] = '*'; - token.len_min[1] = 1; - token.len_max[1] = 10; - token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH - | TOKEN_ATTR_VERIFY_DIGIT; - - token.sep[2] = '*'; - token.len_min[2] = 1; - token.len_max[2] = 6; - token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH - | TOKEN_ATTR_VERIFY_DIGIT; - - token.sep[3] = '*'; - token.len_min[3] = 32; - token.len_max[3] = 32; - token.attr[3] = TOKEN_ATTR_VERIFY_LENGTH - | TOKEN_ATTR_VERIFY_HEX; - - token.sep[4] = '*'; - token.len_min[4] = 48; - token.len_max[4] = 48; - token.attr[4] = TOKEN_ATTR_VERIFY_LENGTH - | TOKEN_ATTR_VERIFY_HEX; - - const int rc_tokenizer = input_tokenizer (input_buf, input_len, &token); - - if (rc_tokenizer != PARSER_OK) return (rc_tokenizer); - - /** - * parse line - */ - - // Z_PK - - const u8 *Z_PK_pos = token.buf[1]; - - const u32 Z_PK = hc_strtoul ((const char *) Z_PK_pos, NULL, 10); - - apple_secure_notes->Z_PK = Z_PK; - - // ZCRYPTOITERATIONCOUNT - - const u8 *ZCRYPTOITERATIONCOUNT_pos = token.buf[2]; - - const u32 ZCRYPTOITERATIONCOUNT = hc_strtoul ((const char *) ZCRYPTOITERATIONCOUNT_pos, NULL, 10); - - apple_secure_notes->ZCRYPTOITERATIONCOUNT = ZCRYPTOITERATIONCOUNT; - - // ZCRYPTOSALT - - const u8 *ZCRYPTOSALT_pos = token.buf[3]; - - apple_secure_notes->ZCRYPTOSALT[ 0] = hex_to_u32 ((const u8 *) &ZCRYPTOSALT_pos[ 0]); - apple_secure_notes->ZCRYPTOSALT[ 1] = hex_to_u32 ((const u8 *) &ZCRYPTOSALT_pos[ 8]); - apple_secure_notes->ZCRYPTOSALT[ 2] = hex_to_u32 ((const u8 *) &ZCRYPTOSALT_pos[16]); - apple_secure_notes->ZCRYPTOSALT[ 3] = hex_to_u32 ((const u8 *) &ZCRYPTOSALT_pos[24]); - apple_secure_notes->ZCRYPTOSALT[ 4] = 0; - apple_secure_notes->ZCRYPTOSALT[ 5] = 0; - apple_secure_notes->ZCRYPTOSALT[ 6] = 0; - apple_secure_notes->ZCRYPTOSALT[ 7] = 0; - apple_secure_notes->ZCRYPTOSALT[ 8] = 0; - apple_secure_notes->ZCRYPTOSALT[ 9] = 0; - apple_secure_notes->ZCRYPTOSALT[10] = 0; - apple_secure_notes->ZCRYPTOSALT[11] = 0; - apple_secure_notes->ZCRYPTOSALT[12] = 0; - apple_secure_notes->ZCRYPTOSALT[13] = 0; - apple_secure_notes->ZCRYPTOSALT[14] = 0; - apple_secure_notes->ZCRYPTOSALT[15] = 0; - - // ZCRYPTOWRAPPEDKEY - - const u8 *ZCRYPTOWRAPPEDKEY_pos = token.buf[4]; - - apple_secure_notes->ZCRYPTOWRAPPEDKEY[0] = hex_to_u32 ((const u8 *) &ZCRYPTOWRAPPEDKEY_pos[ 0]); - apple_secure_notes->ZCRYPTOWRAPPEDKEY[1] = hex_to_u32 ((const u8 *) &ZCRYPTOWRAPPEDKEY_pos[ 8]); - apple_secure_notes->ZCRYPTOWRAPPEDKEY[2] = hex_to_u32 ((const u8 *) &ZCRYPTOWRAPPEDKEY_pos[16]); - apple_secure_notes->ZCRYPTOWRAPPEDKEY[3] = hex_to_u32 ((const u8 *) &ZCRYPTOWRAPPEDKEY_pos[24]); - apple_secure_notes->ZCRYPTOWRAPPEDKEY[4] = hex_to_u32 ((const u8 *) &ZCRYPTOWRAPPEDKEY_pos[32]); - apple_secure_notes->ZCRYPTOWRAPPEDKEY[5] = hex_to_u32 ((const u8 *) &ZCRYPTOWRAPPEDKEY_pos[40]); - - // fake salt - - salt->salt_buf[0] = apple_secure_notes->ZCRYPTOSALT[0]; - salt->salt_buf[1] = apple_secure_notes->ZCRYPTOSALT[1]; - salt->salt_buf[2] = apple_secure_notes->ZCRYPTOSALT[2]; - salt->salt_buf[3] = apple_secure_notes->ZCRYPTOSALT[3]; - salt->salt_buf[4] = apple_secure_notes->Z_PK; - - salt->salt_iter = apple_secure_notes->ZCRYPTOITERATIONCOUNT - 1; - salt->salt_len = 20; - - // fake hash - - digest[0] = apple_secure_notes->ZCRYPTOWRAPPEDKEY[0]; - digest[1] = apple_secure_notes->ZCRYPTOWRAPPEDKEY[1]; - digest[2] = apple_secure_notes->ZCRYPTOWRAPPEDKEY[2]; - digest[3] = apple_secure_notes->ZCRYPTOWRAPPEDKEY[3]; - - return (PARSER_OK); -} - int ethereum_presale_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED hashconfig_t *hashconfig) { u32 *digest = (u32 *) hash_buf->digest; @@ -5034,27 +4908,6 @@ int ascii_digest (hashcat_ctx_t *hashcat_ctx, char *out_buf, const int out_size, (char *) jks_sha1->alias ); } - else if (hash_mode == 16200) - { - apple_secure_notes_t *apple_secure_notess = (apple_secure_notes_t *) esalts_buf; - - apple_secure_notes_t *apple_secure_notes = &apple_secure_notess[digest_cur]; - - snprintf (out_buf, out_size, "%s*%u*%u*%08x%08x%08x%08x*%08x%08x%08x%08x%08x%08x", - SIGNATURE_APPLE_SECURE_NOTES, - apple_secure_notes->Z_PK, - apple_secure_notes->ZCRYPTOITERATIONCOUNT, - byte_swap_32 (apple_secure_notes->ZCRYPTOSALT[0]), - byte_swap_32 (apple_secure_notes->ZCRYPTOSALT[1]), - byte_swap_32 (apple_secure_notes->ZCRYPTOSALT[2]), - byte_swap_32 (apple_secure_notes->ZCRYPTOSALT[3]), - byte_swap_32 (apple_secure_notes->ZCRYPTOWRAPPEDKEY[0]), - byte_swap_32 (apple_secure_notes->ZCRYPTOWRAPPEDKEY[1]), - byte_swap_32 (apple_secure_notes->ZCRYPTOWRAPPEDKEY[2]), - byte_swap_32 (apple_secure_notes->ZCRYPTOWRAPPEDKEY[3]), - byte_swap_32 (apple_secure_notes->ZCRYPTOWRAPPEDKEY[4]), - byte_swap_32 (apple_secure_notes->ZCRYPTOWRAPPEDKEY[5])); - } else if (hash_mode == 16300) { ethereum_presale_t *ethereum_presales = (ethereum_presale_t *) esalts_buf; @@ -6871,23 +6724,6 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx) hashconfig->st_pass = ST_PASS_HASHCAT_PLAIN; break; - case 16200: hashconfig->hash_type = HASH_TYPE_APPLE_SECURE_NOTES; - hashconfig->salt_type = SALT_TYPE_EMBEDDED; - hashconfig->attack_exec = ATTACK_EXEC_OUTSIDE_KERNEL; - hashconfig->opts_type = OPTS_TYPE_PT_GENERATE_LE; - hashconfig->kern_type = KERN_TYPE_APPLE_SECURE_NOTES; - hashconfig->dgst_size = DGST_SIZE_4_4; // originally DGST_SIZE_4_2 - hashconfig->parse_func = apple_secure_notes_parse_hash; - hashconfig->opti_type = OPTI_TYPE_ZERO_BYTE - | OPTI_TYPE_SLOW_HASH_SIMD_LOOP; - hashconfig->dgst_pos0 = 0; - hashconfig->dgst_pos1 = 1; - hashconfig->dgst_pos2 = 2; - hashconfig->dgst_pos3 = 3; - hashconfig->st_hash = ST_HASH_16200; - hashconfig->st_pass = ST_PASS_HASHCAT_PLAIN; - break; - case 16300: hashconfig->hash_type = HASH_TYPE_PBKDF2_SHA256; hashconfig->salt_type = SALT_TYPE_EMBEDDED; hashconfig->attack_exec = ATTACK_EXEC_OUTSIDE_KERNEL; @@ -6974,7 +6810,6 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx) { case 10200: hashconfig->esalt_size = sizeof (cram_md5_t); break; case 15500: hashconfig->esalt_size = sizeof (jks_sha1_t); break; - case 16200: hashconfig->esalt_size = sizeof (apple_secure_notes_t); break; case 16300: hashconfig->esalt_size = sizeof (ethereum_presale_t); break; case 16500: hashconfig->esalt_size = sizeof (jwt_t); break; case 16600: hashconfig->esalt_size = sizeof (electrum_wallet_t); break; @@ -6985,7 +6820,6 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx) switch (hashconfig->hash_mode) { case 10200: hashconfig->tmp_size = sizeof (cram_md5_t); break; - case 16200: hashconfig->tmp_size = sizeof (apple_secure_notes_tmp_t); break; case 16300: hashconfig->tmp_size = sizeof (pbkdf2_sha256_tmp_t); break; }; } diff --git a/src/modules/module_16200.c b/src/modules/module_16200.c new file mode 100644 index 000000000..14b120b9c --- /dev/null +++ b/src/modules/module_16200.c @@ -0,0 +1,291 @@ +/** + * 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_4_4; // originally DGST_SIZE_4_; +static const u32 HASH_CATEGORY = HASH_CATEGORY_DOCUMENTS; +static const char *HASH_NAME = "Apple Secure Notes"; +static const u32 HASH_TYPE = HASH_TYPE_GENERIC; +static const u64 KERN_TYPE = 16200; +static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE + | OPTI_TYPE_SLOW_HASH_SIMD_LOOP; +static const u64 OPTS_TYPE = OPTS_TYPE_STATE_BUFFER_LE + | OPTS_TYPE_PT_GENERATE_LE; +static const u32 SALT_TYPE = SALT_TYPE_EMBEDDED; +static const char *ST_PASS = "hashcat"; +static const char *ST_HASH = "$ASN$*1*20000*80771171105233481004850004085037*d04b17af7f6b184346aad3efefe8bec0987ee73418291a41"; + +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 apple_secure_notes +{ + u32 Z_PK; + u32 ZCRYPTOITERATIONCOUNT; + u32 ZCRYPTOSALT[16]; + u32 ZCRYPTOWRAPPEDKEY[16]; + +} apple_secure_notes_t; + +typedef struct apple_secure_notes_tmp +{ + u32 ipad[8]; + u32 opad[8]; + + u32 dgst[8]; + u32 out[8]; + +} apple_secure_notes_tmp_t; + +static const char *SIGNATURE_APPLE_SECURE_NOTES = "$ASN$"; + +u64 module_esalt_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 esalt_size = (const u64) sizeof (apple_secure_notes_t); + + return esalt_size; +} + +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 (apple_secure_notes_tmp_t); + + return tmp_size; +} + +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 void *hook_salt_buf, MAYBE_UNUSED hashinfo_t *hash_info, const char *line_buf, MAYBE_UNUSED const int line_len) +{ + u32 *digest = (u32 *) digest_buf; + + apple_secure_notes_t *apple_secure_notes = (apple_secure_notes_t *) esalt_buf; + + token_t token; + + token.token_cnt = 5; + + token.signatures_cnt = 1; + token.signatures_buf[0] = SIGNATURE_APPLE_SECURE_NOTES; + + token.sep[0] = '*'; + token.len_min[0] = 5; + token.len_max[0] = 5; + token.attr[0] = TOKEN_ATTR_VERIFY_LENGTH + | TOKEN_ATTR_VERIFY_SIGNATURE; + + token.sep[1] = '*'; + token.len_min[1] = 1; + token.len_max[1] = 10; + token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH + | TOKEN_ATTR_VERIFY_DIGIT; + + token.sep[2] = '*'; + token.len_min[2] = 1; + token.len_max[2] = 6; + token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH + | TOKEN_ATTR_VERIFY_DIGIT; + + token.sep[3] = '*'; + token.len_min[3] = 32; + token.len_max[3] = 32; + token.attr[3] = TOKEN_ATTR_VERIFY_LENGTH + | TOKEN_ATTR_VERIFY_HEX; + + token.sep[4] = '*'; + token.len_min[4] = 48; + token.len_max[4] = 48; + token.attr[4] = TOKEN_ATTR_VERIFY_LENGTH + | TOKEN_ATTR_VERIFY_HEX; + + const int rc_tokenizer = input_tokenizer ((const u8 *) line_buf, line_len, &token); + + if (rc_tokenizer != PARSER_OK) return (rc_tokenizer); + + /** + * parse line + */ + + // Z_PK + + const u8 *Z_PK_pos = token.buf[1]; + + const u32 Z_PK = hc_strtoul ((const char *) Z_PK_pos, NULL, 10); + + apple_secure_notes->Z_PK = Z_PK; + + // ZCRYPTOITERATIONCOUNT + + const u8 *ZCRYPTOITERATIONCOUNT_pos = token.buf[2]; + + const u32 ZCRYPTOITERATIONCOUNT = hc_strtoul ((const char *) ZCRYPTOITERATIONCOUNT_pos, NULL, 10); + + apple_secure_notes->ZCRYPTOITERATIONCOUNT = ZCRYPTOITERATIONCOUNT; + + // ZCRYPTOSALT + + const u8 *ZCRYPTOSALT_pos = token.buf[3]; + + apple_secure_notes->ZCRYPTOSALT[ 0] = hex_to_u32 ((const u8 *) &ZCRYPTOSALT_pos[ 0]); + apple_secure_notes->ZCRYPTOSALT[ 1] = hex_to_u32 ((const u8 *) &ZCRYPTOSALT_pos[ 8]); + apple_secure_notes->ZCRYPTOSALT[ 2] = hex_to_u32 ((const u8 *) &ZCRYPTOSALT_pos[16]); + apple_secure_notes->ZCRYPTOSALT[ 3] = hex_to_u32 ((const u8 *) &ZCRYPTOSALT_pos[24]); + apple_secure_notes->ZCRYPTOSALT[ 4] = 0; + apple_secure_notes->ZCRYPTOSALT[ 5] = 0; + apple_secure_notes->ZCRYPTOSALT[ 6] = 0; + apple_secure_notes->ZCRYPTOSALT[ 7] = 0; + apple_secure_notes->ZCRYPTOSALT[ 8] = 0; + apple_secure_notes->ZCRYPTOSALT[ 9] = 0; + apple_secure_notes->ZCRYPTOSALT[10] = 0; + apple_secure_notes->ZCRYPTOSALT[11] = 0; + apple_secure_notes->ZCRYPTOSALT[12] = 0; + apple_secure_notes->ZCRYPTOSALT[13] = 0; + apple_secure_notes->ZCRYPTOSALT[14] = 0; + apple_secure_notes->ZCRYPTOSALT[15] = 0; + + // ZCRYPTOWRAPPEDKEY + + const u8 *ZCRYPTOWRAPPEDKEY_pos = token.buf[4]; + + apple_secure_notes->ZCRYPTOWRAPPEDKEY[0] = hex_to_u32 ((const u8 *) &ZCRYPTOWRAPPEDKEY_pos[ 0]); + apple_secure_notes->ZCRYPTOWRAPPEDKEY[1] = hex_to_u32 ((const u8 *) &ZCRYPTOWRAPPEDKEY_pos[ 8]); + apple_secure_notes->ZCRYPTOWRAPPEDKEY[2] = hex_to_u32 ((const u8 *) &ZCRYPTOWRAPPEDKEY_pos[16]); + apple_secure_notes->ZCRYPTOWRAPPEDKEY[3] = hex_to_u32 ((const u8 *) &ZCRYPTOWRAPPEDKEY_pos[24]); + apple_secure_notes->ZCRYPTOWRAPPEDKEY[4] = hex_to_u32 ((const u8 *) &ZCRYPTOWRAPPEDKEY_pos[32]); + apple_secure_notes->ZCRYPTOWRAPPEDKEY[5] = hex_to_u32 ((const u8 *) &ZCRYPTOWRAPPEDKEY_pos[40]); + + // fake salt + + salt->salt_buf[0] = apple_secure_notes->ZCRYPTOSALT[0]; + salt->salt_buf[1] = apple_secure_notes->ZCRYPTOSALT[1]; + salt->salt_buf[2] = apple_secure_notes->ZCRYPTOSALT[2]; + salt->salt_buf[3] = apple_secure_notes->ZCRYPTOSALT[3]; + salt->salt_buf[4] = apple_secure_notes->Z_PK; + + salt->salt_iter = apple_secure_notes->ZCRYPTOITERATIONCOUNT - 1; + salt->salt_len = 20; + + // fake hash + + digest[0] = apple_secure_notes->ZCRYPTOWRAPPEDKEY[0]; + digest[1] = apple_secure_notes->ZCRYPTOWRAPPEDKEY[1]; + digest[2] = apple_secure_notes->ZCRYPTOWRAPPEDKEY[2]; + digest[3] = apple_secure_notes->ZCRYPTOWRAPPEDKEY[3]; + + 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 void *hook_salt_buf, MAYBE_UNUSED const hashinfo_t *hash_info, char *line_buf, MAYBE_UNUSED const int line_size) +{ + const apple_secure_notes_t *apple_secure_notes = (const apple_secure_notes_t *) esalt_buf; + + const int line_len = snprintf (line_buf, line_size, "%s*%u*%u*%08x%08x%08x%08x*%08x%08x%08x%08x%08x%08x", + SIGNATURE_APPLE_SECURE_NOTES, + apple_secure_notes->Z_PK, + apple_secure_notes->ZCRYPTOITERATIONCOUNT, + byte_swap_32 (apple_secure_notes->ZCRYPTOSALT[0]), + byte_swap_32 (apple_secure_notes->ZCRYPTOSALT[1]), + byte_swap_32 (apple_secure_notes->ZCRYPTOSALT[2]), + byte_swap_32 (apple_secure_notes->ZCRYPTOSALT[3]), + byte_swap_32 (apple_secure_notes->ZCRYPTOWRAPPEDKEY[0]), + byte_swap_32 (apple_secure_notes->ZCRYPTOWRAPPEDKEY[1]), + byte_swap_32 (apple_secure_notes->ZCRYPTOWRAPPEDKEY[2]), + byte_swap_32 (apple_secure_notes->ZCRYPTOWRAPPEDKEY[3]), + byte_swap_32 (apple_secure_notes->ZCRYPTOWRAPPEDKEY[4]), + byte_swap_32 (apple_secure_notes->ZCRYPTOWRAPPEDKEY[5])); + + 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_esalt_size; + module_ctx->module_extra_buffer_size = MODULE_DEFAULT; + module_ctx->module_extra_tmp_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_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_kern_type_dynamic = MODULE_DEFAULT; + 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_DEFAULT; + 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; +}