Added hash-mode 14800 = iTunes Backup >= 10.0

This commit is contained in:
Jens Steube
2017-01-26 21:16:29 +01:00
parent 2f81532d0e
commit 07c89833c9
14 changed files with 2778 additions and 159 deletions
+7 -5
View File
@@ -125,8 +125,6 @@ typedef struct luks
typedef struct itunes_backup
{
u32 wpky[10];
u32 dpic;
u32 dpsl[5];
} itunes_backup_t;
@@ -1148,8 +1146,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_14700 = 15 + 1 + 1 + 1 + 80 + 1 + 1 + 1 + 40 + 1,
DISPLAY_LEN_MAX_14700 = 15 + 1 + 2 + 1 + 80 + 1 + 6 + 1 + 40 + 1 + 9 + 1 + 40,
DISPLAY_LEN_MIN_99999 = 1,
DISPLAY_LEN_MAX_99999 = 55,
@@ -1278,6 +1276,7 @@ typedef enum hash_type
HASH_TYPE_PLAINTEXT = 54,
HASH_TYPE_LUKS = 55,
HASH_TYPE_ITUNES_BACKUP_9 = 56,
HASH_TYPE_ITUNES_BACKUP_10 = 57,
} hash_type_t;
@@ -1458,6 +1457,7 @@ typedef enum kern_type
KERN_TYPE_LUKS_WHIRLPOOL_SERPENT = 14652,
KERN_TYPE_LUKS_WHIRLPOOL_TWOFISH = 14653,
KERN_TYPE_ITUNES_BACKUP_9 = 14700,
KERN_TYPE_ITUNES_BACKUP_10 = 14800,
KERN_TYPE_PLAINTEXT = 99999,
} kern_type_t;
@@ -1522,7 +1522,9 @@ typedef enum rounds_count
ROUNDS_KEEPASS = 6000,
ROUNDS_ZIP2 = 1000,
ROUNDS_LUKS = 163044, // this equal to jtr -test
ROUNDS_ITUNES_BACKUP = 10000,
ROUNDS_ITUNES9_BACKUP = 10000,
ROUNDS_ITUNES101_BACKUP = 10000000, // wtf, i mean, really?
ROUNDS_ITUNES102_BACKUP = 10000,
ROUNDS_STDOUT = 0
} rounds_count_t;
+17 -6
View File
@@ -222,11 +222,13 @@ typedef enum combinator_mode
typedef enum kern_run
{
KERN_RUN_1 = 1000,
KERN_RUN_12 = 1500,
KERN_RUN_2 = 2000,
KERN_RUN_23 = 2500,
KERN_RUN_3 = 3000
KERN_RUN_1 = 1000,
KERN_RUN_12 = 1500,
KERN_RUN_2 = 2000,
KERN_RUN_23 = 2500,
KERN_RUN_3 = 3000,
KERN_RUN_INIT2 = 4000,
KERN_RUN_LOOP2 = 5000
} kern_run_t;
@@ -364,7 +366,9 @@ typedef enum opts_type
OPTS_TYPE_HASH_COPY = (1 << 25),
OPTS_TYPE_HOOK12 = (1 << 26),
OPTS_TYPE_HOOK23 = (1 << 27),
OPTS_TYPE_BINARY_HASHFILE = (1 << 28),
OPTS_TYPE_INIT2 = (1 << 28),
OPTS_TYPE_LOOP2 = (1 << 29),
OPTS_TYPE_BINARY_HASHFILE = (1 << 30),
} opts_type_t;
@@ -647,6 +651,7 @@ typedef struct salt
u32 salt_len;
u32 salt_iter;
u32 salt_iter2;
u32 salt_sign[2];
u32 keccak_mdlen;
@@ -870,6 +875,8 @@ typedef struct hc_device_param
u32 kernel_threads_by_wgs_kernel2;
u32 kernel_threads_by_wgs_kernel23;
u32 kernel_threads_by_wgs_kernel3;
u32 kernel_threads_by_wgs_kernel_init2;
u32 kernel_threads_by_wgs_kernel_loop2;
u32 kernel_threads_by_wgs_kernel_mp;
u32 kernel_threads_by_wgs_kernel_mp_l;
u32 kernel_threads_by_wgs_kernel_mp_r;
@@ -929,6 +936,8 @@ typedef struct hc_device_param
double exec_us_prev1[EXPECTED_ITERATIONS];
double exec_us_prev2[EXPECTED_ITERATIONS];
double exec_us_prev3[EXPECTED_ITERATIONS];
double exec_us_prev_init2[EXPECTED_ITERATIONS];
double exec_us_prev_loop2[EXPECTED_ITERATIONS];
// this is "current" speed
@@ -959,6 +968,8 @@ typedef struct hc_device_param
cl_kernel kernel2;
cl_kernel kernel23;
cl_kernel kernel3;
cl_kernel kernel_init2;
cl_kernel kernel_loop2;
cl_kernel kernel_mp;
cl_kernel kernel_mp_l;
cl_kernel kernel_mp_r;