1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-23 00:28:11 +00:00

Improve grouping of include calls as a preparation

This commit is contained in:
jsteube 2019-03-22 12:58:56 +01:00
parent 305a044ec6
commit c1d5d2ff45
38 changed files with 2 additions and 40 deletions

View File

@ -10,7 +10,6 @@
#include "inc_common.cl" #include "inc_common.cl"
#include "inc_simd.cl" #include "inc_simd.cl"
#include "inc_hash_ripemd160.cl" #include "inc_hash_ripemd160.cl"
#include "inc_cipher_aes.cl" #include "inc_cipher_aes.cl"
#include "inc_cipher_twofish.cl" #include "inc_cipher_twofish.cl"
#include "inc_cipher_serpent.cl" #include "inc_cipher_serpent.cl"

View File

@ -10,7 +10,6 @@
#include "inc_common.cl" #include "inc_common.cl"
#include "inc_simd.cl" #include "inc_simd.cl"
#include "inc_hash_ripemd160.cl" #include "inc_hash_ripemd160.cl"
#include "inc_cipher_aes.cl" #include "inc_cipher_aes.cl"
#include "inc_cipher_twofish.cl" #include "inc_cipher_twofish.cl"
#include "inc_cipher_serpent.cl" #include "inc_cipher_serpent.cl"

View File

@ -10,7 +10,6 @@
#include "inc_common.cl" #include "inc_common.cl"
#include "inc_simd.cl" #include "inc_simd.cl"
#include "inc_hash_ripemd160.cl" #include "inc_hash_ripemd160.cl"
#include "inc_cipher_aes.cl" #include "inc_cipher_aes.cl"
#include "inc_cipher_twofish.cl" #include "inc_cipher_twofish.cl"
#include "inc_cipher_serpent.cl" #include "inc_cipher_serpent.cl"

View File

@ -10,7 +10,6 @@
#include "inc_common.cl" #include "inc_common.cl"
#include "inc_simd.cl" #include "inc_simd.cl"
#include "inc_hash_sha512.cl" #include "inc_hash_sha512.cl"
#include "inc_cipher_aes.cl" #include "inc_cipher_aes.cl"
#include "inc_cipher_twofish.cl" #include "inc_cipher_twofish.cl"
#include "inc_cipher_serpent.cl" #include "inc_cipher_serpent.cl"

View File

@ -10,7 +10,6 @@
#include "inc_common.cl" #include "inc_common.cl"
#include "inc_simd.cl" #include "inc_simd.cl"
#include "inc_hash_sha512.cl" #include "inc_hash_sha512.cl"
#include "inc_cipher_aes.cl" #include "inc_cipher_aes.cl"
#include "inc_cipher_twofish.cl" #include "inc_cipher_twofish.cl"
#include "inc_cipher_serpent.cl" #include "inc_cipher_serpent.cl"

View File

@ -10,7 +10,6 @@
#include "inc_common.cl" #include "inc_common.cl"
#include "inc_simd.cl" #include "inc_simd.cl"
#include "inc_hash_sha512.cl" #include "inc_hash_sha512.cl"
#include "inc_cipher_aes.cl" #include "inc_cipher_aes.cl"
#include "inc_cipher_twofish.cl" #include "inc_cipher_twofish.cl"
#include "inc_cipher_serpent.cl" #include "inc_cipher_serpent.cl"

View File

@ -10,7 +10,6 @@
#include "inc_common.cl" #include "inc_common.cl"
#include "inc_simd.cl" #include "inc_simd.cl"
#include "inc_hash_whirlpool.cl" #include "inc_hash_whirlpool.cl"
#include "inc_cipher_aes.cl" #include "inc_cipher_aes.cl"
#include "inc_cipher_twofish.cl" #include "inc_cipher_twofish.cl"
#include "inc_cipher_serpent.cl" #include "inc_cipher_serpent.cl"

View File

