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/Volume | |
| 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/Volume')
| -rw-r--r-- | src/Volume/Cipher.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Volume/Cipher.cpp b/src/Volume/Cipher.cpp index 32f61b76..40507a2d 100644 --- a/src/Volume/Cipher.cpp +++ b/src/Volume/Cipher.cpp @@ -247,7 +247,7 @@ namespace VeraCrypt if (!Initialized) throw NotInitialized (SRC_POS); -#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE +#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE && !defined(CRYPTOPP_DISABLE_ASM) if ((blockCount >= 4) && IsHwSupportAvailable()) { @@ -263,7 +263,7 @@ namespace VeraCrypt if (!Initialized) throw NotInitialized (SRC_POS); -#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE +#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE && !defined(CRYPTOPP_DISABLE_ASM) if ((blockCount >= 4) && IsHwSupportAvailable()) { @@ -318,7 +318,7 @@ namespace VeraCrypt if (!Initialized) throw NotInitialized (SRC_POS); -#if CRYPTOPP_BOOL_X64 +#if CRYPTOPP_BOOL_X64 && !defined(CRYPTOPP_DISABLE_ASM) twofish_encrypt_blocks ( (TwofishInstance *) ScheduledKey.Ptr(), data, data, blockCount); #else Cipher::EncryptBlocks (data, blockCount); @@ -330,7 +330,7 @@ namespace VeraCrypt if (!Initialized) throw NotInitialized (SRC_POS); -#if CRYPTOPP_BOOL_X64 +#if CRYPTOPP_BOOL_X64 && !defined(CRYPTOPP_DISABLE_ASM) twofish_decrypt_blocks ( (TwofishInstance *) ScheduledKey.Ptr(), data, data, blockCount); #else Cipher::DecryptBlocks (data, blockCount); @@ -339,7 +339,7 @@ namespace VeraCrypt bool CipherTwofish::IsHwSupportAvailable () const { -#if CRYPTOPP_BOOL_X64 +#if CRYPTOPP_BOOL_X64 && !defined(CRYPTOPP_DISABLE_ASM) return true; #else return false; @@ -372,7 +372,7 @@ namespace VeraCrypt if (!Initialized) throw NotInitialized (SRC_POS); -#if CRYPTOPP_BOOL_X64 +#if CRYPTOPP_BOOL_X64 && !defined(CRYPTOPP_DISABLE_ASM) camellia_encrypt_blocks ( ScheduledKey.Ptr(), data, data, blockCount); #else Cipher::EncryptBlocks (data, blockCount); @@ -384,7 +384,7 @@ namespace VeraCrypt if (!Initialized) throw NotInitialized (SRC_POS); -#if CRYPTOPP_BOOL_X64 +#if CRYPTOPP_BOOL_X64 && !defined(CRYPTOPP_DISABLE_ASM) camellia_decrypt_blocks ( ScheduledKey.Ptr(), data, data, blockCount); #else Cipher::DecryptBlocks (data, blockCount); @@ -393,7 +393,7 @@ namespace VeraCrypt bool CipherCamellia::IsHwSupportAvailable () const { -#if CRYPTOPP_BOOL_X64 +#if CRYPTOPP_BOOL_X64 && !defined(CRYPTOPP_DISABLE_ASM) return true; #else return false; |