1
0
mirror of https://github.com/hashcat/hashcat.git synced 2025-01-24 22:50:58 +00:00

Fix SHA-3(Keccak) issue with HD4000 (issue #191) and reorder macro

This commit is contained in:
Gabriele 'matrix' Gristina 2016-02-06 18:18:21 +01:00
parent 7b652239f9
commit 225fc28dff

View File

@ -208,7 +208,7 @@ extern hc_thread_mutex_t mux_display;
#define KERNEL_ACCEL_OSX_1800 1 #define KERNEL_ACCEL_OSX_1800 1
#define KERNEL_ACCEL_OSX_2500 2 #define KERNEL_ACCEL_OSX_2500 2
#define KERNEL_ACCEL_OSX_5000 16 #define KERNEL_ACCEL_OSX_5000 8
#define KERNEL_ACCEL_OSX_6100 1 #define KERNEL_ACCEL_OSX_6100 1
#define KERNEL_ACCEL_OSX_6211 2 #define KERNEL_ACCEL_OSX_6211 2
#define KERNEL_ACCEL_OSX_6231 1 #define KERNEL_ACCEL_OSX_6231 1
@ -236,36 +236,6 @@ extern hc_thread_mutex_t mux_display;
#define KERNEL_ACCEL_OSX_12500 1 #define KERNEL_ACCEL_OSX_12500 1
#define KERNEL_ACCEL_OSX_13000 1 #define KERNEL_ACCEL_OSX_13000 1
#define KERNEL_ACCEL_1800 2
#define KERNEL_ACCEL_2500 8
#define KERNEL_ACCEL_5000 64
#define KERNEL_ACCEL_6100 8
#define KERNEL_ACCEL_6211 16
#define KERNEL_ACCEL_6231 4
#define KERNEL_ACCEL_6241 32
#define KERNEL_ACCEL_6800 8
#define KERNEL_ACCEL_7100 2
#define KERNEL_ACCEL_7200 2
#define KERNEL_ACCEL_7900 2
#define KERNEL_ACCEL_8200 2
#define KERNEL_ACCEL_8700 8
#define KERNEL_ACCEL_9100 8
#define KERNEL_ACCEL_9200 2
#define KERNEL_ACCEL_9300 2
#define KERNEL_ACCEL_9400 8
#define KERNEL_ACCEL_9500 8
#define KERNEL_ACCEL_9600 2
#define KERNEL_ACCEL_10000 2
#define KERNEL_ACCEL_10500 64
#define KERNEL_ACCEL_11300 2
#define KERNEL_ACCEL_11600 2
#define KERNEL_ACCEL_11700 4
#define KERNEL_ACCEL_11800 4
#define KERNEL_ACCEL_12200 2
#define KERNEL_ACCEL_12400 64
#define KERNEL_ACCEL_12500 8
#define KERNEL_ACCEL_13000 8
#define KERNEL_ACCEL_0 128 #define KERNEL_ACCEL_0 128
#define KERNEL_ACCEL_10 128 #define KERNEL_ACCEL_10 128
#define KERNEL_ACCEL_11 128 #define KERNEL_ACCEL_11 128
@ -326,8 +296,10 @@ extern hc_thread_mutex_t mux_display;
#define KERNEL_ACCEL_1740 64 #define KERNEL_ACCEL_1740 64
#define KERNEL_ACCEL_1750 32 #define KERNEL_ACCEL_1750 32
#define KERNEL_ACCEL_1760 32 #define KERNEL_ACCEL_1760 32
#define KERNEL_ACCEL_1800 2
#define KERNEL_ACCEL_2100 8 #define KERNEL_ACCEL_2100 8
#define KERNEL_ACCEL_2400 64 #define KERNEL_ACCEL_2400 64
#define KERNEL_ACCEL_2500 8
#define KERNEL_ACCEL_2410 64 #define KERNEL_ACCEL_2410 64
#define KERNEL_ACCEL_2600 64 #define KERNEL_ACCEL_2600 64
#define KERNEL_ACCEL_2611 64 #define KERNEL_ACCEL_2611 64
@ -346,6 +318,7 @@ extern hc_thread_mutex_t mux_display;
#define KERNEL_ACCEL_4700 64 #define KERNEL_ACCEL_4700 64
#define KERNEL_ACCEL_4800 128 #define KERNEL_ACCEL_4800 128
#define KERNEL_ACCEL_4900 64 #define KERNEL_ACCEL_4900 64
#define KERNEL_ACCEL_5000 64
#define KERNEL_ACCEL_5100 64 #define KERNEL_ACCEL_5100 64
#define KERNEL_ACCEL_5200 8 #define KERNEL_ACCEL_5200 8
#define KERNEL_ACCEL_5300 32 #define KERNEL_ACCEL_5300 32
@ -355,13 +328,17 @@ extern hc_thread_mutex_t mux_display;
#define KERNEL_ACCEL_5700 64 #define KERNEL_ACCEL_5700 64
#define KERNEL_ACCEL_5800 8 #define KERNEL_ACCEL_5800 8
#define KERNEL_ACCEL_6000 64 #define KERNEL_ACCEL_6000 64
#define KERNEL_ACCEL_6100 8
#define KERNEL_ACCEL_6211 16
#define KERNEL_ACCEL_6212 8 #define KERNEL_ACCEL_6212 8
#define KERNEL_ACCEL_6213 8 #define KERNEL_ACCEL_6213 8
#define KERNEL_ACCEL_6221 4 #define KERNEL_ACCEL_6221 4
#define KERNEL_ACCEL_6222 4 #define KERNEL_ACCEL_6222 4
#define KERNEL_ACCEL_6223 4 #define KERNEL_ACCEL_6223 4
#define KERNEL_ACCEL_6231 4
#define KERNEL_ACCEL_6232 4 #define KERNEL_ACCEL_6232 4
#define KERNEL_ACCEL_6233 4 #define KERNEL_ACCEL_6233 4
#define KERNEL_ACCEL_6241 32
#define KERNEL_ACCEL_6242 16 #define KERNEL_ACCEL_6242 16
#define KERNEL_ACCEL_6243 16 #define KERNEL_ACCEL_6243 16
#define KERNEL_ACCEL_6300 8 #define KERNEL_ACCEL_6300 8
@ -369,22 +346,34 @@ extern hc_thread_mutex_t mux_display;
#define KERNEL_ACCEL_6500 8 #define KERNEL_ACCEL_6500 8
#define KERNEL_ACCEL_6600 8 #define KERNEL_ACCEL_6600 8
#define KERNEL_ACCEL_6700 8 #define KERNEL_ACCEL_6700 8
#define KERNEL_ACCEL_6800 8
#define KERNEL_ACCEL_6900 16 #define KERNEL_ACCEL_6900 16
#define KERNEL_ACCEL_7100 2
#define KERNEL_ACCEL_7200 2
#define KERNEL_ACCEL_7300 64 #define KERNEL_ACCEL_7300 64
#define KERNEL_ACCEL_7400 2 #define KERNEL_ACCEL_7400 2
#define KERNEL_ACCEL_7500 8 #define KERNEL_ACCEL_7500 8
#define KERNEL_ACCEL_7600 64 #define KERNEL_ACCEL_7600 64
#define KERNEL_ACCEL_7700 16 #define KERNEL_ACCEL_7700 16
#define KERNEL_ACCEL_7800 8 #define KERNEL_ACCEL_7800 8
#define KERNEL_ACCEL_7900 2
#define KERNEL_ACCEL_8000 8 #define KERNEL_ACCEL_8000 8
#define KERNEL_ACCEL_8100 64 #define KERNEL_ACCEL_8100 64
#define KERNEL_ACCEL_8200 2
#define KERNEL_ACCEL_8300 64 #define KERNEL_ACCEL_8300 64
#define KERNEL_ACCEL_8400 64 #define KERNEL_ACCEL_8400 64
#define KERNEL_ACCEL_8500 64 #define KERNEL_ACCEL_8500 64
#define KERNEL_ACCEL_8600 8 #define KERNEL_ACCEL_8600 8
#define KERNEL_ACCEL_8700 8
#define KERNEL_ACCEL_8800 8 #define KERNEL_ACCEL_8800 8
#define KERNEL_ACCEL_8900 16 #define KERNEL_ACCEL_8900 16
#define KERNEL_ACCEL_9000 2 #define KERNEL_ACCEL_9000 2
#define KERNEL_ACCEL_9100 8
#define KERNEL_ACCEL_9200 2
#define KERNEL_ACCEL_9300 2
#define KERNEL_ACCEL_9400 8
#define KERNEL_ACCEL_9500 8
#define KERNEL_ACCEL_9600 2
#define KERNEL_ACCEL_9700 8 #define KERNEL_ACCEL_9700 8
#define KERNEL_ACCEL_9710 8 #define KERNEL_ACCEL_9710 8
#define KERNEL_ACCEL_9720 8 #define KERNEL_ACCEL_9720 8
@ -392,10 +381,12 @@ extern hc_thread_mutex_t mux_display;
#define KERNEL_ACCEL_9810 8 #define KERNEL_ACCEL_9810 8
#define KERNEL_ACCEL_9820 8 #define KERNEL_ACCEL_9820 8
#define KERNEL_ACCEL_9900 64 #define KERNEL_ACCEL_9900 64
#define KERNEL_ACCEL_10000 2
#define KERNEL_ACCEL_10100 128 #define KERNEL_ACCEL_10100 128
#define KERNEL_ACCEL_10200 64 #define KERNEL_ACCEL_10200 64
#define KERNEL_ACCEL_10300 8 #define KERNEL_ACCEL_10300 8
#define KERNEL_ACCEL_10400 8 #define KERNEL_ACCEL_10400 8
#define KERNEL_ACCEL_10500 64
#define KERNEL_ACCEL_10410 8 #define KERNEL_ACCEL_10410 8
#define KERNEL_ACCEL_10420 8 #define KERNEL_ACCEL_10420 8
#define KERNEL_ACCEL_10600 64 #define KERNEL_ACCEL_10600 64
@ -405,16 +396,24 @@ extern hc_thread_mutex_t mux_display;
#define KERNEL_ACCEL_11000 64 #define KERNEL_ACCEL_11000 64
#define KERNEL_ACCEL_11100 64 #define KERNEL_ACCEL_11100 64
#define KERNEL_ACCEL_11200 64 #define KERNEL_ACCEL_11200 64
#define KERNEL_ACCEL_11300 2
#define KERNEL_ACCEL_11400 8 #define KERNEL_ACCEL_11400 8
#define KERNEL_ACCEL_11500 128 #define KERNEL_ACCEL_11500 128
#define KERNEL_ACCEL_11600 2
#define KERNEL_ACCEL_11700 4
#define KERNEL_ACCEL_11800 4
#define KERNEL_ACCEL_11900 2 #define KERNEL_ACCEL_11900 2
#define KERNEL_ACCEL_12000 2 #define KERNEL_ACCEL_12000 2
#define KERNEL_ACCEL_12100 2 #define KERNEL_ACCEL_12100 2
#define KERNEL_ACCEL_12200 2
#define KERNEL_ACCEL_12300 2 #define KERNEL_ACCEL_12300 2
#define KERNEL_ACCEL_12400 64
#define KERNEL_ACCEL_12500 8
#define KERNEL_ACCEL_12600 32 #define KERNEL_ACCEL_12600 32
#define KERNEL_ACCEL_12700 64 #define KERNEL_ACCEL_12700 64
#define KERNEL_ACCEL_12800 64 #define KERNEL_ACCEL_12800 64
#define KERNEL_ACCEL_12900 8 #define KERNEL_ACCEL_12900 8
#define KERNEL_ACCEL_13000 8
/** /**
* device loops macro * device loops macro
@ -575,7 +574,11 @@ extern hc_thread_mutex_t mux_display;
#define KERNEL_LOOPS_190 128 #define KERNEL_LOOPS_190 128
#define KERNEL_LOOPS_200 128 #define KERNEL_LOOPS_200 128
#define KERNEL_LOOPS_300 64 #define KERNEL_LOOPS_300 64
#define KERNEL_LOOPS_400 256
#define KERNEL_LOOPS_500 256
#define KERNEL_LOOPS_501 256
#define KERNEL_LOOPS_900 256 #define KERNEL_LOOPS_900 256
#define KERNEL_LOOPS_910 256
#define KERNEL_LOOPS_1000 256 #define KERNEL_LOOPS_1000 256
#define KERNEL_LOOPS_1100 128 #define KERNEL_LOOPS_1100 128
#define KERNEL_LOOPS_1400 64 #define KERNEL_LOOPS_1400 64
@ -587,6 +590,8 @@ extern hc_thread_mutex_t mux_display;
#define KERNEL_LOOPS_1441 64 #define KERNEL_LOOPS_1441 64
#define KERNEL_LOOPS_1450 32 #define KERNEL_LOOPS_1450 32
#define KERNEL_LOOPS_1460 32 #define KERNEL_LOOPS_1460 32
#define KERNEL_LOOPS_1500 256
#define KERNEL_LOOPS_1600 256
#define KERNEL_LOOPS_1700 32 #define KERNEL_LOOPS_1700 32
#define KERNEL_LOOPS_1710 32 #define KERNEL_LOOPS_1710 32
#define KERNEL_LOOPS_1711 32 #define KERNEL_LOOPS_1711 32
@ -597,13 +602,17 @@ extern hc_thread_mutex_t mux_display;
#define KERNEL_LOOPS_1740 32 #define KERNEL_LOOPS_1740 32
#define KERNEL_LOOPS_1750 16 #define KERNEL_LOOPS_1750 16
#define KERNEL_LOOPS_1760 16 #define KERNEL_LOOPS_1760 16
#define KERNEL_LOOPS_1800 16
#define KERNEL_LOOPS_2100 256
#define KERNEL_LOOPS_2400 256 #define KERNEL_LOOPS_2400 256
#define KERNEL_LOOPS_2410 256 #define KERNEL_LOOPS_2410 256
#define KERNEL_LOOPS_2500 256
#define KERNEL_LOOPS_2600 128 #define KERNEL_LOOPS_2600 128
#define KERNEL_LOOPS_2611 128 #define KERNEL_LOOPS_2611 128
#define KERNEL_LOOPS_2612 128 #define KERNEL_LOOPS_2612 128
#define KERNEL_LOOPS_2711 64 #define KERNEL_LOOPS_2711 64
#define KERNEL_LOOPS_2811 64 #define KERNEL_LOOPS_2811 64
#define KERNEL_LOOPS_3000 256
#define KERNEL_LOOPS_3100 16 #define KERNEL_LOOPS_3100 16
#define KERNEL_LOOPS_3200 16 #define KERNEL_LOOPS_3200 16
#define KERNEL_LOOPS_3710 128 #define KERNEL_LOOPS_3710 128
@ -617,73 +626,24 @@ extern hc_thread_mutex_t mux_display;
#define KERNEL_LOOPS_4900 128 #define KERNEL_LOOPS_4900 128
#define KERNEL_LOOPS_5000 64 #define KERNEL_LOOPS_5000 64
#define KERNEL_LOOPS_5100 256 #define KERNEL_LOOPS_5100 256
#define KERNEL_LOOPS_5200 256
#define KERNEL_LOOPS_5300 32 #define KERNEL_LOOPS_5300 32
#define KERNEL_LOOPS_5400 32 #define KERNEL_LOOPS_5400 32
#define KERNEL_LOOPS_5500 128 #define KERNEL_LOOPS_5500 128
#define KERNEL_LOOPS_5600 64 #define KERNEL_LOOPS_5600 64
#define KERNEL_LOOPS_5700 64 #define KERNEL_LOOPS_5700 64
#define KERNEL_LOOPS_5800 256
#define KERNEL_LOOPS_6000 64 #define KERNEL_LOOPS_6000 64
#define KERNEL_LOOPS_6100 64 #define KERNEL_LOOPS_6100 64
#define KERNEL_LOOPS_6231 200
#define KERNEL_LOOPS_6232 200
#define KERNEL_LOOPS_6233 200
#define KERNEL_LOOPS_6900 64
#define KERNEL_LOOPS_7300 64
#define KERNEL_LOOPS_7500 16
#define KERNEL_LOOPS_7600 128
#define KERNEL_LOOPS_7700 128
#define KERNEL_LOOPS_7800 64
#define KERNEL_LOOPS_8000 64
#define KERNEL_LOOPS_8100 128
#define KERNEL_LOOPS_8200 200
#define KERNEL_LOOPS_8300 64
#define KERNEL_LOOPS_8400 64
#define KERNEL_LOOPS_8500 16
#define KERNEL_LOOPS_8600 16
#define KERNEL_LOOPS_8700 16
#define KERNEL_LOOPS_9700 200
#define KERNEL_LOOPS_9710 200
#define KERNEL_LOOPS_9720 200
#define KERNEL_LOOPS_9800 200
#define KERNEL_LOOPS_9820 200
#define KERNEL_LOOPS_9810 200
#define KERNEL_LOOPS_9900 256
#define KERNEL_LOOPS_10100 512
#define KERNEL_LOOPS_10200 64
#define KERNEL_LOOPS_10400 256
#define KERNEL_LOOPS_10410 256
#define KERNEL_LOOPS_10420 256
#define KERNEL_LOOPS_10600 64
#define KERNEL_LOOPS_10700 64
#define KERNEL_LOOPS_10800 32
#define KERNEL_LOOPS_11000 256
#define KERNEL_LOOPS_11100 128
#define KERNEL_LOOPS_11200 128
#define KERNEL_LOOPS_11300 256
#define KERNEL_LOOPS_11400 128
#define KERNEL_LOOPS_11500 256
#define KERNEL_LOOPS_11700 64
#define KERNEL_LOOPS_11800 64
#define KERNEL_LOOPS_12600 32
#define KERNEL_LOOPS_400 256
#define KERNEL_LOOPS_500 256
#define KERNEL_LOOPS_501 256
#define KERNEL_LOOPS_910 256
#define KERNEL_LOOPS_1500 256
#define KERNEL_LOOPS_1600 256
#define KERNEL_LOOPS_1800 16
#define KERNEL_LOOPS_2100 256
#define KERNEL_LOOPS_2500 256
#define KERNEL_LOOPS_3000 256
#define KERNEL_LOOPS_5200 256
#define KERNEL_LOOPS_5800 256
#define KERNEL_LOOPS_6211 200 #define KERNEL_LOOPS_6211 200
#define KERNEL_LOOPS_6212 200 #define KERNEL_LOOPS_6212 200
#define KERNEL_LOOPS_6213 200 #define KERNEL_LOOPS_6213 200
#define KERNEL_LOOPS_6221 200 #define KERNEL_LOOPS_6221 200
#define KERNEL_LOOPS_6222 200 #define KERNEL_LOOPS_6222 200
#define KERNEL_LOOPS_6223 200 #define KERNEL_LOOPS_6223 200
#define KERNEL_LOOPS_6231 200
#define KERNEL_LOOPS_6232 200
#define KERNEL_LOOPS_6233 200
#define KERNEL_LOOPS_6241 200 #define KERNEL_LOOPS_6241 200
#define KERNEL_LOOPS_6242 200 #define KERNEL_LOOPS_6242 200
#define KERNEL_LOOPS_6243 200 #define KERNEL_LOOPS_6243 200
@ -693,10 +653,24 @@ extern hc_thread_mutex_t mux_display;
#define KERNEL_LOOPS_6600 200 #define KERNEL_LOOPS_6600 200
#define KERNEL_LOOPS_6700 256 #define KERNEL_LOOPS_6700 256
#define KERNEL_LOOPS_6800 200 #define KERNEL_LOOPS_6800 200
#define KERNEL_LOOPS_6900 64
#define KERNEL_LOOPS_7100 256 #define KERNEL_LOOPS_7100 256
#define KERNEL_LOOPS_7200 200 #define KERNEL_LOOPS_7200 200
#define KERNEL_LOOPS_7300 64
#define KERNEL_LOOPS_7400 200 #define KERNEL_LOOPS_7400 200
#define KERNEL_LOOPS_7500 16
#define KERNEL_LOOPS_7600 128
#define KERNEL_LOOPS_7700 128
#define KERNEL_LOOPS_7800 64
#define KERNEL_LOOPS_7900 256 #define KERNEL_LOOPS_7900 256
#define KERNEL_LOOPS_8000 64
#define KERNEL_LOOPS_8100 128
#define KERNEL_LOOPS_8200 200
#define KERNEL_LOOPS_8300 64
#define KERNEL_LOOPS_8400 64
#define KERNEL_LOOPS_8500 16
#define KERNEL_LOOPS_8600 16
#define KERNEL_LOOPS_8700 16
#define KERNEL_LOOPS_8800 256 #define KERNEL_LOOPS_8800 256
#define KERNEL_LOOPS_8900 1 #define KERNEL_LOOPS_8900 1
#define KERNEL_LOOPS_9000 16 #define KERNEL_LOOPS_9000 16
@ -706,11 +680,34 @@ extern hc_thread_mutex_t mux_display;
#define KERNEL_LOOPS_9400 200 #define KERNEL_LOOPS_9400 200
#define KERNEL_LOOPS_9500 200 #define KERNEL_LOOPS_9500 200
#define KERNEL_LOOPS_9600 200 #define KERNEL_LOOPS_9600 200
#define KERNEL_LOOPS_9700 200
#define KERNEL_LOOPS_9710 200
#define KERNEL_LOOPS_9720 200
#define KERNEL_LOOPS_9800 200
#define KERNEL_LOOPS_9820 200
#define KERNEL_LOOPS_9810 200
#define KERNEL_LOOPS_9900 256
#define KERNEL_LOOPS_10000 200 #define KERNEL_LOOPS_10000 200
#define KERNEL_LOOPS_10100 512
#define KERNEL_LOOPS_10200 64
#define KERNEL_LOOPS_10300 128 #define KERNEL_LOOPS_10300 128
#define KERNEL_LOOPS_10400 256
#define KERNEL_LOOPS_10410 256
#define KERNEL_LOOPS_10420 256
#define KERNEL_LOOPS_10500 64 #define KERNEL_LOOPS_10500 64
#define KERNEL_LOOPS_10600 64
#define KERNEL_LOOPS_10700 64
#define KERNEL_LOOPS_10800 32
#define KERNEL_LOOPS_10900 200 #define KERNEL_LOOPS_10900 200
#define KERNEL_LOOPS_11000 256
#define KERNEL_LOOPS_11100 128
#define KERNEL_LOOPS_11200 128
#define KERNEL_LOOPS_11300 256
#define KERNEL_LOOPS_11400 128
#define KERNEL_LOOPS_11500 256
#define KERNEL_LOOPS_11600 512 #define KERNEL_LOOPS_11600 512
#define KERNEL_LOOPS_11700 64
#define KERNEL_LOOPS_11800 64
#define KERNEL_LOOPS_11900 200 #define KERNEL_LOOPS_11900 200
#define KERNEL_LOOPS_12000 200 #define KERNEL_LOOPS_12000 200
#define KERNEL_LOOPS_12100 200 #define KERNEL_LOOPS_12100 200
@ -718,6 +715,7 @@ extern hc_thread_mutex_t mux_display;
#define KERNEL_LOOPS_12300 256 #define KERNEL_LOOPS_12300 256
#define KERNEL_LOOPS_12400 256 #define KERNEL_LOOPS_12400 256
#define KERNEL_LOOPS_12500 256 #define KERNEL_LOOPS_12500 256
#define KERNEL_LOOPS_12600 32
#define KERNEL_LOOPS_12700 10 #define KERNEL_LOOPS_12700 10
#define KERNEL_LOOPS_12800 100 #define KERNEL_LOOPS_12800 100
#define KERNEL_LOOPS_12900 64 #define KERNEL_LOOPS_12900 64