@ -10,7 +10,6 @@
#include "inc_common.cl" #include "inc_common.cl"
#include "inc_simd.cl" #include "inc_simd.cl"
#include "inc_hash_whirlpool.cl" #include "inc_hash_whirlpool.cl"
#include "inc_cipher_aes.cl" #include "inc_cipher_aes.cl"
#include "inc_cipher_twofish.cl" #include "inc_cipher_twofish.cl"
#include "inc_cipher_serpent.cl" #include "inc_cipher_serpent.cl"

View File

@ -10,7 +10,6 @@
#include "inc_common.cl" #include "inc_common.cl"
#include "inc_simd.cl" #include "inc_simd.cl"
#include "inc_hash_whirlpool.cl" #include "inc_hash_whirlpool.cl"
#include "inc_cipher_aes.cl" #include "inc_cipher_aes.cl"
#include "inc_cipher_twofish.cl" #include "inc_cipher_twofish.cl"
#include "inc_cipher_serpent.cl" #include "inc_cipher_serpent.cl"

View File

@ -13,7 +13,6 @@
#include "inc_common.cl" #include "inc_common.cl"
#include "inc_simd.cl" #include "inc_simd.cl"
#include "inc_hash_ripemd160.cl" #include "inc_hash_ripemd160.cl"
#include "inc_cipher_aes.cl" #include "inc_cipher_aes.cl"
#include "inc_cipher_twofish.cl" #include "inc_cipher_twofish.cl"
#include "inc_cipher_serpent.cl" #include "inc_cipher_serpent.cl"

View File

@ -13,7 +13,6 @@
#include "inc_common.cl" #include "inc_common.cl"
#include "inc_simd.cl" #include "inc_simd.cl"
#include "inc_hash_ripemd160.cl" #include "inc_hash_ripemd160.cl"
#include "inc_cipher_aes.cl" #include "inc_cipher_aes.cl"
#include "inc_cipher_twofish.cl" #include "inc_cipher_twofish.cl"
#include "inc_cipher_serpent.cl" #include "inc_cipher_serpent.cl"

View File

@ -13,7 +13,6 @@
#include "inc_common.cl" #include "inc_common.cl"
#include "inc_simd.cl" #include "inc_simd.cl"
#include "inc_hash_ripemd160.cl" #include "inc_hash_ripemd160.cl"
#include "inc_cipher_aes.cl" #include "inc_cipher_aes.cl"
#include "inc_cipher_twofish.cl" #include "inc_cipher_twofish.cl"
#include "inc_cipher_serpent.cl" #include "inc_cipher_serpent.cl"

View File

@ -13,7 +13,6 @@
#include "inc_common.cl" #include "inc_common.cl"
#include "inc_simd.cl" #include "inc_simd.cl"
#include "inc_hash_sha512.cl" #include "inc_hash_sha512.cl"
#include "inc_cipher_aes.cl" #include "inc_cipher_aes.cl"
#include "inc_cipher_twofish.cl" #include "inc_cipher_twofish.cl"
#include "inc_cipher_serpent.cl" #include "inc_cipher_serpent.cl"

View File

@ -13,7 +13,6 @@
#include "inc_common.cl" #include "inc_common.cl"
#include "inc_simd.cl" #include "inc_simd.cl"
#include "inc_hash_sha512.cl" #include "inc_hash_sha512.cl"
#include "inc_cipher_aes.cl" #include "inc_cipher_aes.cl"
#include "inc_cipher_twofish.cl" #include "inc_cipher_twofish.cl"
#include "inc_cipher_serpent.cl" #include "inc_cipher_serpent.cl"

View File

@ -13,7 +13,6 @@
#include "inc_common.cl" #include "inc_common.cl"
#include "inc_simd.cl" #include "inc_simd.cl"
#include "inc_hash_sha512.cl" #include "inc_hash_sha512.cl"
#include "inc_cipher_aes.cl" #include "inc_cipher_aes.cl"
#include "inc_cipher_twofish.cl" #include "inc_cipher_twofish.cl"
#include "inc_cipher_serpent.cl" #include "inc_cipher_serpent.cl"

View File

