Permalink
Browse files

Added hash-mode 14800 = iTunes Backup >= 10.0

  • Loading branch information...
jsteube committed Jan 26, 2017
1 parent 2f81532 commit 07c89833c922bd4980f9bee489fc0d73725380de
Showing with 2,778 additions and 159 deletions.
  1. +1 −2 OpenCL/inc_types.cl
  2. +2,304 −0 OpenCL/m14800.cl
  3. +1 −0 docs/changes.txt
  4. +2 −1 docs/readme.txt
  5. +1 −1 extra/tab_completion/hashcat.sh
  6. +4 −3 hashcat.hctune
  7. +7 −5 include/interface.h
  8. +17 −6 include/types.h
  9. +5 −3 src/autotune.c
  10. +208 −115 src/interface.c
  11. +107 −13 src/opencl.c
  12. +1 −0 src/usage.c
  13. +118 −8 tools/test.pl
  14. +2 −2 tools/test.sh
View
@@ -674,6 +674,7 @@ typedef struct
u32 salt_len;
u32 salt_iter;
u32 salt_iter2;
u32 salt_sign[2];
u32 keccak_mdlen;
@@ -742,8 +743,6 @@ typedef struct luks
typedef struct itunes_backup
{
u32 wpky[10];
u32 dpic;
u32 dpsl[5];
} itunes_backup_t;
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -13,6 +13,7 @@
- Added hash-mode 14600 = LUKS
- Added hash-mode 14700 = iTunes Backup < 10.0
- Added hash-mode 14800 = iTunes Backup >= 10.0
##
## Workarounds
View
@@ -153,7 +153,8 @@ NVidia users require "NVIDIA Driver" (367.x or later)
- OSX v10.8
- OSX v10.9
- OSX v10.10
- iTunes Backup < 10
- iTunes Backup < 10.0
- iTunes Backup >= 10.0
- AIX {smd5}
- AIX {ssha1}
- AIX {ssha256}
@@ -176,7 +176,7 @@ _hashcat ()
{
local VERSION=3.30
local HASH_MODES="0 10 11 12 20 21 22 23 30 40 50 60 100 101 110 111 112 120 121 122 124 130 131 132 133 140 141 150 160 200 300 400 500 501 900 1000 1100 1400 1410 1420 1421 1430 1440 1441 1450 1460 1500 1600 1700 1710 1711 1720 1722 1730 1731 1740 1750 1760 1800 2100 2400 2410 2500 2600 2611 2612 2711 2811 3000 3100 3200 3710 3711 3800 4300 4400 4500 4700 4800 4900 5000 5100 5200 5300 5400 5500 5600 5700 5800 6000 6100 6211 6212 6213 6221 6222 6223 6231 6232 6233 6241 6242 6243 6300 6400 6500 6600 6700 6800 6900 7100 7200 7300 7400 7500 7600 7700 7800 7900 8000 8100 8200 8300 8400 8500 8600 8700 8800 8900 9000 9100 9200 9300 9400 9500 9600 9700 9710 9720 9800 9810 9820 9900 10000 10100 10200 10300 10400 10410 10420 10500 10600 10700 10800 10900 11000 11100 11200 11300 11400 11500 11600 11700 11800 11900 12000 12100 12200 12300 12400 12500 12600 12700 12800 12900 13000 13100 13200 13300 13400 13500 13600 13800 13900 14000 14100 14700"
local HASH_MODES="0 10 11 12 20 21 22 23 30 40 50 60 100 101 110 111 112 120 121 122 124 130 131 132 133 140 141 150 160 200 300 400 500 501 900 1000 1100 1400 1410 1420 1421 1430 1440 1441 1450 1460 1500 1600 1700 1710 1711 1720 1722 1730 1731 1740 1750 1760 1800 2100 2400 2410 2500 2600 2611 2612 2711 2811 3000 3100 3200 3710 3711 3800 4300 4400 4500 4700 4800 4900 5000 5100 5200 5300 5400 5500 5600 5700 5800 6000 6100 6211 6212 6213 6221 6222 6223 6231 6232 6233 6241 6242 6243 6300 6400 6500 6600 6700 6800 6900 7100 7200 7300 7400 7500 7600 7700 7800 7900 8000 8100 8200 8300 8400 8500 8600 8700 8800 8900 9000 9100 9200 9300 9400 9500 9600 9700 9710 9720 9800 9810 9820 9900 10000 10100 10200 10300 10400 10410 10420 10500 10600 10700 10800 10900 11000 11100 11200 11300 11400 11500 11600 11700 11800 11900 12000 12100 12200 12300 12400 12500 12600 12700 12800 12900 13000 13100 13200 13300 13400 13500 13600 13800 13900 14000 14100 14700 14800"
local ATTACK_MODES="0 1 3 6 7"
local OUTFILE_FORMATS="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15"
local OPENCL_DEVICE_TYPES="1 2 3"
View
@@ -453,8 +453,9 @@ ALIAS_Apple_Iris_Pro * 13731 1 1
ALIAS_Apple_Iris_Pro * 13732 1 1 32
ALIAS_Apple_Iris_Pro * 13733 1 1 16
##########
## LUKS ##
##########
#######################
## EXTREME SLOW ALGOS #
#######################
DEVICE_TYPE_GPU * 14600 1 2 1024
DEVICE_TYPE_GPU * 14800 1 2 1000
View
@@ -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;
View
@@ -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;
View
@@ -288,9 +288,11 @@ static int autotune (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param
memset (device_param->exec_msec, 0, EXEC_CACHE * sizeof (double));
memset (device_param->exec_us_prev1, 0, EXPECTED_ITERATIONS * sizeof (double));
memset (device_param->exec_us_prev2, 0, EXPECTED_ITERATIONS * sizeof (double));
memset (device_param->exec_us_prev3, 0, EXPECTED_ITERATIONS * sizeof (double));
memset (device_param->exec_us_prev1, 0, EXPECTED_ITERATIONS * sizeof (double));
memset (device_param->exec_us_prev2, 0, EXPECTED_ITERATIONS * sizeof (double));
memset (device_param->exec_us_prev3, 0, EXPECTED_ITERATIONS * sizeof (double));
memset (device_param->exec_us_prev_init2, 0, EXPECTED_ITERATIONS * sizeof (double));
memset (device_param->exec_us_prev_loop2, 0, EXPECTED_ITERATIONS * sizeof (double));
// store
Oops, something went wrong.

0 comments on commit 07c8983

Please sign in to comment.