VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Volume/Cipher.cpp
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2016-10-04 13:21:48 +0200
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2016-10-17 18:40:23 +0200
commite5a9e9239b0cf1001d9b91497b4ff3ab4a190b1f (patch)
tree5656a151e5f777d834924a3784432c5bd928ed03 /src/Volume/Cipher.cpp
parent7ff3c5d1080482c55a5c5f4720d22d212a8d7373 (diff)
downloadVeraCrypt-e5a9e9239b0cf1001d9b91497b4ff3ab4a190b1f.tar.gz
VeraCrypt-e5a9e9239b0cf1001d9b91497b4ff3ab4a190b1f.zip
Crypto: Use SIMD optimized Serpent implementation from Botan. 2.5x speed gain factor. Update credits and copyrights notice.
Diffstat (limited to 'src/Volume/Cipher.cpp')
-rw-r--r--src/Volume/Cipher.cpp53
1 files changed, 51 insertions, 2 deletions
diff --git a/src/Volume/Cipher.cpp b/src/Volume/Cipher.cpp
index 3363f640..09c821bb 100644
--- a/src/Volume/Cipher.cpp
+++ b/src/Volume/Cipher.cpp
@@ -13,7 +13,7 @@
#include "Platform/Platform.h"
#include "Cipher.h"
#include "Crypto/Aes.h"
-#include "Crypto/Serpent.h"
+#include "Crypto/SerpentFast.h"
#include "Crypto/Twofish.h"
#include "Crypto/Camellia.h"
#include "Crypto/GostCipher.h"
@@ -21,8 +21,8 @@
#ifdef TC_AES_HW_CPU
# include "Crypto/Aes_hw_cpu.h"
-# include "Crypto/cpu.h"
#endif
+#include "Crypto/cpu.h"
namespace VeraCrypt
{
@@ -224,6 +224,55 @@ namespace VeraCrypt
{
serpent_set_key (key, ScheduledKey);
}
+
+ void CipherSerpent::EncryptBlocks (byte *data, size_t blockCount) const
+ {
+ if (!Initialized)
+ throw NotInitialized (SRC_POS);
+
+#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE
+ if ((blockCount >= 4)
+ && IsHwSupportAvailable())
+ {
+ serpent_encrypt_blocks (data, data, blockCount, ScheduledKey.Ptr());
+ }
+ else
+#endif
+ Cipher::EncryptBlocks (data, blockCount);
+ }
+
+ void CipherSerpent::DecryptBlocks (byte *data, size_t blockCount) const
+ {
+ if (!Initialized)
+ throw NotInitialized (SRC_POS);
+
+#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE
+ if ((blockCount >= 4)
+ && IsHwSupportAvailable())
+ {
+ serpent_decrypt_blocks (data, data, blockCount, ScheduledKey.Ptr());
+ }
+ else
+#endif
+ Cipher::DecryptBlocks (data, blockCount);
+ }
+
+ bool CipherSerpent::IsHwSupportAvailable () const
+ {
+#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE
+ static bool state = false;
+ static bool stateValid = false;
+
+ if (!stateValid)
+ {
+ state = HasSSE2() ? true : false;
+ stateValid = true;
+ }
+ return state;
+#else
+ return false;
+#endif
+ }
// Twofish