@ -13,7 +13,6 @@
#include "inc_common.cl" #include "inc_common.cl"
#include "inc_simd.cl" #include "inc_simd.cl"
#include "inc_hash_whirlpool.cl" #include "inc_hash_whirlpool.cl"
#include "inc_cipher_aes.cl" #include "inc_cipher_aes.cl"
#include "inc_cipher_twofish.cl" #include "inc_cipher_twofish.cl"
#include "inc_cipher_serpent.cl" #include "inc_cipher_serpent.cl"

View File

@ -13,7 +13,6 @@
#include "inc_common.cl" #include "inc_common.cl"
#include "inc_simd.cl" #include "inc_simd.cl"
#include "inc_hash_whirlpool.cl" #include "inc_hash_whirlpool.cl"
#include "inc_cipher_aes.cl" #include "inc_cipher_aes.cl"
#include "inc_cipher_twofish.cl" #include "inc_cipher_twofish.cl"
#include "inc_cipher_serpent.cl" #include "inc_cipher_serpent.cl"

View File

@ -13,7 +13,6 @@
#include "inc_common.cl" #include "inc_common.cl"
#include "inc_simd.cl" #include "inc_simd.cl"
#include "inc_hash_whirlpool.cl" #include "inc_hash_whirlpool.cl"
#include "inc_cipher_aes.cl" #include "inc_cipher_aes.cl"
#include "inc_cipher_twofish.cl" #include "inc_cipher_twofish.cl"
#include "inc_cipher_serpent.cl" #include "inc_cipher_serpent.cl"

View File

@ -13,7 +13,6 @@
#include "inc_common.cl" #include "inc_common.cl"
#include "inc_simd.cl" #include "inc_simd.cl"
#include "inc_hash_sha256.cl" #include "inc_hash_sha256.cl"
#include "inc_cipher_aes.cl" #include "inc_cipher_aes.cl"
#include "inc_cipher_twofish.cl" #include "inc_cipher_twofish.cl"
#include "inc_cipher_serpent.cl" #include "inc_cipher_serpent.cl"

View File

@ -13,7 +13,6 @@
#include "inc_common.cl" #include "inc_common.cl"
#include "inc_simd.cl" #include "inc_simd.cl"
#include "inc_hash_sha256.cl" #include "inc_hash_sha256.cl"
#include "inc_cipher_aes.cl" #include "inc_cipher_aes.cl"
#include "inc_cipher_twofish.cl" #include "inc_cipher_twofish.cl"
#include "inc_cipher_serpent.cl" #include "inc_cipher_serpent.cl"

View File

@ -13,7 +13,6 @@
#include "inc_common.cl" #include "inc_common.cl"
#include "inc_simd.cl" #include "inc_simd.cl"
#include "inc_hash_sha256.cl" #include "inc_hash_sha256.cl"
#include "inc_cipher_aes.cl" #include "inc_cipher_aes.cl"
#include "inc_cipher_twofish.cl" #include "inc_cipher_twofish.cl"
#include "inc_cipher_serpent.cl" #include "inc_cipher_serpent.cl"

View File

@ -13,7 +13,6 @@
#include "inc_common.cl" #include "inc_common.cl"
#include "inc_simd.cl" #include "inc_simd.cl"
#include "inc_hash_streebog512.cl" #include "inc_hash_streebog512.cl"
#include "inc_cipher_aes.cl" #include "inc_cipher_aes.cl"
#include "inc_cipher_twofish.cl" #include "inc_cipher_twofish.cl"
#include "inc_cipher_serpent.cl" #include "inc_cipher_serpent.cl"

View File

@ -13,7 +13,6 @@
#include "inc_common.cl" #include "inc_common.cl"
#include "inc_simd.cl" #include "inc_simd.cl"
#include "inc_hash_streebog512.cl" #include "inc_hash_streebog512.cl"
#include "inc_cipher_aes.cl" #include "inc_cipher_aes.cl"
#include "inc_cipher_twofish.cl" #include "inc_cipher_twofish.cl"
#include "inc_cipher_serpent.cl" #include "inc_cipher_serpent.cl"

View File

