arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-22 16:18:09 +00:00
Code Issues Releases Wiki Activity

Undef some macros to avoid collisions

Browse Source
This commit is contained in:
jsteube 2019-02-07 16:59:10 +01:00
parent 62c660afe2
commit 0bd244c051
4 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenCL/inc_cipher_camellia.cl
View File

@ -363,3 +363,12 @@ DECLSPEC void camellia256_decrypt (const u32 *ks, const u32 *in, u32 *out)
out[2] = tmp[0] ^ ks[2]; out[2] = tmp[0] ^ ks[2];
out[3] = tmp[1] ^ ks[3]; out[3] = tmp[1] ^ ks[3];
} }
#undef extract_byte
#undef cam_rotate
#undef c_sbox4
#undef c_sbox3
#undef c_sbox2
#undef c_sbox1

4
OpenCL/inc_cipher_kuznyechik.cl
View File

@ -297,3 +297,7 @@ DECLSPEC void kuznyechik_decrypt (const u32 *ks, const u32 *in, u32 *out)
out[3] ^= ks[4 * i + 3]; out[3] ^= ks[4 * i + 3];
} }
} }
#undef extract_byte
#undef k_lookup
#undef k_xor

22
OpenCL/inc_cipher_serpent.cl
View File

@ -726,3 +726,25 @@ DECLSPEC void serpent256_decrypt (const u32 *ks, const u32 *in, u32 *out)
out[2] = c; out[2] = c;
out[3] = d; out[3] = d;
} }
#undef sb0
#undef sb1
#undef sb2
#undef sb3
#undef sb4
#undef sb5
#undef sb6
#undef sb7
#undef ib0
#undef ib1
#undef ib2
#undef ib3
#undef ib4
#undef ib5
#undef ib6
#undef ib7
#undef k_xor
#undef k_set
#undef k_get
#undef rot
#undef irot

21
OpenCL/inc_cipher_twofish.cl
View File

@ -575,3 +575,24 @@ DECLSPEC void twofish256_decrypt (const u32 *sk, const u32 *lk, const u32 *in, u
out[2] = data[0] ^ lk[2]; out[2] = data[0] ^ lk[2];
out[3] = data[1] ^ lk[3]; out[3] = data[1] ^ lk[3];
} }
#undef extract_byte
#undef q
#undef mds
#undef q20
#undef q21
#undef q22
#undef q23
#undef q40
#undef q41
#undef q42
#undef q43
#undef G_MOD
#undef g1_fun128
#undef g0_fun128
#undef f_rnd128
#undef i_rnd128
#undef g1_fun256
#undef g0_fun256
#undef f_rnd256
#undef i_rnd256