From ecbd4a51c860652ce4ef4af837eb8341f27c4a30 Mon Sep 17 00:00:00 2001 From: jsteube Date: Mon, 25 Mar 2019 16:15:58 +0100 Subject: [PATCH] Add remaining emu_inc_* sources to Makefile --- OpenCL/inc_veracrypt_xts.cl | 2 ++ src/Makefile | 9 ++------- src/emu_inc_veracrypt_xts.c | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 src/emu_inc_veracrypt_xts.c diff --git a/OpenCL/inc_veracrypt_xts.cl b/OpenCL/inc_veracrypt_xts.cl index 461e50a2d..8709db662 100644 --- a/OpenCL/inc_veracrypt_xts.cl +++ b/OpenCL/inc_veracrypt_xts.cl @@ -11,6 +11,8 @@ #include "inc_cipher_twofish.h" #include "inc_cipher_camellia.h" #include "inc_cipher_kuznyechik.h" +#include "inc_truecrypt_crc32.h" +#include "inc_truecrypt_xts.h" #include "inc_veracrypt_xts.h" DECLSPEC void camellia256_decrypt_xts_first (const u32 *ukey1, const u32 *ukey2, const u32 *in, u32 *out, u32 *S, u32 *T, u32 *ks) diff --git a/src/Makefile b/src/Makefile index 82acd521c..6d869b633 100644 --- a/src/Makefile +++ b/src/Makefile @@ -277,14 +277,9 @@ endif # MSYS2 ## Objects ## -#missing: -#-rw-r--r-- 1 root root 440 Mar 23 22:08 src/emu_inc_truecrypt_crc32.c -#-rw-r--r-- 1 root root 442 Mar 23 22:09 src/emu_inc_truecrypt_keyfile.c -#-rw-r--r-- 1 root root 438 Mar 23 22:10 src/emu_inc_truecrypt_xts.c -#-rw-r--r-- 1 root root 432 Mar 22 23:07 src/emu_m02501_pure.c - EMU_OBJS_ALL := emu_general emu_inc_common emu_inc_scalar emu_inc_simd -EMU_OBJS_ALL += emu_inc_rp emu_inc_rp_optimized +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 diff --git a/src/emu_inc_veracrypt_xts.c b/src/emu_inc_veracrypt_xts.c new file mode 100644 index 000000000..133100b4c --- /dev/null +++ b/src/emu_inc_veracrypt_xts.c @@ -0,0 +1,17 @@ +/** + * Author......: See docs/credits.txt + * License.....: MIT + */ + +#include "common.h" +#include "types.h" +#include "emu_general.h" + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-variable" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunknown-pragmas" + +#include "inc_veracrypt_xts.cl" + +#pragma GCC diagnostic pop