@ -13,7 +13,6 @@
#include "inc_common.cl" #include "inc_common.cl"
#include "inc_simd.cl" #include "inc_simd.cl"
#include "inc_hash_streebog512.cl" #include "inc_hash_streebog512.cl"
#include "inc_cipher_aes.cl" #include "inc_cipher_aes.cl"
#include "inc_cipher_twofish.cl" #include "inc_cipher_twofish.cl"
#include "inc_cipher_serpent.cl" #include "inc_cipher_serpent.cl"

View File

@ -83,7 +83,6 @@ typedef struct luks_tmp
#include "inc_luks_af.cl" #include "inc_luks_af.cl"
#include "inc_luks_essiv.cl" #include "inc_luks_essiv.cl"
#include "inc_luks_xts.cl" #include "inc_luks_xts.cl"
#include "inc_luks_aes.cl" #include "inc_luks_aes.cl"
#define COMPARE_S "inc_comp_single.cl" #define COMPARE_S "inc_comp_single.cl"

View File

@ -83,7 +83,6 @@ typedef struct luks_tmp
#include "inc_luks_af.cl" #include "inc_luks_af.cl"
#include "inc_luks_essiv.cl" #include "inc_luks_essiv.cl"
#include "inc_luks_xts.cl" #include "inc_luks_xts.cl"
#include "inc_luks_serpent.cl" #include "inc_luks_serpent.cl"
#define COMPARE_S "inc_comp_single.cl" #define COMPARE_S "inc_comp_single.cl"

View File

@ -83,7 +83,6 @@ typedef struct luks_tmp
#include "inc_luks_af.cl" #include "inc_luks_af.cl"
#include "inc_luks_essiv.cl" #include "inc_luks_essiv.cl"
#include "inc_luks_xts.cl" #include "inc_luks_xts.cl"
#include "inc_luks_twofish.cl" #include "inc_luks_twofish.cl"
#define COMPARE_S "inc_comp_single.cl" #define COMPARE_S "inc_comp_single.cl"

View File

@ -82,7 +82,6 @@ typedef struct luks_tmp
#include "inc_luks_af.cl" #include "inc_luks_af.cl"
#include "inc_luks_essiv.cl" #include "inc_luks_essiv.cl"
#include "inc_luks_xts.cl" #include "inc_luks_xts.cl"
#include "inc_luks_aes.cl" #include "inc_luks_aes.cl"
#define COMPARE_S "inc_comp_single.cl" #define COMPARE_S "inc_comp_single.cl"

View File

@ -82,7 +82,6 @@ typedef struct luks_tmp
#include "inc_luks_af.cl" #include "inc_luks_af.cl"
#include "inc_luks_essiv.cl" #include "inc_luks_essiv.cl"
#include "inc_luks_xts.cl" #include "inc_luks_xts.cl"
#include "inc_luks_serpent.cl" #include "inc_luks_serpent.cl"
#define COMPARE_S "inc_comp_single.cl" #define COMPARE_S "inc_comp_single.cl"

View File

@ -82,7 +82,6 @@ typedef struct luks_tmp
#include "inc_luks_af.cl" #include "inc_luks_af.cl"
#include "inc_luks_essiv.cl" #include "inc_luks_essiv.cl"
#include "inc_luks_xts.cl" #include "inc_luks_xts.cl"
#include "inc_luks_twofish.cl" #include "inc_luks_twofish.cl"
#define COMPARE_S "inc_comp_single.cl" #define COMPARE_S "inc_comp_single.cl"

View File

@ -82,7 +82,6 @@ typedef struct luks_tmp
#include "inc_luks_af.cl" #include "inc_luks_af.cl"
#include "inc_luks_essiv.cl" #include "inc_luks_essiv.cl"
#include "inc_luks_xts.cl" #include "inc_luks_xts.cl"
#include "inc_luks_aes.cl" #include "inc_luks_aes.cl"
#define COMPARE_S "inc_comp_single.cl" #define COMPARE_S "inc_comp_single.cl"

View File

