diff options
author | alt3r 3go <alt3r.3go@protonmail.com> | 2019-12-09 17:43:33 +0100 |
---|---|---|
committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2019-12-09 17:43:33 +0100 |
commit | 0364a36f84b2a08c690ec008d4cbb160bdf27a67 (patch) | |
tree | a6b9f9968539a06603f4ff5e3b8f18434e27e3ae /src/Common | |
parent | 07bb27e3b94ee26128d5c7f800cdcf3232ff281a (diff) | |
download | VeraCrypt-0364a36f84b2a08c690ec008d4cbb160bdf27a67.tar.gz VeraCrypt-0364a36f84b2a08c690ec008d4cbb160bdf27a67.zip |
Linux: fix NOASM compilation (#563) (#568)
Signed-off-by: alt3r 3go <alt3r.3go@protonmail.com>
Diffstat (limited to 'src/Common')
-rw-r--r-- | src/Common/Crypto.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Common/Crypto.c b/src/Common/Crypto.c index 89ce2508..913495f4 100644 --- a/src/Common/Crypto.c +++ b/src/Common/Crypto.c @@ -252,7 +252,7 @@ void EncipherBlocks (int cipher, void *dataPtr, void *ks, size_t blockCount) #endif } #endif -#if CRYPTOPP_BOOL_X64 +#if CRYPTOPP_BOOL_X64 && !defined(CRYPTOPP_DISABLE_ASM) else if (cipher == TWOFISH) { twofish_encrypt_blocks(ks, data, data, (uint32) blockCount); } @@ -369,7 +369,7 @@ void DecipherBlocks (int cipher, void *dataPtr, void *ks, size_t blockCount) #endif } #endif -#if CRYPTOPP_BOOL_X64 +#if CRYPTOPP_BOOL_X64 && !defined(CRYPTOPP_DISABLE_ASM) else if (cipher == TWOFISH) { twofish_decrypt_blocks(ks, data, data, (uint32) blockCount); } @@ -464,7 +464,7 @@ BOOL CipherSupportsIntraDataUnitParallelization (int cipher) || (cipher == SERPENT && HasSSE2()) || (cipher == KUZNYECHIK && HasSSE2()) #endif -#if CRYPTOPP_BOOL_X64 +#if CRYPTOPP_BOOL_X64 && !defined(CRYPTOPP_DISABLE_ASM) || (cipher == TWOFISH) || (cipher == CAMELLIA) #endif |