From 990f973c48c7ce16be2300191fc1cd02123db8c0 Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Sat, 20 Feb 2016 00:58:22 +0100 Subject: [PATCH] Add hard-wired Device-Name for Tuning-Database which matches all Device-Types: - DEVICE_TYPE_CPU - DEVICE_TYPE_GPU - DEVICE_TYPE_ACCELERATOR Optimized IRIS GPU workaround settings --- hashcat_tuning.hctab | 609 +++++-------------------------------------- include/shared.h | 2 +- src/oclHashcat.c | 4 +- src/shared.c | 36 ++- 4 files changed, 101 insertions(+), 550 deletions(-) diff --git a/hashcat_tuning.hctab b/hashcat_tuning.hctab index da57b6b87..121778c2f 100644 --- a/hashcat_tuning.hctab +++ b/hashcat_tuning.hctab @@ -18,6 +18,10 @@ # - The Device-Name is the OpenCL Device-Name. It's shown on oclHashcat startup. # - If the device contains spaces, replace all spaces with _ character. # - The Device-Name can be assigned an alias. This is useful if many devices share the same chip +# - There's also a hard-wired Device-Name which matches all device types called: +# - DEVICE_TYPE_CPU +# - DEVICE_TYPE_GPU +# - DEVICE_TYPE_ACCELERATOR # - The use of wildcards is allowed, some rules: # - Wildcards can only replace an entire Device-Name, not parts just of it. eg: not Geforce_* # - The policy is local > global, means the closer you configure something, the more likely it is selected @@ -50,14 +54,11 @@ GeForce_GTX_750_Ti ALIAS_nv_budget GeForce_GTX_570 ALIAS_nv_old GeForce_GTX_TITAN ALIAS_nv_old -Intel(R)_Core(TM)_i7-4578U_CPU_@_3.00GHz ALIAS_cpu -AMD_FX(tm)-8120_Eight-Core_Processor ALIAS_cpu - ############# ## ENTRIES ## ############# -ALIAS_cpu * * N A 512 +DEVICE_TYPE_CPU * * N A 1024 #Device Attack Hash Vector Kernel Kernel #Name Mode Type Width Accel Loops @@ -139,541 +140,67 @@ ALIAS_nv_old * 12000 2 A ALIAS_nv_old * 12400 2 A A ALIAS_nv_old * 12700 2 A A -############### -## OSX CHAOS ## -############### +############## +## OSX Iris ## +############## -Iris 0 0 N 128 2 -Iris 1 0 N 256 2 -Iris 3 0 N 512 2 -Iris 0 10 N 128 2 -Iris 1 10 N 256 2 -Iris 3 10 N 512 2 -Iris 0 11 N 128 2 -Iris 1 11 N 256 2 -Iris 3 11 N 512 2 -Iris 0 12 N 128 2 -Iris 1 12 N 256 2 -Iris 3 12 N 512 2 -Iris 0 20 N 64 2 -Iris 1 20 N 128 2 -Iris 3 20 N 256 2 -Iris 0 21 N 64 2 -Iris 1 21 N 128 2 -Iris 3 21 N 256 2 -Iris 0 22 N 64 2 -Iris 1 22 N 128 2 -Iris 3 22 N 256 2 -Iris 0 23 N 64 2 -Iris 1 23 N 128 2 -Iris 3 23 N 256 2 -Iris 0 30 N 128 2 -Iris 1 30 N 256 2 -Iris 3 30 N 512 2 -Iris 0 40 N 64 2 -Iris 1 40 N 128 2 -Iris 3 40 N 256 2 -Iris 0 50 N 64 2 -Iris 1 50 N 128 2 -Iris 3 50 N 256 2 -Iris 0 60 N 64 2 -Iris 1 60 N 128 2 -Iris 3 60 N 256 2 -Iris 0 100 N 64 2 -Iris 1 100 N 128 2 -Iris 3 100 N 256 2 -Iris 0 101 N 64 2 -Iris 1 101 N 128 2 -Iris 3 101 N 256 2 -Iris 0 110 N 64 2 -Iris 1 110 N 128 2 -Iris 3 110 N 256 2 -Iris 0 111 N 64 2 -Iris 1 111 N 128 2 -Iris 3 111 N 256 2 -Iris 0 112 N 64 2 -Iris 1 112 N 128 2 -Iris 3 112 N 256 2 -Iris 0 120 N 64 2 -Iris 1 120 N 128 2 -Iris 3 120 N 256 2 -Iris 0 121 N 64 2 -Iris 1 121 N 128 2 -Iris 3 121 N 256 2 -Iris 0 122 N 64 2 -Iris 1 122 N 128 2 -Iris 3 122 N 256 2 -Iris 0 124 N 64 2 -Iris 1 124 N 128 2 -Iris 3 124 N 256 2 -Iris 0 130 N 64 2 -Iris 1 130 N 128 2 -Iris 3 130 N 256 2 -Iris 0 131 N 64 2 -Iris 1 131 N 128 2 -Iris 3 131 N 256 2 -Iris 0 132 N 64 2 -Iris 1 132 N 128 2 -Iris 3 132 N 256 2 -Iris 0 133 N 64 2 -Iris 1 133 N 128 2 -Iris 3 133 N 256 2 -Iris 0 140 N 64 2 -Iris 1 140 N 128 2 -Iris 3 140 N 256 2 -Iris 0 141 N 64 2 -Iris 1 141 N 128 2 -Iris 3 141 N 256 2 -Iris 0 150 N 64 2 -Iris 1 150 N 128 2 -Iris 3 150 N 256 2 -Iris 0 160 N 64 2 -Iris 1 160 N 128 2 -Iris 3 160 N 256 2 -Iris 0 190 N 64 2 -Iris 1 190 N 128 2 -Iris 3 190 N 256 2 -Iris 0 200 N 64 2 -Iris 1 200 N 128 2 -Iris 3 200 N 256 2 -Iris 0 300 N 64 2 -Iris 1 300 N 128 2 -Iris 3 300 N 256 2 -Iris 0 400 N 8 256 -Iris 1 400 N 16 256 -Iris 3 400 N 32 256 -Iris 0 500 N 8 256 -Iris 1 500 N 16 256 -Iris 3 500 N 32 256 -Iris 0 501 N 8 256 -Iris 1 501 N 16 256 -Iris 3 501 N 32 256 -Iris 0 900 N 128 2 -Iris 1 900 N 256 2 -Iris 3 900 N 512 2 -Iris 0 910 N 128 256 -Iris 1 910 N 256 256 -Iris 3 910 N 512 256 -Iris 0 1000 N 128 2 -Iris 1 1000 N 256 2 -Iris 3 1000 N 512 2 -Iris 0 1100 N 64 2 -Iris 1 1100 N 128 2 -Iris 3 1100 N 256 2 -Iris 0 1400 N 64 2 -Iris 1 1400 N 128 2 -Iris 3 1400 N 256 2 -Iris 0 1410 N 64 2 -Iris 1 1410 N 128 2 -Iris 3 1410 N 256 2 -Iris 0 1420 N 64 2 -Iris 1 1420 N 128 2 -Iris 3 1420 N 256 2 -Iris 0 1421 N 64 2 -Iris 1 1421 N 128 2 -Iris 3 1421 N 256 2 -Iris 0 1430 N 64 2 -Iris 1 1430 N 128 2 -Iris 3 1430 N 256 2 -Iris 0 1440 N 64 2 -Iris 1 1440 N 128 2 -Iris 3 1440 N 256 2 -Iris 0 1441 N 64 2 -Iris 1 1441 N 128 2 -Iris 3 1441 N 256 2 -Iris 0 1450 N 32 2 -Iris 1 1450 N 64 2 -Iris 3 1450 N 128 2 -Iris 0 1460 N 32 2 -Iris 1 1460 N 64 2 -Iris 3 1460 N 128 2 -Iris 0 1500 N 16 256 -Iris 1 1500 N 32 256 -Iris 3 1500 N 64 256 -Iris 0 1600 N 8 256 -Iris 1 1600 N 16 256 -Iris 3 1600 N 32 256 -Iris 0 1700 N 64 2 -Iris 1 1700 N 128 2 -Iris 3 1700 N 256 2 -Iris 0 1710 N 64 2 -Iris 1 1710 N 128 2 -Iris 3 1710 N 256 2 -Iris 0 1711 N 64 2 -Iris 1 1711 N 128 2 -Iris 3 1711 N 256 2 -Iris 0 1720 N 64 2 -Iris 1 1720 N 128 2 -Iris 3 1720 N 256 2 -Iris 0 1722 N 64 2 -Iris 1 1722 N 128 2 -Iris 3 1722 N 256 2 -Iris 0 1730 N 64 2 -Iris 1 1730 N 128 2 -Iris 3 1730 N 256 2 -Iris 0 1731 N 64 2 -Iris 1 1731 N 128 2 -Iris 3 1731 N 256 2 -Iris 0 1740 N 64 2 -Iris 1 1740 N 128 2 -Iris 3 1740 N 256 2 -Iris 0 1750 N 32 2 -Iris 1 1750 N 64 2 -Iris 3 1750 N 128 2 -Iris 0 1760 N 32 2 -Iris 1 1760 N 64 2 -Iris 3 1760 N 128 2 -Iris 0 1800 N 1 16 -Iris 1 1800 N 2 16 -Iris 3 1800 N 4 16 -Iris 0 2100 N 8 256 -Iris 1 2100 N 16 256 -Iris 3 2100 N 32 256 -Iris 0 2400 N 64 2 -Iris 1 2400 N 128 2 -Iris 3 2400 N 256 2 -Iris 0 2410 N 64 2 -Iris 1 2410 N 128 2 -Iris 3 2410 N 256 2 -Iris 0 2500 N 2 256 -Iris 1 2500 N 4 256 -Iris 3 2500 N 8 256 -Iris 0 2600 N 64 2 -Iris 1 2600 N 128 2 -Iris 3 2600 N 256 2 -Iris 0 2611 N 64 2 -Iris 1 2611 N 128 2 -Iris 3 2611 N 256 2 -Iris 0 2612 N 64 2 -Iris 1 2612 N 128 2 -Iris 3 2612 N 256 2 -Iris 0 2711 N 64 2 -Iris 1 2711 N 128 2 -Iris 3 2711 N 256 2 -Iris 0 2811 N 64 2 -Iris 1 2811 N 128 2 -Iris 3 2811 N 256 2 -Iris 0 3000 N 128 256 -Iris 1 3000 N 256 256 -Iris 3 3000 N 512 256 -Iris 0 3100 N 16 2 -Iris 1 3100 N 32 2 -Iris 3 3100 N 64 2 -Iris 0 3200 N 2 2 -Iris 1 3200 N 4 2 -Iris 3 3200 N 8 2 -Iris 0 3710 N 64 2 -Iris 1 3710 N 128 2 -Iris 3 3710 N 256 2 -Iris 0 3711 N 64 2 -Iris 1 3711 N 128 2 -Iris 3 3711 N 256 2 -Iris 0 3800 N 128 2 -Iris 1 3800 N 256 2 -Iris 3 3800 N 512 2 -Iris 0 4300 N 64 2 -Iris 1 4300 N 128 2 -Iris 3 4300 N 256 2 -Iris 0 4400 N 64 2 -Iris 1 4400 N 128 2 -Iris 3 4400 N 256 2 -Iris 0 4500 N 64 2 -Iris 1 4500 N 128 2 -Iris 3 4500 N 256 2 -Iris 0 4700 N 64 2 -Iris 1 4700 N 128 2 -Iris 3 4700 N 256 2 -Iris 0 4800 N 128 2 -Iris 1 4800 N 256 2 -Iris 3 4800 N 512 2 -Iris 0 4900 N 64 2 -Iris 1 4900 N 128 2 -Iris 3 4900 N 256 2 -Iris 0 5000 N 8 2 -Iris 1 5000 N 16 2 -Iris 3 5000 N 32 2 -Iris 0 5100 N 64 2 -Iris 1 5100 N 128 2 -Iris 3 5100 N 256 2 -Iris 0 5200 N 8 256 -Iris 1 5200 N 16 256 -Iris 3 5200 N 32 256 -Iris 0 5300 N 32 2 -Iris 1 5300 N 64 2 -Iris 3 5300 N 128 2 -Iris 0 5400 N 32 2 -Iris 1 5400 N 64 2 -Iris 3 5400 N 128 2 -Iris 0 5500 N 64 2 -Iris 1 5500 N 128 2 -Iris 3 5500 N 256 2 -Iris 0 5600 N 64 2 -Iris 1 5600 N 128 2 -Iris 3 5600 N 256 2 -Iris 0 5700 N 64 2 -Iris 1 5700 N 128 2 -Iris 3 5700 N 256 2 -Iris 0 5800 N 8 256 -Iris 1 5800 N 16 256 -Iris 3 5800 N 32 256 -Iris 0 6000 N 64 2 -Iris 1 6000 N 128 2 -Iris 3 6000 N 256 2 -Iris 0 6100 N 1 2 -Iris 1 6100 N 2 2 -Iris 3 6100 N 4 2 -Iris 0 6211 N 2 200 -Iris 1 6211 N 4 200 -Iris 3 6211 N 8 200 -Iris 0 6212 N 8 200 -Iris 1 6212 N 16 200 -Iris 3 6212 N 32 200 -Iris 0 6213 N 8 200 -Iris 1 6213 N 16 200 -Iris 3 6213 N 32 200 -Iris 0 6221 N 4 200 -Iris 1 6221 N 8 200 -Iris 3 6221 N 16 200 -Iris 0 6222 N 4 200 -Iris 1 6222 N 8 200 -Iris 3 6222 N 16 200 -Iris 0 6223 N 4 200 -Iris 1 6223 N 8 200 -Iris 3 6223 N 16 200 -Iris 0 6231 N 1 2 -Iris 1 6231 N 2 2 -Iris 3 6231 N 4 2 -Iris 0 6232 N 4 2 -Iris 1 6232 N 8 2 -Iris 3 6232 N 16 2 -Iris 0 6233 N 4 2 -Iris 1 6233 N 8 2 -Iris 3 6233 N 16 2 -Iris 0 6241 N 4 200 -Iris 1 6241 N 8 200 -Iris 3 6241 N 16 200 -Iris 0 6242 N 16 200 -Iris 1 6242 N 32 200 -Iris 3 6242 N 64 200 -Iris 0 6243 N 16 200 -Iris 1 6243 N 32 200 -Iris 3 6243 N 64 200 -Iris 0 6300 N 8 256 -Iris 1 6300 N 16 256 -Iris 3 6300 N 32 256 -Iris 0 6400 N 8 256 -Iris 1 6400 N 16 256 -Iris 3 6400 N 32 256 -Iris 0 6500 N 8 256 -Iris 1 6500 N 16 256 -Iris 3 6500 N 32 256 -Iris 0 6600 N 8 200 -Iris 1 6600 N 16 200 -Iris 3 6600 N 32 200 -Iris 0 6700 N 8 256 -Iris 1 6700 N 16 256 -Iris 3 6700 N 32 256 -Iris 0 6800 N 2 200 -Iris 1 6800 N 4 200 -Iris 3 6800 N 8 200 -Iris 0 6900 N 16 2 -Iris 1 6900 N 32 2 -Iris 3 6900 N 64 2 -Iris 0 7100 N 1 256 -Iris 1 7100 N 2 256 -Iris 3 7100 N 4 256 -Iris 0 7200 N 1 200 -Iris 1 7200 N 2 200 -Iris 3 7200 N 4 200 -Iris 0 7300 N 64 2 -Iris 1 7300 N 128 2 -Iris 3 7300 N 256 2 -Iris 0 7400 N 2 200 -Iris 1 7400 N 4 200 -Iris 3 7400 N 8 200 -Iris 0 7500 N 8 2 -Iris 1 7500 N 16 2 -Iris 3 7500 N 32 2 -Iris 0 7600 N 64 2 -Iris 1 7600 N 128 2 -Iris 3 7600 N 256 2 -Iris 0 7700 N 16 2 -Iris 1 7700 N 32 2 -Iris 3 7700 N 64 2 -Iris 0 7800 N 8 2 -Iris 1 7800 N 16 2 -Iris 3 7800 N 32 2 -Iris 0 7900 N 1 256 -Iris 1 7900 N 2 256 -Iris 3 7900 N 4 256 -Iris 0 8000 N 8 2 -Iris 1 8000 N 16 2 -Iris 3 8000 N 32 2 -Iris 0 8100 N 64 2 -Iris 1 8100 N 128 2 -Iris 3 8100 N 256 2 -Iris 0 8200 N 1 1 -Iris 1 8200 N 2 1 -Iris 3 8200 N 4 1 -Iris 0 8300 N 64 2 -Iris 1 8300 N 128 2 -Iris 3 8300 N 256 2 -Iris 0 8400 N 64 2 -Iris 1 8400 N 128 2 -Iris 3 8400 N 256 2 -Iris 0 8500 N 64 2 -Iris 1 8500 N 128 2 -Iris 3 8500 N 256 2 -Iris 0 8600 N 8 2 -Iris 1 8600 N 16 2 -Iris 3 8600 N 32 2 -Iris 0 8700 N 2 2 -Iris 1 8700 N 4 2 -Iris 3 8700 N 8 2 -Iris 0 8800 N 8 256 -Iris 1 8800 N 16 256 -Iris 3 8800 N 32 256 -Iris 0 8900 N 1 1 -Iris 1 8900 N 1 1 -Iris 3 8900 N 1 1 -Iris 0 9000 N 2 16 -Iris 1 9000 N 4 16 -Iris 3 9000 N 8 16 -Iris 0 9100 N 4 256 -Iris 1 9100 N 8 256 -Iris 3 9100 N 16 256 -Iris 0 9200 N 1 200 -Iris 1 9200 N 2 200 -Iris 3 9200 N 4 200 -Iris 0 9300 N 1 1 -Iris 1 9300 N 2 1 -Iris 3 9300 N 4 1 -Iris 0 9400 N 1 200 -Iris 1 9400 N 2 200 -Iris 3 9400 N 4 200 -Iris 0 9500 N 1 200 -Iris 1 9500 N 2 200 -Iris 3 9500 N 4 200 -Iris 0 9600 N 1 200 -Iris 1 9600 N 2 200 -Iris 3 9600 N 4 200 -Iris 0 9700 N 8 2 -Iris 1 9700 N 16 2 -Iris 3 9700 N 32 2 -Iris 0 9710 N 8 2 -Iris 1 9710 N 16 2 -Iris 3 9710 N 32 2 -Iris 0 9720 N 8 8 -Iris 1 9720 N 16 8 -Iris 3 9720 N 32 8 -Iris 0 9800 N 8 2 -Iris 1 9800 N 16 2 -Iris 3 9800 N 32 2 -Iris 0 9810 N 8 2 -Iris 1 9810 N 16 2 -Iris 3 9810 N 32 2 -Iris 0 9820 N 8 2 -Iris 1 9820 N 16 2 -Iris 3 9820 N 32 2 -Iris 0 9900 N 64 2 -Iris 1 9900 N 128 2 -Iris 3 9900 N 256 2 -Iris 0 10000 N 1 200 -Iris 1 10000 N 2 200 -Iris 3 10000 N 4 200 -Iris 0 10100 N 128 2 -Iris 1 10100 N 256 2 -Iris 3 10100 N 512 2 -Iris 0 10200 N 64 2 -Iris 1 10200 N 128 2 -Iris 3 10200 N 256 2 -Iris 0 10300 N 8 128 -Iris 1 10300 N 16 128 -Iris 3 10300 N 32 128 -Iris 0 10400 N 8 2 -Iris 1 10400 N 16 2 -Iris 3 10400 N 32 2 -Iris 0 10410 N 8 2 -Iris 1 10410 N 16 2 -Iris 3 10410 N 32 2 -Iris 0 10420 N 8 2 -Iris 1 10420 N 16 2 -Iris 3 10420 N 32 2 -Iris 0 10500 N 4 64 -Iris 1 10500 N 8 64 -Iris 3 10500 N 16 64 -Iris 0 10600 N 64 2 -Iris 1 10600 N 128 2 -Iris 3 10600 N 256 2 -Iris 0 10700 N 1 2 -Iris 1 10700 N 2 2 -Iris 3 10700 N 4 2 -Iris 0 10800 N 64 2 -Iris 1 10800 N 128 2 -Iris 3 10800 N 256 2 -Iris 0 10900 N 2 200 -Iris 1 10900 N 4 200 -Iris 3 10900 N 8 200 -Iris 0 11000 N 64 2 -Iris 1 11000 N 128 2 -Iris 3 11000 N 256 2 -Iris 0 11100 N 64 2 -Iris 1 11100 N 128 2 -Iris 3 11100 N 256 2 -Iris 0 11200 N 64 2 -Iris 1 11200 N 128 2 -Iris 3 11200 N 256 2 -Iris 0 11300 N 1 1 -Iris 1 11300 N 2 1 -Iris 3 11300 N 4 1 -Iris 0 11400 N 8 2 -Iris 1 11400 N 16 2 -Iris 3 11400 N 32 2 -Iris 0 11500 N 128 2 -Iris 1 11500 N 256 2 -Iris 3 11500 N 512 2 -Iris 0 11600 N 1 512 -Iris 1 11600 N 2 512 -Iris 3 11600 N 4 512 -Iris 0 11700 N 1 2 -Iris 1 11700 N 2 2 -Iris 3 11700 N 4 2 -Iris 0 11800 N 1 2 -Iris 1 11800 N 2 2 -Iris 3 11800 N 4 2 -Iris 0 11900 N 2 200 -Iris 1 11900 N 4 200 -Iris 3 11900 N 8 200 -Iris 0 12000 N 2 200 -Iris 1 12000 N 4 200 -Iris 3 12000 N 8 200 -Iris 0 12100 N 2 200 -Iris 1 12100 N 4 200 -Iris 3 12100 N 8 200 -Iris 0 12200 N 1 256 -Iris 1 12200 N 2 256 -Iris 3 12200 N 4 256 -Iris 0 12300 N 2 256 -Iris 1 12300 N 4 256 -Iris 3 12300 N 8 256 -Iris 0 12400 N 1 256 -Iris 1 12400 N 2 256 -Iris 3 12400 N 4 256 -Iris 0 12500 N 1 256 -Iris 1 12500 N 2 256 -Iris 3 12500 N 4 256 -Iris 0 12600 N 32 2 -Iris 1 12600 N 64 2 -Iris 3 12600 N 128 2 -Iris 0 12700 N 64 10 -Iris 1 12700 N 128 10 -Iris 3 12700 N 256 10 -Iris 0 12800 N 64 100 -Iris 1 12800 N 128 100 -Iris 3 12800 N 256 100 -Iris 0 12900 N 8 64 -Iris 1 12900 N 16 64 -Iris 3 12900 N 32 64 -Iris 0 13000 N 1 64 -Iris 1 13000 N 2 64 -Iris 3 13000 N 4 64 +Iris * * 1 A 2 +Iris * 400 1 A 256 +Iris * 500 1 8 256 +Iris * 501 1 8 256 +Iris * 1500 1 A 256 +Iris * 1600 1 8 256 +Iris * 1800 1 1 16 +Iris * 2100 1 8 256 +Iris * 2500 1 2 256 +Iris * 3000 1 A 256 +Iris * 5200 1 8 256 +Iris * 5800 1 8 256 +Iris * 6211 1 8 200 +Iris * 6212 1 8 200 +Iris * 6213 1 8 200 +Iris * 6221 1 4 200 +Iris * 6222 1 4 200 +Iris * 6223 1 4 200 +Iris * 6231 1 4 200 +Iris * 6232 1 4 200 +Iris * 6233 1 4 200 +Iris * 6241 1 4 200 +Iris * 6242 1 4 200 +Iris * 6243 1 4 200 +Iris * 6300 1 8 256 +Iris * 6400 1 8 256 +Iris * 6500 1 8 256 +Iris * 6600 1 8 200 +Iris * 6700 1 8 256 +Iris * 6800 1 2 200 +Iris * 7100 1 1 256 +Iris * 7200 1 1 200 +Iris * 7400 1 2 200 +Iris * 7900 1 1 256 +Iris * 8800 1 8 256 +Iris * 8900 1 1 1 +Iris * 9000 1 2 16 +Iris * 9100 1 4 256 +Iris * 9200 1 1 200 +Iris * 9300 1 1 1 +Iris * 9400 1 1 200 +Iris * 9500 1 1 200 +Iris * 9600 1 1 200 +Iris * 10000 1 1 200 +Iris * 10300 1 8 128 +Iris * 10500 1 4 64 +Iris * 10900 1 2 200 +Iris * 11300 1 1 1 +Iris * 11600 1 1 512 +Iris * 11900 1 2 200 +Iris * 12000 1 2 200 +Iris * 12100 1 2 200 +Iris * 12200 1 1 256 +Iris * 12300 1 2 256 +Iris * 12400 1 1 256 +Iris * 12500 1 1 256 +Iris * 12700 1 64 10 +Iris * 12800 1 64 100 +Iris * 12900 1 8 64 +Iris * 13000 1 1 64 diff --git a/include/shared.h b/include/shared.h index 37ec6398b..203d54840 100644 --- a/include/shared.h +++ b/include/shared.h @@ -1442,7 +1442,7 @@ void sp_stretch_root (hcstat_table_t *in, hcstat_table_t *out); void tuning_db_destroy (tuning_db_t *tuning_db); tuning_db_t *tuning_db_alloc (FILE *fp); tuning_db_t *tuning_db_init (const char *tuning_db_file); -tuning_db_entry_t *tuning_db_search (tuning_db_t *tuning_db, char *device_name, int attack_mode, int hash_type); +tuning_db_entry_t *tuning_db_search (tuning_db_t *tuning_db, hc_device_param_t *device_param, int attack_mode, int hash_type); int bcrypt_parse_hash (char *input_buf, uint input_len, hash_t *hash_buf); int cisco4_parse_hash (char *input_buf, uint input_len, hash_t *hash_buf); diff --git a/src/oclHashcat.c b/src/oclHashcat.c index 7bb62ce1e..9c54529f7 100644 --- a/src/oclHashcat.c +++ b/src/oclHashcat.c @@ -12719,7 +12719,7 @@ int main (int argc, char **argv) // tuning db - tuning_db_entry_t *tuningdb_entry = tuning_db_search (tuning_db, device_param->device_name, attack_mode, hash_mode); + tuning_db_entry_t *tuningdb_entry = tuning_db_search (tuning_db, device_param, attack_mode, hash_mode); // device_version @@ -13019,7 +13019,7 @@ int main (int argc, char **argv) device_param->kernel_loops_min = 1; device_param->kernel_loops_max = 1024; - tuning_db_entry_t *tuningdb_entry = tuning_db_search (tuning_db, device_param->device_name, attack_mode, hash_mode); + tuning_db_entry_t *tuningdb_entry = tuning_db_search (tuning_db, device_param, attack_mode, hash_mode); if (tuningdb_entry) { diff --git a/src/shared.c b/src/shared.c index 08bcd90ba..d2beee6de 100644 --- a/src/shared.c +++ b/src/shared.c @@ -9298,13 +9298,13 @@ tuning_db_t *tuning_db_init (const char *tuning_db_file) return tuning_db; } -tuning_db_entry_t *tuning_db_search (tuning_db_t *tuning_db, char *device_name, int attack_mode, int hash_type) +tuning_db_entry_t *tuning_db_search (tuning_db_t *tuning_db, hc_device_param_t *device_param, int attack_mode, int hash_type) { static tuning_db_entry_t s; // first we need to convert all spaces in the device_name to underscore - char *device_name_nospace = strdup (device_name); + char *device_name_nospace = strdup (device_param->device_name); int device_name_length = strlen (device_name_nospace); @@ -9350,11 +9350,35 @@ tuning_db_entry_t *tuning_db_search (tuning_db_t *tuning_db, char *device_name, if (entry != NULL) break; - // in non-wildcard mode also check the alias_name + // in non-wildcard mode do some additional checks: - if (((i & 1) == 0) && (alias_name != NULL)) + if ((i & 1) == 0) { - s.device_name = alias_name; + // in case we have an alias-name + + if (alias_name != NULL) + { + s.device_name = alias_name; + + entry = bsearch (&s, tuning_db->entry_buf, tuning_db->entry_cnt, sizeof (tuning_db_entry_t), sort_by_tuning_db_entry); + + if (entry != NULL) break; + } + + // or by device type + + if (device_param->device_type & CL_DEVICE_TYPE_CPU) + { + s.device_name = "DEVICE_TYPE_CPU"; + } + else if (device_param->device_type & CL_DEVICE_TYPE_GPU) + { + s.device_name = "DEVICE_TYPE_GPU"; + } + else if (device_param->device_type & CL_DEVICE_TYPE_ACCELERATOR) + { + s.device_name = "DEVICE_TYPE_ACCELERATOR"; + } entry = bsearch (&s, tuning_db->entry_buf, tuning_db->entry_cnt, sizeof (tuning_db_entry_t), sort_by_tuning_db_entry); @@ -18795,7 +18819,7 @@ int krb5tgs_parse_hash (char *input_buf, uint input_len, hash_t *hash_buf) /* this is needed for hmac_md5 */ *edata_ptr++ = 0x80; - + krb5tgs->edata2_len = (data_len - 32) / 2 ; salt->salt_buf[0] = krb5tgs->checksum[0];