From e5a9e9239b0cf1001d9b91497b4ff3ab4a190b1f Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Tue, 4 Oct 2016 13:21:48 +0200
Subject: Crypto: Use SIMD optimized Serpent implementation from Botan. 2.5x
 speed gain factor. Update credits and copyrights notice.

---
 src/Volume/Cipher.cpp | 53 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 51 insertions(+), 2 deletions(-)

(limited to 'src/Volume/Cipher.cpp')

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
-- 
cgit v1.2.3