diff --git a/OpenCL/inc_common.cl b/OpenCL/inc_common.cl index e25f26dc6..688dd8646 100644 --- a/OpenCL/inc_common.cl +++ b/OpenCL/inc_common.cl @@ -1451,6 +1451,7 @@ DECLSPEC int ffz (const u32 v) return -1; } +#ifdef KERNEL_STATIC DECLSPEC int hash_comp (const u32 *d1, GLOBAL_AS const u32 *d2) { if (d1[3] > d2[DGST_R3]) return ( 1); @@ -1487,6 +1488,7 @@ DECLSPEC int find_hash (const u32 *digest, const u32 digests_cnt, GLOBAL_AS cons return (-1); } +#endif DECLSPEC u32 check_bitmap (GLOBAL_AS const u32 *bitmap, const u32 bitmap_mask, const u32 bitmap_shift, const u32 digest) { diff --git a/OpenCL/inc_common.h b/OpenCL/inc_common.h index ac9a271b6..2ade7c0e0 100644 --- a/OpenCL/inc_common.h +++ b/OpenCL/inc_common.h @@ -158,8 +158,12 @@ DECLSPEC u32 hc_lop_0x96_S (const u32 a, const u32 b, const u32 c); // legacy common code DECLSPEC int ffz (const u32 v); + +#ifdef KERNEL_STATIC DECLSPEC int hash_comp (const u32 *d1, GLOBAL_AS const u32 *d2); DECLSPEC int find_hash (const u32 *digest, const u32 digests_cnt, GLOBAL_AS const digest_t *digests_buf); +#endif + DECLSPEC u32 check_bitmap (GLOBAL_AS const u32 *bitmap, const u32 bitmap_mask, const u32 bitmap_shift, const u32 digest); DECLSPEC u32 check (const u32 *digest, GLOBAL_AS const u32 *bitmap_s1_a, GLOBAL_AS const u32 *bitmap_s1_b, GLOBAL_AS const u32 *bitmap_s1_c, GLOBAL_AS const u32 *bitmap_s1_d, GLOBAL_AS const u32 *bitmap_s2_a, GLOBAL_AS const u32 *bitmap_s2_b, GLOBAL_AS const u32 *bitmap_s2_c, GLOBAL_AS const u32 *bitmap_s2_d, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2); DECLSPEC void mark_hash (GLOBAL_AS plain_t *plains_buf, GLOBAL_AS u32 *d_result, const u32 salt_pos, const u32 digests_cnt, const u32 digest_pos, const u32 hash_pos, const u64 gid, const u32 il_pos, const u32 extra1, const u32 extra2); diff --git a/OpenCL/inc_rp.cl b/OpenCL/inc_rp.cl index 2cd93787f..657e33000 100644 --- a/OpenCL/inc_rp.cl +++ b/OpenCL/inc_rp.cl @@ -8,6 +8,10 @@ #include "inc_common.h" #include "inc_rp.h" +#ifndef MAYBE_UNUSED +#define MAYBE_UNUSED +#endif + #ifdef REAL_SHM #define COPY_PW(x) \ LOCAL_AS pw_t s_pws[64]; \ diff --git a/OpenCL/inc_rp.h b/OpenCL/inc_rp.h index 78ab5b7db..ff097ebbe 100644 --- a/OpenCL/inc_rp.h +++ b/OpenCL/inc_rp.h @@ -6,6 +6,10 @@ #ifndef _INC_RP_H #define _INC_RP_H +#ifndef DECLSPEC +#define DECLSPEC +#endif + #ifndef MAYBE_UNUSED #define MAYBE_UNUSED #endif diff --git a/OpenCL/inc_rp_optimized.h b/OpenCL/inc_rp_optimized.h index eb3c6ec84..1e0d6c562 100644 --- a/OpenCL/inc_rp_optimized.h +++ b/OpenCL/inc_rp_optimized.h @@ -6,6 +6,10 @@ #ifndef _INC_RP_OPTIMIZED_H #define _INC_RP_OPTIMIZED_H +#ifndef DECLSPEC +#define DECLSPEC +#endif + #ifndef MAYBE_UNUSED #define MAYBE_UNUSED #endif diff --git a/OpenCL/inc_types.h b/OpenCL/inc_types.h index 7137320a8..9beb0f3b9 100644 --- a/OpenCL/inc_types.h +++ b/OpenCL/inc_types.h @@ -823,11 +823,13 @@ typedef enum combinator_mode } combinator_mode_t; +#ifdef KERNEL_STATIC typedef struct digest { u32 digest_buf[DGST_ELEM]; } digest_t; +#endif typedef struct salt { diff --git a/include/cpu_sha1.h b/include/cpu_sha1.h deleted file mode 100644 index 138715485..000000000 --- a/include/cpu_sha1.h +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Author......: See docs/credits.txt - * License.....: MIT - */ - -#ifndef _CPU_SHA1_H -#define _CPU_SHA1_H - -void sha1_64 (const u32 block[16], u32 digest[5]); - -#endif // _CPU_SHA1_H diff --git a/include/emu_general.h b/include/emu_general.h index a94d7aff7..a17ac5159 100644 --- a/include/emu_general.h +++ b/include/emu_general.h @@ -6,10 +6,6 @@ #ifndef _CPU_OPENCL_EMU_H #define _CPU_OPENCL_EMU_H -#include -#include -#include - #define DEVICE_TYPE -1 #define VENDOR_ID -1 #define LOCAL_MEM_TYPE 2 @@ -19,26 +15,6 @@ #define HAS_VBFE 0 #define VECT_SIZE 1 -typedef uint8_t uchar; -typedef uint16_t ushort; -typedef uint32_t uint; -typedef uint64_t ulong; - -typedef uint8_t u8; -typedef uint16_t u16; -typedef uint32_t u32; -typedef uint64_t u64; - -// there's no such thing in plain C, therefore all vector operation cannot work in this emu -// which is why VECT_SIZE is set to 1 - -typedef u8 u8x; -typedef u16 u16x; -typedef u32 u32x; -typedef u64 u64x; - -typedef uint uint4; - uint atomic_dec (uint *p); uint atomic_inc (uint *p); diff --git a/include/emu_inc_hash_md4.h b/include/emu_inc_hash_md4.h index 78a14277c..90fad3f8e 100644 --- a/include/emu_inc_hash_md4.h +++ b/include/emu_inc_hash_md4.h @@ -3,6 +3,9 @@ * License.....: MIT */ +#ifndef _EMU_INC_HASH_MD4_H +#define _EMU_INC_HASH_MD4_H + #include "emu_general.h" #define DGST_ELEM 4 @@ -20,3 +23,5 @@ #include "inc_hash_md4.h" #pragma GCC diagnostic pop + +#endif // _EMU_INC_HASH_MD4_H diff --git a/include/emu_inc_hash_sha1.h b/include/emu_inc_hash_sha1.h new file mode 100644 index 000000000..05ffb1c92 --- /dev/null +++ b/include/emu_inc_hash_sha1.h @@ -0,0 +1,27 @@ +/** + * Author......: See docs/credits.txt + * License.....: MIT + */ + +#ifndef _EMU_INC_HASH_SHA1_H +#define _EMU_INC_HASH_SHA1_H + +#include "emu_general.h" + +#define DGST_ELEM 4 +#define DGST_R0 0 +#define DGST_R1 1 +#define DGST_R2 2 +#define DGST_R3 3 + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-variable" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunknown-pragmas" + +#include "inc_vendor.h" +#include "inc_hash_sha1.h" + +#pragma GCC diagnostic pop + +#endif // _EMU_INC_HASH_SHA1_H diff --git a/include/emu_inc_rp.h b/include/emu_inc_rp.h index 7f4fe179d..9ac99ebe9 100644 --- a/include/emu_inc_rp.h +++ b/include/emu_inc_rp.h @@ -3,6 +3,9 @@ * License.....: MIT */ +#ifndef _EMU_INC_RP_H +#define _EMU_INC_RP_H + #include "emu_general.h" #define DGST_ELEM 4 @@ -17,8 +20,8 @@ #pragma GCC diagnostic ignored "-Wunknown-pragmas" #include "inc_vendor.h" -//#include "inc_types.h" -//#include "inc_common.h" #include "inc_rp.h" #pragma GCC diagnostic pop + +#endif // _EMU_INC_RP_H diff --git a/include/emu_inc_rp_optimized.h b/include/emu_inc_rp_optimized.h index 9f8230e34..04032ae8f 100644 --- a/include/emu_inc_rp_optimized.h +++ b/include/emu_inc_rp_optimized.h @@ -3,6 +3,9 @@ * License.....: MIT */ +#ifndef _EMU_INC_RP_OPTIMIZED_H +#define _EMU_INC_RP_OPTIMIZED_H + #include "emu_general.h" #define DGST_ELEM 4 @@ -17,8 +20,8 @@ #pragma GCC diagnostic ignored "-Wunknown-pragmas" #include "inc_vendor.h" -//#include "inc_types.h" -//#include "inc_common.h" #include "inc_rp_optimized.h" #pragma GCC diagnostic pop + +#endif // _EMU_INC_RP_OPTIMIZED_H diff --git a/include/types.h b/include/types.h index 69fac18f5..29ba82e07 100644 --- a/include/types.h +++ b/include/types.h @@ -16,6 +16,7 @@ #include #include #include +#include #if defined (_WIN) #define WINICONV_CONST @@ -38,16 +39,25 @@ typedef INT64 int64_t; #endif #endif // _WIN -typedef uint8_t u8; -typedef uint16_t u16; -typedef uint32_t u32; -typedef uint64_t u64; - typedef int8_t i8; typedef int16_t i16; typedef int32_t i32; typedef int64_t i64; +// import types from opencl + +typedef uint8_t uchar; +typedef uint16_t ushort; +typedef uint32_t uint; +typedef uint64_t ulong; + +#include "inc_types.h" + +// there's no such thing in plain C, therefore all vector operation cannot work in this emu +// which is why VECT_SIZE is set to 1 + +typedef uint uint4; + // timer #if defined (_WIN) @@ -75,60 +85,6 @@ typedef pthread_mutex_t hc_thread_mutex_t; typedef sem_t hc_thread_semaphore_t; #endif -// unions - -typedef union vconv32 -{ - u64 v32; - - struct - { - u16 v16a; - u16 v16b; - }; - - struct - { - u8 v8a; - u8 v8b; - u8 v8c; - u8 v8d; - }; - -} vconv32_t; - -typedef union vconv64 -{ - u64 v64; - - struct - { - u32 v32a; - u32 v32b; - }; - - struct - { - u16 v16a; - u16 v16b; - u16 v16c; - u16 v16d; - }; - - struct - { - u8 v8a; - u8 v8b; - u8 v8c; - u8 v8d; - u8 v8e; - u8 v8f; - u8 v8g; - u8 v8h; - }; - -} vconv64_t; - // enums typedef enum loglevel @@ -288,13 +244,6 @@ typedef enum attack_kern } attack_kern_t; -typedef enum combinator_mode -{ - COMBINATOR_MODE_BASE_LEFT = 10001, - COMBINATOR_MODE_BASE_RIGHT = 10002 - -} combinator_mode_t; - typedef enum kern_run { KERN_RUN_1 = 1000, @@ -828,28 +777,6 @@ typedef void * hc_dynfunc_t; * structs */ -typedef struct salt -{ - u32 salt_buf[64]; - u32 salt_buf_pc[64]; - - u32 salt_len; - u32 salt_len_pc; - u32 salt_iter; - u32 salt_iter2; - u32 salt_sign[2]; - - u32 digests_cnt; - u32 digests_done; - - u32 digests_offset; - - u32 scrypt_N; - u32 scrypt_r; - u32 scrypt_p; - -} salt_t; - typedef struct user { char *user_name; @@ -1029,14 +956,6 @@ struct hashconfig typedef struct hashconfig hashconfig_t; -typedef struct pw -{ - u32 i[64]; - - u32 pw_len; - -} pw_t; - typedef struct pw_pre { u32 pw_buf[64]; @@ -1049,26 +968,6 @@ typedef struct pw_pre } pw_pre_t; -typedef struct pw_idx -{ - u32 off; - u32 cnt; - u32 len; - -} pw_idx_t; - -typedef struct bf -{ - u32 i; - -} bf_t; - -typedef struct bs_word -{ - u32 b[32]; - -} bs_word_t; - typedef struct cpt { u32 cracked; @@ -1076,18 +975,6 @@ typedef struct cpt } cpt_t; -typedef struct plain -{ - u64 gidvid; - u32 il_pos; - u32 salt_pos; - u32 digest_pos; - u32 hash_pos; - u32 extra1; - u32 extra2; - -} plain_t; - #define LINK_SPEED_COUNT 10000 typedef struct link_speed @@ -1601,13 +1488,6 @@ typedef struct loopback_ctx } loopback_ctx_t; -typedef struct cs -{ - u32 cs_buf[0x100]; - u32 cs_len; - -} cs_t; - typedef struct mf { char mf_buf[0x100]; @@ -1615,13 +1495,6 @@ typedef struct mf } mf_t; -typedef struct hcstat_table -{ - u32 key; - u64 val; - -} hcstat_table_t; - typedef struct outfile_ctx { char *filename; @@ -1726,12 +1599,6 @@ typedef struct pidfile_ctx } pidfile_ctx_t; -typedef struct kernel_rule -{ - u32 cmds[32]; - -} kernel_rule_t; - typedef struct out { FILE *fp; @@ -2497,664 +2364,6 @@ typedef enum hash_category } hash_category_t; -typedef struct keyboard_layout_mapping -{ - u32 src_char; - int src_len; - u32 dst_char; - int dst_len; - -} keyboard_layout_mapping_t; - // hash specific typedef aes_ctx AES_KEY; - -typedef enum siphash_constants -{ - SIPHASHM_0=0x736f6d6570736575, - SIPHASHM_1=0x646f72616e646f6d, - SIPHASHM_2=0x6c7967656e657261, - SIPHASHM_3=0x7465646279746573 - -} siphash_constants_t; - -typedef enum bcrypt_constants -{ - BCRYPTM_0=0x4F727068, - BCRYPTM_1=0x65616E42, - BCRYPTM_2=0x65686F6C, - BCRYPTM_3=0x64657253, - BCRYPTM_4=0x63727944, - BCRYPTM_5=0x6F756274u - -} bcrypt_constants_t; - -typedef enum md4_constants -{ - MD4M_A=0x67452301, - MD4M_B=0xefcdab89, - MD4M_C=0x98badcfe, - MD4M_D=0x10325476, - - MD4S00=3, - MD4S01=7, - MD4S02=11, - MD4S03=19, - MD4S10=3, - MD4S11=5, - MD4S12=9, - MD4S13=13, - MD4S20=3, - MD4S21=9, - MD4S22=11, - MD4S23=15, - - MD4C00=0x00000000, - MD4C01=0x5a827999, - MD4C02=0x6ed9eba1u - -} md4_constants_t; - -typedef enum md5_constants -{ - MD5M_A=0x67452301, - MD5M_B=0xefcdab89, - MD5M_C=0x98badcfe, - MD5M_D=0x10325476, - - MD5S00=7, - MD5S01=12, - MD5S02=17, - MD5S03=22, - MD5S10=5, - MD5S11=9, - MD5S12=14, - MD5S13=20, - MD5S20=4, - MD5S21=11, - MD5S22=16, - MD5S23=23, - MD5S30=6, - MD5S31=10, - MD5S32=15, - MD5S33=21, - - MD5C00=0xd76aa478, - MD5C01=0xe8c7b756, - MD5C02=0x242070db, - MD5C03=0xc1bdceee, - MD5C04=0xf57c0faf, - MD5C05=0x4787c62a, - MD5C06=0xa8304613, - MD5C07=0xfd469501, - MD5C08=0x698098d8, - MD5C09=0x8b44f7af, - MD5C0a=0xffff5bb1, - MD5C0b=0x895cd7be, - MD5C0c=0x6b901122, - MD5C0d=0xfd987193, - MD5C0e=0xa679438e, - MD5C0f=0x49b40821, - MD5C10=0xf61e2562, - MD5C11=0xc040b340, - MD5C12=0x265e5a51, - MD5C13=0xe9b6c7aa, - MD5C14=0xd62f105d, - MD5C15=0x02441453, - MD5C16=0xd8a1e681, - MD5C17=0xe7d3fbc8, - MD5C18=0x21e1cde6, - MD5C19=0xc33707d6, - MD5C1a=0xf4d50d87, - MD5C1b=0x455a14ed, - MD5C1c=0xa9e3e905, - MD5C1d=0xfcefa3f8, - MD5C1e=0x676f02d9, - MD5C1f=0x8d2a4c8a, - MD5C20=0xfffa3942, - MD5C21=0x8771f681, - MD5C22=0x6d9d6122, - MD5C23=0xfde5380c, - MD5C24=0xa4beea44, - MD5C25=0x4bdecfa9, - MD5C26=0xf6bb4b60, - MD5C27=0xbebfbc70, - MD5C28=0x289b7ec6, - MD5C29=0xeaa127fa, - MD5C2a=0xd4ef3085, - MD5C2b=0x04881d05, - MD5C2c=0xd9d4d039, - MD5C2d=0xe6db99e5, - MD5C2e=0x1fa27cf8, - MD5C2f=0xc4ac5665, - MD5C30=0xf4292244, - MD5C31=0x432aff97, - MD5C32=0xab9423a7, - MD5C33=0xfc93a039, - MD5C34=0x655b59c3, - MD5C35=0x8f0ccc92, - MD5C36=0xffeff47d, - MD5C37=0x85845dd1, - MD5C38=0x6fa87e4f, - MD5C39=0xfe2ce6e0, - MD5C3a=0xa3014314, - MD5C3b=0x4e0811a1, - MD5C3c=0xf7537e82, - MD5C3d=0xbd3af235, - MD5C3e=0x2ad7d2bb, - MD5C3f=0xeb86d391u - -} md5_constants_t; - -typedef enum sha1_constants -{ - SHA1M_A=0x67452301, - SHA1M_B=0xefcdab89, - SHA1M_C=0x98badcfe, - SHA1M_D=0x10325476, - SHA1M_E=0xc3d2e1f0, - - SHA1C00=0x5a827999, - SHA1C01=0x6ed9eba1, - SHA1C02=0x8f1bbcdc, - SHA1C03=0xca62c1d6u - -} sha1_constants_t; - -typedef enum sha2_32_constants -{ - // SHA-224 Initial Hash Values - SHA224M_A=0xc1059ed8, - SHA224M_B=0x367cd507, - SHA224M_C=0x3070dd17, - SHA224M_D=0xf70e5939, - SHA224M_E=0xffc00b31, - SHA224M_F=0x68581511, - SHA224M_G=0x64f98fa7, - SHA224M_H=0xbefa4fa4, - - // SHA-256 Initial Hash Values - SHA256M_A=0x6a09e667, - SHA256M_B=0xbb67ae85, - SHA256M_C=0x3c6ef372, - SHA256M_D=0xa54ff53a, - SHA256M_E=0x510e527f, - SHA256M_F=0x9b05688c, - SHA256M_G=0x1f83d9ab, - SHA256M_H=0x5be0cd19, - - // SHA-224/256 Constants - SHA256C00=0x428a2f98, - SHA256C01=0x71374491, - SHA256C02=0xb5c0fbcf, - SHA256C03=0xe9b5dba5, - SHA256C04=0x3956c25b, - SHA256C05=0x59f111f1, - SHA256C06=0x923f82a4, - SHA256C07=0xab1c5ed5, - SHA256C08=0xd807aa98, - SHA256C09=0x12835b01, - SHA256C0a=0x243185be, - SHA256C0b=0x550c7dc3, - SHA256C0c=0x72be5d74, - SHA256C0d=0x80deb1fe, - SHA256C0e=0x9bdc06a7, - SHA256C0f=0xc19bf174, - SHA256C10=0xe49b69c1, - SHA256C11=0xefbe4786, - SHA256C12=0x0fc19dc6, - SHA256C13=0x240ca1cc, - SHA256C14=0x2de92c6f, - SHA256C15=0x4a7484aa, - SHA256C16=0x5cb0a9dc, - SHA256C17=0x76f988da, - SHA256C18=0x983e5152, - SHA256C19=0xa831c66d, - SHA256C1a=0xb00327c8, - SHA256C1b=0xbf597fc7, - SHA256C1c=0xc6e00bf3, - SHA256C1d=0xd5a79147, - SHA256C1e=0x06ca6351, - SHA256C1f=0x14292967, - SHA256C20=0x27b70a85, - SHA256C21=0x2e1b2138, - SHA256C22=0x4d2c6dfc, - SHA256C23=0x53380d13, - SHA256C24=0x650a7354, - SHA256C25=0x766a0abb, - SHA256C26=0x81c2c92e, - SHA256C27=0x92722c85, - SHA256C28=0xa2bfe8a1, - SHA256C29=0xa81a664b, - SHA256C2a=0xc24b8b70, - SHA256C2b=0xc76c51a3, - SHA256C2c=0xd192e819, - SHA256C2d=0xd6990624, - SHA256C2e=0xf40e3585, - SHA256C2f=0x106aa070, - SHA256C30=0x19a4c116, - SHA256C31=0x1e376c08, - SHA256C32=0x2748774c, - SHA256C33=0x34b0bcb5, - SHA256C34=0x391c0cb3, - SHA256C35=0x4ed8aa4a, - SHA256C36=0x5b9cca4f, - SHA256C37=0x682e6ff3, - SHA256C38=0x748f82ee, - SHA256C39=0x78a5636f, - SHA256C3a=0x84c87814, - SHA256C3b=0x8cc70208, - SHA256C3c=0x90befffa, - SHA256C3d=0xa4506ceb, - SHA256C3e=0xbef9a3f7, - SHA256C3f=0xc67178f2 - -} sha2_32_constants_t; - -typedef enum sha2_64_constants -{ - // SHA-384 Initial Hash Values - SHA384M_A=0xcbbb9d5dc1059ed8, - SHA384M_B=0x629a292a367cd507, - SHA384M_C=0x9159015a3070dd17, - SHA384M_D=0x152fecd8f70e5939, - SHA384M_E=0x67332667ffc00b31, - SHA384M_F=0x8eb44a8768581511, - SHA384M_G=0xdb0c2e0d64f98fa7, - SHA384M_H=0x47b5481dbefa4fa4, - - // SHA-512 Initial Hash Values - SHA512M_A=0x6a09e667f3bcc908, - SHA512M_B=0xbb67ae8584caa73b, - SHA512M_C=0x3c6ef372fe94f82b, - SHA512M_D=0xa54ff53a5f1d36f1, - SHA512M_E=0x510e527fade682d1, - SHA512M_F=0x9b05688c2b3e6c1f, - SHA512M_G=0x1f83d9abfb41bd6b, - SHA512M_H=0x5be0cd19137e2179, - - // SHA-384/512 Constants - SHA512C00=0x428a2f98d728ae22, - SHA512C01=0x7137449123ef65cd, - SHA512C02=0xb5c0fbcfec4d3b2f, - SHA512C03=0xe9b5dba58189dbbc, - SHA512C04=0x3956c25bf348b538, - SHA512C05=0x59f111f1b605d019, - SHA512C06=0x923f82a4af194f9b, - SHA512C07=0xab1c5ed5da6d8118, - SHA512C08=0xd807aa98a3030242, - SHA512C09=0x12835b0145706fbe, - SHA512C0a=0x243185be4ee4b28c, - SHA512C0b=0x550c7dc3d5ffb4e2, - SHA512C0c=0x72be5d74f27b896f, - SHA512C0d=0x80deb1fe3b1696b1, - SHA512C0e=0x9bdc06a725c71235, - SHA512C0f=0xc19bf174cf692694, - SHA512C10=0xe49b69c19ef14ad2, - SHA512C11=0xefbe4786384f25e3, - SHA512C12=0x0fc19dc68b8cd5b5, - SHA512C13=0x240ca1cc77ac9c65, - SHA512C14=0x2de92c6f592b0275, - SHA512C15=0x4a7484aa6ea6e483, - SHA512C16=0x5cb0a9dcbd41fbd4, - SHA512C17=0x76f988da831153b5, - SHA512C18=0x983e5152ee66dfab, - SHA512C19=0xa831c66d2db43210, - SHA512C1a=0xb00327c898fb213f, - SHA512C1b=0xbf597fc7beef0ee4, - SHA512C1c=0xc6e00bf33da88fc2, - SHA512C1d=0xd5a79147930aa725, - SHA512C1e=0x06ca6351e003826f, - SHA512C1f=0x142929670a0e6e70, - SHA512C20=0x27b70a8546d22ffc, - SHA512C21=0x2e1b21385c26c926, - SHA512C22=0x4d2c6dfc5ac42aed, - SHA512C23=0x53380d139d95b3df, - SHA512C24=0x650a73548baf63de, - SHA512C25=0x766a0abb3c77b2a8, - SHA512C26=0x81c2c92e47edaee6, - SHA512C27=0x92722c851482353b, - SHA512C28=0xa2bfe8a14cf10364, - SHA512C29=0xa81a664bbc423001, - SHA512C2a=0xc24b8b70d0f89791, - SHA512C2b=0xc76c51a30654be30, - SHA512C2c=0xd192e819d6ef5218, - SHA512C2d=0xd69906245565a910, - SHA512C2e=0xf40e35855771202a, - SHA512C2f=0x106aa07032bbd1b8, - SHA512C30=0x19a4c116b8d2d0c8, - SHA512C31=0x1e376c085141ab53, - SHA512C32=0x2748774cdf8eeb99, - SHA512C33=0x34b0bcb5e19b48a8, - SHA512C34=0x391c0cb3c5c95a63, - SHA512C35=0x4ed8aa4ae3418acb, - SHA512C36=0x5b9cca4f7763e373, - SHA512C37=0x682e6ff3d6b2b8a3, - SHA512C38=0x748f82ee5defb2fc, - SHA512C39=0x78a5636f43172f60, - SHA512C3a=0x84c87814a1f0ab72, - SHA512C3b=0x8cc702081a6439ec, - SHA512C3c=0x90befffa23631e28, - SHA512C3d=0xa4506cebde82bde9, - SHA512C3e=0xbef9a3f7b2c67915, - SHA512C3f=0xc67178f2e372532b, - SHA512C40=0xca273eceea26619c, - SHA512C41=0xd186b8c721c0c207, - SHA512C42=0xeada7dd6cde0eb1e, - SHA512C43=0xf57d4f7fee6ed178, - SHA512C44=0x06f067aa72176fba, - SHA512C45=0x0a637dc5a2c898a6, - SHA512C46=0x113f9804bef90dae, - SHA512C47=0x1b710b35131c471b, - SHA512C48=0x28db77f523047d84, - SHA512C49=0x32caab7b40c72493, - SHA512C4a=0x3c9ebe0a15c9bebc, - SHA512C4b=0x431d67c49c100d4c, - SHA512C4c=0x4cc5d4becb3e42b6, - SHA512C4d=0x597f299cfc657e2a, - SHA512C4e=0x5fcb6fab3ad6faec, - SHA512C4f=0x6c44198c4a475817 - -} sha2_64_constants_t; - -typedef enum ripemd160_constants -{ - RIPEMD160M_A=0x67452301, - RIPEMD160M_B=0xefcdab89, - RIPEMD160M_C=0x98badcfe, - RIPEMD160M_D=0x10325476, - RIPEMD160M_E=0xc3d2e1f0, - - RIPEMD160C00=0x00000000, - RIPEMD160C10=0x5a827999, - RIPEMD160C20=0x6ed9eba1, - RIPEMD160C30=0x8f1bbcdc, - RIPEMD160C40=0xa953fd4e, - RIPEMD160C50=0x50a28be6, - RIPEMD160C60=0x5c4dd124, - RIPEMD160C70=0x6d703ef3, - RIPEMD160C80=0x7a6d76e9, - RIPEMD160C90=0x00000000, - - RIPEMD160S00=11, - RIPEMD160S01=14, - RIPEMD160S02=15, - RIPEMD160S03=12, - RIPEMD160S04=5, - RIPEMD160S05=8, - RIPEMD160S06=7, - RIPEMD160S07=9, - RIPEMD160S08=11, - RIPEMD160S09=13, - RIPEMD160S0A=14, - RIPEMD160S0B=15, - RIPEMD160S0C=6, - RIPEMD160S0D=7, - RIPEMD160S0E=9, - RIPEMD160S0F=8, - - RIPEMD160S10=7, - RIPEMD160S11=6, - RIPEMD160S12=8, - RIPEMD160S13=13, - RIPEMD160S14=11, - RIPEMD160S15=9, - RIPEMD160S16=7, - RIPEMD160S17=15, - RIPEMD160S18=7, - RIPEMD160S19=12, - RIPEMD160S1A=15, - RIPEMD160S1B=9, - RIPEMD160S1C=11, - RIPEMD160S1D=7, - RIPEMD160S1E=13, - RIPEMD160S1F=12, - - RIPEMD160S20=11, - RIPEMD160S21=13, - RIPEMD160S22=6, - RIPEMD160S23=7, - RIPEMD160S24=14, - RIPEMD160S25=9, - RIPEMD160S26=13, - RIPEMD160S27=15, - RIPEMD160S28=14, - RIPEMD160S29=8, - RIPEMD160S2A=13, - RIPEMD160S2B=6, - RIPEMD160S2C=5, - RIPEMD160S2D=12, - RIPEMD160S2E=7, - RIPEMD160S2F=5, - - RIPEMD160S30=11, - RIPEMD160S31=12, - RIPEMD160S32=14, - RIPEMD160S33=15, - RIPEMD160S34=14, - RIPEMD160S35=15, - RIPEMD160S36=9, - RIPEMD160S37=8, - RIPEMD160S38=9, - RIPEMD160S39=14, - RIPEMD160S3A=5, - RIPEMD160S3B=6, - RIPEMD160S3C=8, - RIPEMD160S3D=6, - RIPEMD160S3E=5, - RIPEMD160S3F=12, - - RIPEMD160S40=9, - RIPEMD160S41=15, - RIPEMD160S42=5, - RIPEMD160S43=11, - RIPEMD160S44=6, - RIPEMD160S45=8, - RIPEMD160S46=13, - RIPEMD160S47=12, - RIPEMD160S48=5, - RIPEMD160S49=12, - RIPEMD160S4A=13, - RIPEMD160S4B=14, - RIPEMD160S4C=11, - RIPEMD160S4D=8, - RIPEMD160S4E=5, - RIPEMD160S4F=6, - - RIPEMD160S50=8, - RIPEMD160S51=9, - RIPEMD160S52=9, - RIPEMD160S53=11, - RIPEMD160S54=13, - RIPEMD160S55=15, - RIPEMD160S56=15, - RIPEMD160S57=5, - RIPEMD160S58=7, - RIPEMD160S59=7, - RIPEMD160S5A=8, - RIPEMD160S5B=11, - RIPEMD160S5C=14, - RIPEMD160S5D=14, - RIPEMD160S5E=12, - RIPEMD160S5F=6, - - RIPEMD160S60=9, - RIPEMD160S61=13, - RIPEMD160S62=15, - RIPEMD160S63=7, - RIPEMD160S64=12, - RIPEMD160S65=8, - RIPEMD160S66=9, - RIPEMD160S67=11, - RIPEMD160S68=7, - RIPEMD160S69=7, - RIPEMD160S6A=12, - RIPEMD160S6B=7, - RIPEMD160S6C=6, - RIPEMD160S6D=15, - RIPEMD160S6E=13, - RIPEMD160S6F=11, - - RIPEMD160S70=9, - RIPEMD160S71=7, - RIPEMD160S72=15, - RIPEMD160S73=11, - RIPEMD160S74=8, - RIPEMD160S75=6, - RIPEMD160S76=6, - RIPEMD160S77=14, - RIPEMD160S78=12, - RIPEMD160S79=13, - RIPEMD160S7A=5, - RIPEMD160S7B=14, - RIPEMD160S7C=13, - RIPEMD160S7D=13, - RIPEMD160S7E=7, - RIPEMD160S7F=5, - - RIPEMD160S80=15, - RIPEMD160S81=5, - RIPEMD160S82=8, - RIPEMD160S83=11, - RIPEMD160S84=14, - RIPEMD160S85=14, - RIPEMD160S86=6, - RIPEMD160S87=14, - RIPEMD160S88=6, - RIPEMD160S89=9, - RIPEMD160S8A=12, - RIPEMD160S8B=9, - RIPEMD160S8C=12, - RIPEMD160S8D=5, - RIPEMD160S8E=15, - RIPEMD160S8F=8, - - RIPEMD160S90=8, - RIPEMD160S91=5, - RIPEMD160S92=12, - RIPEMD160S93=9, - RIPEMD160S94=12, - RIPEMD160S95=5, - RIPEMD160S96=14, - RIPEMD160S97=6, - RIPEMD160S98=8, - RIPEMD160S99=13, - RIPEMD160S9A=6, - RIPEMD160S9B=5, - RIPEMD160S9C=15, - RIPEMD160S9D=13, - RIPEMD160S9E=11, - RIPEMD160S9F=11u - -} ripemd160_constants_t; - -typedef enum keccak_constants -{ - KECCAK_RNDC_00=0x0000000000000001, - KECCAK_RNDC_01=0x0000000000008082, - KECCAK_RNDC_02=0x000000000000808a, - KECCAK_RNDC_03=0x0000000080008000, - KECCAK_RNDC_04=0x000000000000808b, - KECCAK_RNDC_05=0x0000000080000001, - KECCAK_RNDC_06=0x0000000080008081, - KECCAK_RNDC_07=0x0000000000008009, - KECCAK_RNDC_08=0x000000000000008a, - KECCAK_RNDC_09=0x0000000000000088, - KECCAK_RNDC_10=0x0000000080008009, - KECCAK_RNDC_11=0x000000008000000a, - KECCAK_RNDC_12=0x000000008000808b, - KECCAK_RNDC_13=0x000000000000008b, - KECCAK_RNDC_14=0x0000000000008089, - KECCAK_RNDC_15=0x0000000000008003, - KECCAK_RNDC_16=0x0000000000008002, - KECCAK_RNDC_17=0x0000000000000080, - KECCAK_RNDC_18=0x000000000000800a, - KECCAK_RNDC_19=0x000000008000000a, - KECCAK_RNDC_20=0x0000000080008081, - KECCAK_RNDC_21=0x0000000000008080, - KECCAK_RNDC_22=0x0000000080000001, - KECCAK_RNDC_23=0x0000000080008008, - - KECCAK_PILN_00=10, - KECCAK_PILN_01=7, - KECCAK_PILN_02=11, - KECCAK_PILN_03=17, - KECCAK_PILN_04=18, - KECCAK_PILN_05=3, - KECCAK_PILN_06=5, - KECCAK_PILN_07=16, - KECCAK_PILN_08=8, - KECCAK_PILN_09=21, - KECCAK_PILN_10=24, - KECCAK_PILN_11=4, - KECCAK_PILN_12=15, - KECCAK_PILN_13=23, - KECCAK_PILN_14=19, - KECCAK_PILN_15=13, - KECCAK_PILN_16=12, - KECCAK_PILN_17=2, - KECCAK_PILN_18=20, - KECCAK_PILN_19=14, - KECCAK_PILN_20=22, - KECCAK_PILN_21=9, - KECCAK_PILN_22=6, - KECCAK_PILN_23=1, - - KECCAK_ROTC_00=1, - KECCAK_ROTC_01=3, - KECCAK_ROTC_02=6, - KECCAK_ROTC_03=10, - KECCAK_ROTC_04=15, - KECCAK_ROTC_05=21, - KECCAK_ROTC_06=28, - KECCAK_ROTC_07=36, - KECCAK_ROTC_08=45, - KECCAK_ROTC_09=55, - KECCAK_ROTC_10=2, - KECCAK_ROTC_11=14, - KECCAK_ROTC_12=27, - KECCAK_ROTC_13=41, - KECCAK_ROTC_14=56, - KECCAK_ROTC_15=8, - KECCAK_ROTC_16=25, - KECCAK_ROTC_17=43, - KECCAK_ROTC_18=62, - KECCAK_ROTC_19=18, - KECCAK_ROTC_20=39, - KECCAK_ROTC_21=61, - KECCAK_ROTC_22=20, - KECCAK_ROTC_23=44, - -} keccak_constants_t; - -typedef enum mysql323_constants -{ - MYSQL323_A=0x50305735, - MYSQL323_B=0x12345671u - -} mysql323_constants_t; - -typedef enum fortigate_constants -{ - FORTIGATE_A=0x2eba88a3, - FORTIGATE_B=0x4ab04c42, - FORTIGATE_C=0xc1307953, - FORTIGATE_D=0x3fcc0731, - FORTIGATE_E=0x299032a1, - FORTIGATE_F=0x705b81a9 - -} fortigate_constants_t; - -typedef enum blake2b_constants -{ - BLAKE2B_IV_00=0x6a09e667f3bcc908, - BLAKE2B_IV_01=0xbb67ae8584caa73b, - BLAKE2B_IV_02=0x3c6ef372fe94f82b, - BLAKE2B_IV_03=0xa54ff53a5f1d36f1, - BLAKE2B_IV_04=0x510e527fade682d1, - BLAKE2B_IV_05=0x9b05688c2b3e6c1f, - BLAKE2B_IV_06=0x1f83d9abfb41bd6b, - BLAKE2B_IV_07=0x5be0cd19137e2179 - -} blake2b_constants_t; diff --git a/src/Makefile b/src/Makefile index 0e6226226..0b1c661a2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -288,7 +288,7 @@ EMU_OBJS_ALL += emu_inc_rp emu_inc_rp_optimized EMU_OBJS_ALL += emu_inc_hash_md4 emu_inc_hash_md5 emu_inc_hash_ripemd160 emu_inc_hash_sha1 emu_inc_hash_sha256 emu_inc_hash_sha384 emu_inc_hash_sha512 emu_inc_hash_streebog256 emu_inc_hash_streebog512 EMU_OBJS_ALL += emu_inc_cipher_aes emu_inc_cipher_camellia emu_inc_cipher_des emu_inc_cipher_kuznyechik emu_inc_cipher_serpent emu_inc_cipher_twofish -OBJS_ALL := affinity autotune benchmark bitmap bitops combinator common convert cpt cpu_aes cpu_crc32 cpu_des cpu_md5 cpu_sha1 cpu_sha256 debugfile dictstat dispatch dynloader event ext_ADL ext_nvapi ext_nvml ext_OpenCL ext_sysfs ext_lzma filehandling folder hashcat hashes hlfmt hwmon induct interface keyboard_layout locking logfile loopback memory monitor mpsp opencl outfile_check outfile pidfile potfile restore rp rp_cpu selftest slow_candidates shared status stdout straight terminal thread timer tuningdb usage user_options wordlist $(EMU_OBJS_ALL) +OBJS_ALL := affinity autotune benchmark bitmap bitops combinator common convert cpt cpu_aes cpu_crc32 cpu_des cpu_md5 cpu_sha256 debugfile dictstat dispatch dynloader event ext_ADL ext_nvapi ext_nvml ext_OpenCL ext_sysfs ext_lzma filehandling folder hashcat hashes hlfmt hwmon induct interface keyboard_layout locking logfile loopback memory monitor mpsp opencl outfile_check outfile pidfile potfile restore rp rp_cpu selftest slow_candidates shared status stdout straight terminal thread timer tuningdb usage user_options wordlist $(EMU_OBJS_ALL) ifeq ($(ENABLE_BRAIN),1) OBJS_ALL += brain @@ -322,9 +322,9 @@ WIN_OBJS += $(foreach OBJ,$(OBJS_XXHASH),obj/$(OBJ).WIN.o) endif endif -EMU_MODULE_OBJS_ALL := emu_general emu_inc_common emu_inc_hash_md4 +EMU_MODULE_OBJS_ALL := emu_general emu_inc_common emu_inc_hash_md4 emu_inc_hash_sha1 -MODULE_OBJS_ALL := bitops convert cpu_aes cpu_crc32 cpu_des cpu_md5 cpu_sha1 cpu_sha256 ext_lzma filehandling keyboard_layout memory shared $(EMU_MODULE_OBJS_ALL) +MODULE_OBJS_ALL := bitops convert cpu_aes cpu_crc32 cpu_des cpu_md5 cpu_sha256 ext_lzma filehandling keyboard_layout memory shared $(EMU_MODULE_OBJS_ALL) ifeq ($(USE_SYSTEM_LZMA),0) MODULE_OBJS_ALL += Alloc Lzma2Dec LzmaDec diff --git a/src/cpu_sha1.c b/src/cpu_sha1.c deleted file mode 100644 index 9287596e6..000000000 --- a/src/cpu_sha1.c +++ /dev/null @@ -1,165 +0,0 @@ -/** - * Author......: See docs/credits.txt - * License.....: MIT - */ - -#include "common.h" -#include "types.h" -#include "bitops.h" - -#define SHA1_F0(x,y,z) ((z) ^ ((x) & ((y) ^ (z)))) -#define SHA1_F1(x,y,z) ((x) ^ (y) ^ (z)) -#define SHA1_F2(x,y,z) (((x) & (y)) | ((z) & ((x) ^ (y)))) -#define SHA1_F0o(x,y,z) (SHA1_F0 ((x), (y), (z))) -#define SHA1_F2o(x,y,z) (SHA1_F2 ((x), (y), (z))) - -#define SHA1_STEP_S(f,a,b,c,d,e,x) \ -{ \ - e += K; \ - e = add3_S (e, x, f (b, c, d)); \ - e += rotl32_S (a, 5u); \ - b = rotl32_S (b, 30u); \ -} - -#define SHA1_STEP(f,a,b,c,d,e,x) \ -{ \ - e += K; \ - e = add3 (e, x, f (b, c, d)); \ - e += rotl32 (a, 5u); \ - b = rotl32 (b, 30u); \ -} - -#define SHA1_STEPX(f,a,b,c,d,e,x) \ -{ \ - e = add3 (e, x, f (b, c, d)); \ - e += rotl32 (a, 5u); \ - b = rotl32 (b, 30u); \ -} - -void sha1_64 (const u32 block[16], u32 digest[5]) -{ - u32 a = digest[0]; - u32 b = digest[1]; - u32 c = digest[2]; - u32 d = digest[3]; - u32 e = digest[4]; - - u32 w0_t = block[ 0]; - u32 w1_t = block[ 1]; - u32 w2_t = block[ 2]; - u32 w3_t = block[ 3]; - u32 w4_t = block[ 4]; - u32 w5_t = block[ 5]; - u32 w6_t = block[ 6]; - u32 w7_t = block[ 7]; - u32 w8_t = block[ 8]; - u32 w9_t = block[ 9]; - u32 wa_t = block[10]; - u32 wb_t = block[11]; - u32 wc_t = block[12]; - u32 wd_t = block[13]; - u32 we_t = block[14]; - u32 wf_t = block[15]; - - #undef K - #define K SHA1C00 - - SHA1_STEP (SHA1_F0o, a, b, c, d, e, w0_t); - SHA1_STEP (SHA1_F0o, e, a, b, c, d, w1_t); - SHA1_STEP (SHA1_F0o, d, e, a, b, c, w2_t); - SHA1_STEP (SHA1_F0o, c, d, e, a, b, w3_t); - SHA1_STEP (SHA1_F0o, b, c, d, e, a, w4_t); - SHA1_STEP (SHA1_F0o, a, b, c, d, e, w5_t); - SHA1_STEP (SHA1_F0o, e, a, b, c, d, w6_t); - SHA1_STEP (SHA1_F0o, d, e, a, b, c, w7_t); - SHA1_STEP (SHA1_F0o, c, d, e, a, b, w8_t); - SHA1_STEP (SHA1_F0o, b, c, d, e, a, w9_t); - SHA1_STEP (SHA1_F0o, a, b, c, d, e, wa_t); - SHA1_STEP (SHA1_F0o, e, a, b, c, d, wb_t); - SHA1_STEP (SHA1_F0o, d, e, a, b, c, wc_t); - SHA1_STEP (SHA1_F0o, c, d, e, a, b, wd_t); - SHA1_STEP (SHA1_F0o, b, c, d, e, a, we_t); - SHA1_STEP (SHA1_F0o, a, b, c, d, e, wf_t); - w0_t = rotl32 ((wd_t ^ w8_t ^ w2_t ^ w0_t), 1u); SHA1_STEP (SHA1_F0o, e, a, b, c, d, w0_t); - w1_t = rotl32 ((we_t ^ w9_t ^ w3_t ^ w1_t), 1u); SHA1_STEP (SHA1_F0o, d, e, a, b, c, w1_t); - w2_t = rotl32 ((wf_t ^ wa_t ^ w4_t ^ w2_t), 1u); SHA1_STEP (SHA1_F0o, c, d, e, a, b, w2_t); - w3_t = rotl32 ((w0_t ^ wb_t ^ w5_t ^ w3_t), 1u); SHA1_STEP (SHA1_F0o, b, c, d, e, a, w3_t); - - #undef K - #define K SHA1C01 - - w4_t = rotl32 ((w1_t ^ wc_t ^ w6_t ^ w4_t), 1u); SHA1_STEP (SHA1_F1, a, b, c, d, e, w4_t); - w5_t = rotl32 ((w2_t ^ wd_t ^ w7_t ^ w5_t), 1u); SHA1_STEP (SHA1_F1, e, a, b, c, d, w5_t); - w6_t = rotl32 ((w3_t ^ we_t ^ w8_t ^ w6_t), 1u); SHA1_STEP (SHA1_F1, d, e, a, b, c, w6_t); - w7_t = rotl32 ((w4_t ^ wf_t ^ w9_t ^ w7_t), 1u); SHA1_STEP (SHA1_F1, c, d, e, a, b, w7_t); - w8_t = rotl32 ((w5_t ^ w0_t ^ wa_t ^ w8_t), 1u); SHA1_STEP (SHA1_F1, b, c, d, e, a, w8_t); - w9_t = rotl32 ((w6_t ^ w1_t ^ wb_t ^ w9_t), 1u); SHA1_STEP (SHA1_F1, a, b, c, d, e, w9_t); - wa_t = rotl32 ((w7_t ^ w2_t ^ wc_t ^ wa_t), 1u); SHA1_STEP (SHA1_F1, e, a, b, c, d, wa_t); - wb_t = rotl32 ((w8_t ^ w3_t ^ wd_t ^ wb_t), 1u); SHA1_STEP (SHA1_F1, d, e, a, b, c, wb_t); - wc_t = rotl32 ((w9_t ^ w4_t ^ we_t ^ wc_t), 1u); SHA1_STEP (SHA1_F1, c, d, e, a, b, wc_t); - wd_t = rotl32 ((wa_t ^ w5_t ^ wf_t ^ wd_t), 1u); SHA1_STEP (SHA1_F1, b, c, d, e, a, wd_t); - we_t = rotl32 ((wb_t ^ w6_t ^ w0_t ^ we_t), 1u); SHA1_STEP (SHA1_F1, a, b, c, d, e, we_t); - wf_t = rotl32 ((wc_t ^ w7_t ^ w1_t ^ wf_t), 1u); SHA1_STEP (SHA1_F1, e, a, b, c, d, wf_t); - w0_t = rotl32 ((wd_t ^ w8_t ^ w2_t ^ w0_t), 1u); SHA1_STEP (SHA1_F1, d, e, a, b, c, w0_t); - w1_t = rotl32 ((we_t ^ w9_t ^ w3_t ^ w1_t), 1u); SHA1_STEP (SHA1_F1, c, d, e, a, b, w1_t); - w2_t = rotl32 ((wf_t ^ wa_t ^ w4_t ^ w2_t), 1u); SHA1_STEP (SHA1_F1, b, c, d, e, a, w2_t); - w3_t = rotl32 ((w0_t ^ wb_t ^ w5_t ^ w3_t), 1u); SHA1_STEP (SHA1_F1, a, b, c, d, e, w3_t); - w4_t = rotl32 ((w1_t ^ wc_t ^ w6_t ^ w4_t), 1u); SHA1_STEP (SHA1_F1, e, a, b, c, d, w4_t); - w5_t = rotl32 ((w2_t ^ wd_t ^ w7_t ^ w5_t), 1u); SHA1_STEP (SHA1_F1, d, e, a, b, c, w5_t); - w6_t = rotl32 ((w3_t ^ we_t ^ w8_t ^ w6_t), 1u); SHA1_STEP (SHA1_F1, c, d, e, a, b, w6_t); - w7_t = rotl32 ((w4_t ^ wf_t ^ w9_t ^ w7_t), 1u); SHA1_STEP (SHA1_F1, b, c, d, e, a, w7_t); - - #undef K - #define K SHA1C02 - - w8_t = rotl32 ((w5_t ^ w0_t ^ wa_t ^ w8_t), 1u); SHA1_STEP (SHA1_F2o, a, b, c, d, e, w8_t); - w9_t = rotl32 ((w6_t ^ w1_t ^ wb_t ^ w9_t), 1u); SHA1_STEP (SHA1_F2o, e, a, b, c, d, w9_t); - wa_t = rotl32 ((w7_t ^ w2_t ^ wc_t ^ wa_t), 1u); SHA1_STEP (SHA1_F2o, d, e, a, b, c, wa_t); - wb_t = rotl32 ((w8_t ^ w3_t ^ wd_t ^ wb_t), 1u); SHA1_STEP (SHA1_F2o, c, d, e, a, b, wb_t); - wc_t = rotl32 ((w9_t ^ w4_t ^ we_t ^ wc_t), 1u); SHA1_STEP (SHA1_F2o, b, c, d, e, a, wc_t); - wd_t = rotl32 ((wa_t ^ w5_t ^ wf_t ^ wd_t), 1u); SHA1_STEP (SHA1_F2o, a, b, c, d, e, wd_t); - we_t = rotl32 ((wb_t ^ w6_t ^ w0_t ^ we_t), 1u); SHA1_STEP (SHA1_F2o, e, a, b, c, d, we_t); - wf_t = rotl32 ((wc_t ^ w7_t ^ w1_t ^ wf_t), 1u); SHA1_STEP (SHA1_F2o, d, e, a, b, c, wf_t); - w0_t = rotl32 ((wd_t ^ w8_t ^ w2_t ^ w0_t), 1u); SHA1_STEP (SHA1_F2o, c, d, e, a, b, w0_t); - w1_t = rotl32 ((we_t ^ w9_t ^ w3_t ^ w1_t), 1u); SHA1_STEP (SHA1_F2o, b, c, d, e, a, w1_t); - w2_t = rotl32 ((wf_t ^ wa_t ^ w4_t ^ w2_t), 1u); SHA1_STEP (SHA1_F2o, a, b, c, d, e, w2_t); - w3_t = rotl32 ((w0_t ^ wb_t ^ w5_t ^ w3_t), 1u); SHA1_STEP (SHA1_F2o, e, a, b, c, d, w3_t); - w4_t = rotl32 ((w1_t ^ wc_t ^ w6_t ^ w4_t), 1u); SHA1_STEP (SHA1_F2o, d, e, a, b, c, w4_t); - w5_t = rotl32 ((w2_t ^ wd_t ^ w7_t ^ w5_t), 1u); SHA1_STEP (SHA1_F2o, c, d, e, a, b, w5_t); - w6_t = rotl32 ((w3_t ^ we_t ^ w8_t ^ w6_t), 1u); SHA1_STEP (SHA1_F2o, b, c, d, e, a, w6_t); - w7_t = rotl32 ((w4_t ^ wf_t ^ w9_t ^ w7_t), 1u); SHA1_STEP (SHA1_F2o, a, b, c, d, e, w7_t); - w8_t = rotl32 ((w5_t ^ w0_t ^ wa_t ^ w8_t), 1u); SHA1_STEP (SHA1_F2o, e, a, b, c, d, w8_t); - w9_t = rotl32 ((w6_t ^ w1_t ^ wb_t ^ w9_t), 1u); SHA1_STEP (SHA1_F2o, d, e, a, b, c, w9_t); - wa_t = rotl32 ((w7_t ^ w2_t ^ wc_t ^ wa_t), 1u); SHA1_STEP (SHA1_F2o, c, d, e, a, b, wa_t); - wb_t = rotl32 ((w8_t ^ w3_t ^ wd_t ^ wb_t), 1u); SHA1_STEP (SHA1_F2o, b, c, d, e, a, wb_t); - - #undef K - #define K SHA1C03 - - wc_t = rotl32 ((w9_t ^ w4_t ^ we_t ^ wc_t), 1u); SHA1_STEP (SHA1_F1, a, b, c, d, e, wc_t); - wd_t = rotl32 ((wa_t ^ w5_t ^ wf_t ^ wd_t), 1u); SHA1_STEP (SHA1_F1, e, a, b, c, d, wd_t); - we_t = rotl32 ((wb_t ^ w6_t ^ w0_t ^ we_t), 1u); SHA1_STEP (SHA1_F1, d, e, a, b, c, we_t); - wf_t = rotl32 ((wc_t ^ w7_t ^ w1_t ^ wf_t), 1u); SHA1_STEP (SHA1_F1, c, d, e, a, b, wf_t); - w0_t = rotl32 ((wd_t ^ w8_t ^ w2_t ^ w0_t), 1u); SHA1_STEP (SHA1_F1, b, c, d, e, a, w0_t); - w1_t = rotl32 ((we_t ^ w9_t ^ w3_t ^ w1_t), 1u); SHA1_STEP (SHA1_F1, a, b, c, d, e, w1_t); - w2_t = rotl32 ((wf_t ^ wa_t ^ w4_t ^ w2_t), 1u); SHA1_STEP (SHA1_F1, e, a, b, c, d, w2_t); - w3_t = rotl32 ((w0_t ^ wb_t ^ w5_t ^ w3_t), 1u); SHA1_STEP (SHA1_F1, d, e, a, b, c, w3_t); - w4_t = rotl32 ((w1_t ^ wc_t ^ w6_t ^ w4_t), 1u); SHA1_STEP (SHA1_F1, c, d, e, a, b, w4_t); - w5_t = rotl32 ((w2_t ^ wd_t ^ w7_t ^ w5_t), 1u); SHA1_STEP (SHA1_F1, b, c, d, e, a, w5_t); - w6_t = rotl32 ((w3_t ^ we_t ^ w8_t ^ w6_t), 1u); SHA1_STEP (SHA1_F1, a, b, c, d, e, w6_t); - w7_t = rotl32 ((w4_t ^ wf_t ^ w9_t ^ w7_t), 1u); SHA1_STEP (SHA1_F1, e, a, b, c, d, w7_t); - w8_t = rotl32 ((w5_t ^ w0_t ^ wa_t ^ w8_t), 1u); SHA1_STEP (SHA1_F1, d, e, a, b, c, w8_t); - w9_t = rotl32 ((w6_t ^ w1_t ^ wb_t ^ w9_t), 1u); SHA1_STEP (SHA1_F1, c, d, e, a, b, w9_t); - wa_t = rotl32 ((w7_t ^ w2_t ^ wc_t ^ wa_t), 1u); SHA1_STEP (SHA1_F1, b, c, d, e, a, wa_t); - wb_t = rotl32 ((w8_t ^ w3_t ^ wd_t ^ wb_t), 1u); SHA1_STEP (SHA1_F1, a, b, c, d, e, wb_t); - wc_t = rotl32 ((w9_t ^ w4_t ^ we_t ^ wc_t), 1u); SHA1_STEP (SHA1_F1, e, a, b, c, d, wc_t); - wd_t = rotl32 ((wa_t ^ w5_t ^ wf_t ^ wd_t), 1u); SHA1_STEP (SHA1_F1, d, e, a, b, c, wd_t); - we_t = rotl32 ((wb_t ^ w6_t ^ w0_t ^ we_t), 1u); SHA1_STEP (SHA1_F1, c, d, e, a, b, we_t); - wf_t = rotl32 ((wc_t ^ w7_t ^ w1_t ^ wf_t), 1u); SHA1_STEP (SHA1_F1, b, c, d, e, a, wf_t); - - digest[0] += a; - digest[1] += b; - digest[2] += c; - digest[3] += d; - digest[4] += e; -} diff --git a/src/emu_general.c b/src/emu_general.c index e020fa2f2..fa8bdc1ab 100644 --- a/src/emu_general.c +++ b/src/emu_general.c @@ -3,6 +3,8 @@ * License.....: MIT */ +#include "common.h" +#include "types.h" #include "emu_general.h" u32 atomic_dec (u32 *p) diff --git a/src/emu_inc_cipher_aes.c b/src/emu_inc_cipher_aes.c index 0823cdcb3..2a51bc959 100644 --- a/src/emu_inc_cipher_aes.c +++ b/src/emu_inc_cipher_aes.c @@ -3,14 +3,10 @@ * License.....: MIT */ +#include "common.h" +#include "types.h" #include "emu_general.h" -#define DGST_ELEM 4 -#define DGST_R0 0 -#define DGST_R1 1 -#define DGST_R2 2 -#define DGST_R3 3 - #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-parameter" diff --git a/src/emu_inc_cipher_camellia.c b/src/emu_inc_cipher_camellia.c index 8dcbc50a9..c2c6e6894 100644 --- a/src/emu_inc_cipher_camellia.c +++ b/src/emu_inc_cipher_camellia.c @@ -3,14 +3,10 @@ * License.....: MIT */ +#include "common.h" +#include "types.h" #include "emu_general.h" -#define DGST_ELEM 4 -#define DGST_R0 0 -#define DGST_R1 1 -#define DGST_R2 2 -#define DGST_R3 3 - #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-parameter" diff --git a/src/emu_inc_cipher_des.c b/src/emu_inc_cipher_des.c index be011a561..ad28304a7 100644 --- a/src/emu_inc_cipher_des.c +++ b/src/emu_inc_cipher_des.c @@ -3,14 +3,10 @@ * License.....: MIT */ +#include "common.h" +#include "types.h" #include "emu_general.h" -#define DGST_ELEM 4 -#define DGST_R0 0 -#define DGST_R1 1 -#define DGST_R2 2 -#define DGST_R3 3 - #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-parameter" diff --git a/src/emu_inc_cipher_kuznyechik.c b/src/emu_inc_cipher_kuznyechik.c index 91c1bae44..5c4325f75 100644 --- a/src/emu_inc_cipher_kuznyechik.c +++ b/src/emu_inc_cipher_kuznyechik.c @@ -3,14 +3,10 @@ * License.....: MIT */ +#include "common.h" +#include "types.h" #include "emu_general.h" -#define DGST_ELEM 4 -#define DGST_R0 0 -#define DGST_R1 1 -#define DGST_R2 2 -#define DGST_R3 3 - #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-parameter" diff --git a/src/emu_inc_cipher_serpent.c b/src/emu_inc_cipher_serpent.c index 0d35c148c..29f9c42da 100644 --- a/src/emu_inc_cipher_serpent.c +++ b/src/emu_inc_cipher_serpent.c @@ -3,14 +3,10 @@ * License.....: MIT */ +#include "common.h" +#include "types.h" #include "emu_general.h" -#define DGST_ELEM 4 -#define DGST_R0 0 -#define DGST_R1 1 -#define DGST_R2 2 -#define DGST_R3 3 - #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-parameter" diff --git a/src/emu_inc_cipher_twofish.c b/src/emu_inc_cipher_twofish.c index a408624c9..317b5f1de 100644 --- a/src/emu_inc_cipher_twofish.c +++ b/src/emu_inc_cipher_twofish.c @@ -3,14 +3,10 @@ * License.....: MIT */ +#include "common.h" +#include "types.h" #include "emu_general.h" -#define DGST_ELEM 4 -#define DGST_R0 0 -#define DGST_R1 1 -#define DGST_R2 2 -#define DGST_R3 3 - #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-parameter" diff --git a/src/emu_inc_common.c b/src/emu_inc_common.c index 972d656dd..13b9928f3 100644 --- a/src/emu_inc_common.c +++ b/src/emu_inc_common.c @@ -3,14 +3,10 @@ * License.....: MIT */ -#include "emu_general.h" +#include "common.h" +#include "types.h" #include "bitops.h" - -#define DGST_ELEM 4 -#define DGST_R0 0 -#define DGST_R1 1 -#define DGST_R2 2 -#define DGST_R3 3 +#include "emu_general.h" #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-variable" diff --git a/src/emu_inc_hash_md4.c b/src/emu_inc_hash_md4.c index 32c52af87..27214c822 100644 --- a/src/emu_inc_hash_md4.c +++ b/src/emu_inc_hash_md4.c @@ -3,14 +3,10 @@ * License.....: MIT */ +#include "common.h" +#include "types.h" #include "emu_general.h" -#define DGST_ELEM 4 -#define DGST_R0 0 -#define DGST_R1 1 -#define DGST_R2 2 -#define DGST_R3 3 - #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-parameter" diff --git a/src/emu_inc_hash_md5.c b/src/emu_inc_hash_md5.c index c8104104e..cef4d5da5 100644 --- a/src/emu_inc_hash_md5.c +++ b/src/emu_inc_hash_md5.c @@ -3,14 +3,10 @@ * License.....: MIT */ +#include "common.h" +#include "types.h" #include "emu_general.h" -#define DGST_ELEM 4 -#define DGST_R0 0 -#define DGST_R1 1 -#define DGST_R2 2 -#define DGST_R3 3 - #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-parameter" diff --git a/src/emu_inc_hash_ripemd160.c b/src/emu_inc_hash_ripemd160.c index b81d97e18..96c3b776c 100644 --- a/src/emu_inc_hash_ripemd160.c +++ b/src/emu_inc_hash_ripemd160.c @@ -3,14 +3,10 @@ * License.....: MIT */ +#include "common.h" +#include "types.h" #include "emu_general.h" -#define DGST_ELEM 4 -#define DGST_R0 0 -#define DGST_R1 1 -#define DGST_R2 2 -#define DGST_R3 3 - #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-parameter" diff --git a/src/emu_inc_hash_sha1.c b/src/emu_inc_hash_sha1.c index b60519de3..56e4fd438 100644 --- a/src/emu_inc_hash_sha1.c +++ b/src/emu_inc_hash_sha1.c @@ -3,14 +3,10 @@ * License.....: MIT */ +#include "common.h" +#include "types.h" #include "emu_general.h" -#define DGST_ELEM 4 -#define DGST_R0 0 -#define DGST_R1 1 -#define DGST_R2 2 -#define DGST_R3 3 - #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-parameter" diff --git a/src/emu_inc_hash_sha224.c b/src/emu_inc_hash_sha224.c index 34f2d4b73..15083e815 100644 --- a/src/emu_inc_hash_sha224.c +++ b/src/emu_inc_hash_sha224.c @@ -3,14 +3,10 @@ * License.....: MIT */ +#include "common.h" +#include "types.h" #include "emu_general.h" -#define DGST_ELEM 4 -#define DGST_R0 0 -#define DGST_R1 1 -#define DGST_R2 2 -#define DGST_R3 3 - #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-parameter" diff --git a/src/emu_inc_hash_sha256.c b/src/emu_inc_hash_sha256.c index ac0517eb2..878ec24c3 100644 --- a/src/emu_inc_hash_sha256.c +++ b/src/emu_inc_hash_sha256.c @@ -3,14 +3,10 @@ * License.....: MIT */ +#include "common.h" +#include "types.h" #include "emu_general.h" -#define DGST_ELEM 4 -#define DGST_R0 0 -#define DGST_R1 1 -#define DGST_R2 2 -#define DGST_R3 3 - #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-parameter" diff --git a/src/emu_inc_hash_sha384.c b/src/emu_inc_hash_sha384.c index d7033c50c..d8ebc1057 100644 --- a/src/emu_inc_hash_sha384.c +++ b/src/emu_inc_hash_sha384.c @@ -3,14 +3,10 @@ * License.....: MIT */ +#include "common.h" +#include "types.h" #include "emu_general.h" -#define DGST_ELEM 4 -#define DGST_R0 0 -#define DGST_R1 1 -#define DGST_R2 2 -#define DGST_R3 3 - #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-parameter" diff --git a/src/emu_inc_hash_sha512.c b/src/emu_inc_hash_sha512.c index 82058f6d1..f429e5afe 100644 --- a/src/emu_inc_hash_sha512.c +++ b/src/emu_inc_hash_sha512.c @@ -3,14 +3,10 @@ * License.....: MIT */ +#include "common.h" +#include "types.h" #include "emu_general.h" -#define DGST_ELEM 4 -#define DGST_R0 0 -#define DGST_R1 1 -#define DGST_R2 2 -#define DGST_R3 3 - #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-parameter" diff --git a/src/emu_inc_hash_streebog256.c b/src/emu_inc_hash_streebog256.c index d85b6dedd..e55fcfb8c 100644 --- a/src/emu_inc_hash_streebog256.c +++ b/src/emu_inc_hash_streebog256.c @@ -3,14 +3,10 @@ * License.....: MIT */ +#include "common.h" +#include "types.h" #include "emu_general.h" -#define DGST_ELEM 4 -#define DGST_R0 0 -#define DGST_R1 1 -#define DGST_R2 2 -#define DGST_R3 3 - #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-parameter" diff --git a/src/emu_inc_hash_streebog512.c b/src/emu_inc_hash_streebog512.c index b343d2a92..5580d842c 100644 --- a/src/emu_inc_hash_streebog512.c +++ b/src/emu_inc_hash_streebog512.c @@ -3,14 +3,10 @@ * License.....: MIT */ +#include "common.h" +#include "types.h" #include "emu_general.h" -#define DGST_ELEM 4 -#define DGST_R0 0 -#define DGST_R1 1 -#define DGST_R2 2 -#define DGST_R3 3 - #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-parameter" diff --git a/src/emu_inc_hash_whirlpool.c b/src/emu_inc_hash_whirlpool.c index f68200de6..12ea4018a 100644 --- a/src/emu_inc_hash_whirlpool.c +++ b/src/emu_inc_hash_whirlpool.c @@ -3,14 +3,10 @@ * License.....: MIT */ +#include "common.h" +#include "types.h" #include "emu_general.h" -#define DGST_ELEM 4 -#define DGST_R0 0 -#define DGST_R1 1 -#define DGST_R2 2 -#define DGST_R3 3 - #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-parameter" diff --git a/src/emu_inc_rp.c b/src/emu_inc_rp.c index d89aaec09..88a989939 100644 --- a/src/emu_inc_rp.c +++ b/src/emu_inc_rp.c @@ -3,14 +3,10 @@ * License.....: MIT */ +#include "common.h" +#include "types.h" #include "emu_general.h" -#define DGST_ELEM 4 -#define DGST_R0 0 -#define DGST_R1 1 -#define DGST_R2 2 -#define DGST_R3 3 - #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-parameter" diff --git a/src/emu_inc_rp_optimized.c b/src/emu_inc_rp_optimized.c index f24e6e982..d3c1775f4 100644 --- a/src/emu_inc_rp_optimized.c +++ b/src/emu_inc_rp_optimized.c @@ -3,14 +3,10 @@ * License.....: MIT */ +#include "common.h" +#include "types.h" #include "emu_general.h" -#define DGST_ELEM 4 -#define DGST_R0 0 -#define DGST_R1 1 -#define DGST_R2 2 -#define DGST_R3 3 - #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-parameter" diff --git a/src/emu_inc_scalar.c b/src/emu_inc_scalar.c index 253980a38..04acf39fc 100644 --- a/src/emu_inc_scalar.c +++ b/src/emu_inc_scalar.c @@ -3,14 +3,10 @@ * License.....: MIT */ +#include "common.h" +#include "types.h" #include "emu_general.h" -#define DGST_ELEM 4 -#define DGST_R0 0 -#define DGST_R1 1 -#define DGST_R2 2 -#define DGST_R3 3 - #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-parameter" diff --git a/src/emu_inc_simd.c b/src/emu_inc_simd.c index cf23f0c7c..f29c4a563 100644 --- a/src/emu_inc_simd.c +++ b/src/emu_inc_simd.c @@ -3,14 +3,10 @@ * License.....: MIT */ +#include "common.h" +#include "types.h" #include "emu_general.h" -#define DGST_ELEM 4 -#define DGST_R0 0 -#define DGST_R1 1 -#define DGST_R2 2 -#define DGST_R3 3 - #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-parameter" diff --git a/src/emu_inc_truecrypt_crc32.c b/src/emu_inc_truecrypt_crc32.c index f62a268a0..dc786ab5b 100644 --- a/src/emu_inc_truecrypt_crc32.c +++ b/src/emu_inc_truecrypt_crc32.c @@ -3,14 +3,10 @@ * License.....: MIT */ +#include "common.h" +#include "types.h" #include "emu_general.h" -#define DGST_ELEM 4 -#define DGST_R0 0 -#define DGST_R1 1 -#define DGST_R2 2 -#define DGST_R3 3 - #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-parameter" diff --git a/src/emu_inc_truecrypt_keyfile.c b/src/emu_inc_truecrypt_keyfile.c index 1c524b71b..2e98a8884 100644 --- a/src/emu_inc_truecrypt_keyfile.c +++ b/src/emu_inc_truecrypt_keyfile.c @@ -3,14 +3,10 @@ * License.....: MIT */ +#include "common.h" +#include "types.h" #include "emu_general.h" -#define DGST_ELEM 4 -#define DGST_R0 0 -#define DGST_R1 1 -#define DGST_R2 2 -#define DGST_R3 3 - #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-parameter" diff --git a/src/emu_inc_truecrypt_xts.c b/src/emu_inc_truecrypt_xts.c index 3fa49e014..72b64fdec 100644 --- a/src/emu_inc_truecrypt_xts.c +++ b/src/emu_inc_truecrypt_xts.c @@ -3,14 +3,10 @@ * License.....: MIT */ +#include "common.h" +#include "types.h" #include "emu_general.h" -#define DGST_ELEM 4 -#define DGST_R0 0 -#define DGST_R1 1 -#define DGST_R2 2 -#define DGST_R3 3 - #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-parameter" diff --git a/src/emu_m02501_pure.c b/src/emu_m02501_pure.c index 6d43aacf4..ec9012343 100644 --- a/src/emu_m02501_pure.c +++ b/src/emu_m02501_pure.c @@ -3,14 +3,10 @@ * License.....: MIT */ +#include "common.h" +#include "types.h" #include "emu_general.h" -#define DGST_ELEM 4 -#define DGST_R0 0 -#define DGST_R1 1 -#define DGST_R2 2 -#define DGST_R3 3 - #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-parameter" diff --git a/src/modules/module_13500.c b/src/modules/module_13500.c index ea3586e07..0177058f9 100644 --- a/src/modules/module_13500.c +++ b/src/modules/module_13500.c @@ -9,7 +9,7 @@ #include "bitops.h" #include "convert.h" #include "shared.h" -#include "cpu_sha1.h" +#include "emu_inc_hash_sha1.h" static const u32 ATTACK_EXEC = ATTACK_EXEC_INSIDE_KERNEL; static const u32 DGST_POS0 = 3; @@ -160,7 +160,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE w[14] = byte_swap_32 (pstoken->salt_buf[pstoken->pc_offset + 14]); w[15] = byte_swap_32 (pstoken->salt_buf[pstoken->pc_offset + 15]); - sha1_64 (w, pstoken->pc_digest); + sha1_transform (w + 0, w + 4, w + 8, w + 12, pstoken->pc_digest); pstoken->pc_offset += 16; }