@ -82,7 +82,6 @@ typedef struct luks_tmp
#include "inc_luks_af.cl" #include "inc_luks_af.cl"
#include "inc_luks_essiv.cl" #include "inc_luks_essiv.cl"
#include "inc_luks_xts.cl" #include "inc_luks_xts.cl"
#include "inc_luks_serpent.cl" #include "inc_luks_serpent.cl"
#define COMPARE_S "inc_comp_single.cl" #define COMPARE_S "inc_comp_single.cl"

View File

@ -82,7 +82,6 @@ typedef struct luks_tmp
#include "inc_luks_af.cl" #include "inc_luks_af.cl"
#include "inc_luks_essiv.cl" #include "inc_luks_essiv.cl"
#include "inc_luks_xts.cl" #include "inc_luks_xts.cl"
#include "inc_luks_twofish.cl" #include "inc_luks_twofish.cl"
#define COMPARE_S "inc_comp_single.cl" #define COMPARE_S "inc_comp_single.cl"

View File

@ -82,7 +82,6 @@ typedef struct luks_tmp
#include "inc_luks_af.cl" #include "inc_luks_af.cl"
#include "inc_luks_essiv.cl" #include "inc_luks_essiv.cl"
#include "inc_luks_xts.cl" #include "inc_luks_xts.cl"
#include "inc_luks_aes.cl" #include "inc_luks_aes.cl"
#define COMPARE_S "inc_comp_single.cl" #define COMPARE_S "inc_comp_single.cl"

View File

@ -82,7 +82,6 @@ typedef struct luks_tmp
#include "inc_luks_af.cl" #include "inc_luks_af.cl"
#include "inc_luks_essiv.cl" #include "inc_luks_essiv.cl"
#include "inc_luks_xts.cl" #include "inc_luks_xts.cl"
#include "inc_luks_serpent.cl" #include "inc_luks_serpent.cl"
#define COMPARE_S "inc_comp_single.cl" #define COMPARE_S "inc_comp_single.cl"

View File

@ -82,7 +82,6 @@ typedef struct luks_tmp
#include "inc_luks_af.cl" #include "inc_luks_af.cl"
#include "inc_luks_essiv.cl" #include "inc_luks_essiv.cl"
#include "inc_luks_xts.cl" #include "inc_luks_xts.cl"
#include "inc_luks_twofish.cl" #include "inc_luks_twofish.cl"
#define COMPARE_S "inc_comp_single.cl" #define COMPARE_S "inc_comp_single.cl"

View File

@ -4,11 +4,10 @@
*/ */
#include "inc_vendor.h" #include "inc_vendor.h"
#include "inc_types.h"
#define CHARSIZ 256 #define CHARSIZ 256
#include "inc_types.h"
DECLSPEC void generate_pw (u32 *pw_buf, __global const cs_t *root_css_buf, __global const cs_t *markov_css_buf, const u32 pw_l_len, const u32 pw_r_len, const u32 mask80, const u32 bits14, const u32 bits15, u64 val) DECLSPEC void generate_pw (u32 *pw_buf, __global const cs_t *root_css_buf, __global const cs_t *markov_css_buf, const u32 pw_l_len, const u32 pw_r_len, const u32 mask80, const u32 bits14, const u32 bits15, u64 val)
{ {
__global const cs_t *cs = &root_css_buf[pw_r_len]; __global const cs_t *cs = &root_css_buf[pw_r_len];

View File

@ -4,11 +4,10 @@
*/ */
#include "inc_vendor.h" #include "inc_vendor.h"
#include "inc_types.h"
#define CHARSIZ 256 #define CHARSIZ 256
#include "inc_types.h"
DECLSPEC void generate_pw (u32 *pw_buf, __global const cs_t *root_css_buf, __global const cs_t *markov_css_buf, const u32 pw_l_len, const u32 pw_r_len, const u32 mask80, const u32 bits14, const u32 bits15, u64 val) DECLSPEC void generate_pw (u32 *pw_buf, __global const cs_t *root_css_buf, __global const cs_t *markov_css_buf, const u32 pw_l_len, const u32 pw_r_len, const u32 mask80, const u32 bits14, const u32 bits15, u64 val)
{ {
__global const cs_t *cs = &root_css_buf[pw_r_len]; __global const cs_t *cs = &root_css_buf[pw_r_len];