Remove add3() from bitops, replaced with the ones in inc_common.cl

pull/1971/head
jsteube 5 years ago
parent ecbd4a51c8
commit 2bb594b385

@ -6,9 +6,6 @@
#ifndef _BITOPS_H
#define _BITOPS_H
u32 add3 (const u32 a, const u32 b, const u32 c);
u32 add3_S (const u32 a, const u32 b, const u32 c);
u32 rotl32 (const u32 a, const int n);
u32 rotr32 (const u32 a, const int n);
u64 rotl64 (const u64 a, const int n);

@ -282,6 +282,7 @@ EMU_OBJS_ALL += emu_inc_rp emu_inc_rp_optimized
EMU_OBJS_ALL += emu_inc_truecrypt_crc32 emu_inc_truecrypt_keyfile emu_inc_truecrypt_xts emu_inc_veracrypt_xts
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
//EMU_OBJS_ALL += emu_m02501_pure
OBJS_ALL := affinity autotune benchmark bitmap bitops combinator common convert cpt cpu_crc32 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)

@ -7,16 +7,6 @@
#include "types.h"
#include "bitops.h"
u32 add3_S (const u32 a, const u32 b, const u32 c)
{
return a + b + c;
}
u32 add3 (const u32 a, const u32 b, const u32 c)
{
return add3_S (a, b, c);
}
u32 rotl32 (const u32 a, const int n)
{
#if defined (_MSC_VER)

@ -12,6 +12,18 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunknown-pragmas"
#define DGST_ELEM 4
#define DGST_POS0 0
#define DGST_POS1 1
#define DGST_POS2 2
#define DGST_POS3 3
typedef struct digest
{
u32 digest_buf[DGST_ELEM];
} digest_t;
#include "m02501-pure.cl"
#pragma GCC diagnostic pop

Loading…
Cancel
Save