Permalink
Browse files

added -m 14700 = iTunes Backup < 10.0

  • Loading branch information...
philsmd committed Jan 25, 2017
1 parent 55f4d63 commit 9327475b41d4ac1dde40ba0ef1a9ef097f2b7216
Showing with 2,331 additions and 44 deletions.
  1. +9 −0 OpenCL/inc_types.cl
  2. +1,749 −0 OpenCL/m14700.cl
  3. +1 −0 docs/changes.txt
  4. +15 −0 include/interface.h
  5. +315 −40 src/interface.c
  6. +1 −0 src/usage.c
  7. +239 −2 tools/test.pl
  8. +2 −2 tools/test.sh
View
@@ -739,6 +739,15 @@ typedef struct luks
} luks_t;
typedef struct itunes_backup
{
u32 wpky[10];
u32 dpic;
u32 dpsl[5];
} itunes_backup_t;
typedef struct luks_tmp
{
union
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -12,6 +12,7 @@
##
- Added hash-mode 14600 = LUKS
- Added hash-mode 14700 = iTunes Backup < 10.0
##
## Workarounds
View
@@ -122,6 +122,15 @@ typedef struct luks
} luks_t;
typedef struct itunes_backup
{
u32 wpky[10];
u32 dpic;
u32 dpsl[5];
} itunes_backup_t;
typedef struct luks_tmp
{
union
@@ -1139,6 +1148,8 @@ typedef enum display_len
DISPLAY_LEN_MAX_14100 = 16 + 1 + 16,
DISPLAY_LEN_MIN_14400 = 40 + 1 + 20,
DISPLAY_LEN_MAX_14400 = 40 + 1 + 20,
DISPLAY_LEN_MIN_14700 = 8 + 1 + 1 + 1 + 80 + 1 + 1 + 1 + 40 + 1,
DISPLAY_LEN_MAX_14700 = 8 + 1 + 2 + 1 + 80 + 1 + 6 + 1 + 40 + 1 + 9 + 1 + 40,
DISPLAY_LEN_MIN_99999 = 1,
DISPLAY_LEN_MAX_99999 = 55,
@@ -1266,6 +1277,7 @@ typedef enum hash_type
HASH_TYPE_DES = 53,
HASH_TYPE_PLAINTEXT = 54,
HASH_TYPE_LUKS = 55,
HASH_TYPE_ITUNES_BACKUP_9 = 56,
} hash_type_t;
@@ -1445,6 +1457,7 @@ typedef enum kern_type
KERN_TYPE_LUKS_WHIRLPOOL_AES = 14651,
KERN_TYPE_LUKS_WHIRLPOOL_SERPENT = 14652,
KERN_TYPE_LUKS_WHIRLPOOL_TWOFISH = 14653,
KERN_TYPE_ITUNES_BACKUP_9 = 14700,
KERN_TYPE_PLAINTEXT = 99999,
} kern_type_t;
@@ -1509,6 +1522,7 @@ typedef enum rounds_count
ROUNDS_KEEPASS = 6000,
ROUNDS_ZIP2 = 1000,
ROUNDS_LUKS = 163044, // this equal to jtr -test
ROUNDS_ITUNES_BACKUP = 10000,
ROUNDS_STDOUT = 0
} rounds_count_t;
@@ -1676,6 +1690,7 @@ int opencart_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_bu
int plaintext_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig);
int sha1cx_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig);
int luks_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED hashconfig_t *hashconfig, const int keyslot_idx);
int itunes_backup_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig);
/**
* hook functions
Oops, something went wrong.

0 comments on commit 9327475

Please sign in to comment.