From 70097ecfe54a9630e1e77fdc30204a5460228193 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Tue, 20 Jun 2017 17:43:35 +0200
Subject: Crypto: Add optimized Camellia assembly implementation for x86_64
 based on work by Jussi Kivilinna
 (https://github.com/jkivilin/supercop-blockciphers). This improve speed by a
 factor of 2.5 when AES-NI supported by CPU and by 30% if AES-NI not
 supported.

---
 src/Volume/Cipher.cpp | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

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

diff --git a/src/Volume/Cipher.cpp b/src/Volume/Cipher.cpp
index be8cc3eb..1b5df79f 100644
--- a/src/Volume/Cipher.cpp
+++ b/src/Volume/Cipher.cpp
@@ -24,6 +24,23 @@
 #endif
 #include "Crypto/cpu.h"
 
+extern "C" int IsAesHwCpuSupported ()
+{
+#ifdef TC_AES_HW_CPU
+	static bool state = false;
+	static bool stateValid = false;
+
+	if (!stateValid)
+	{
+		state = g_hasAESNI ? true : false;
+		stateValid = true;
+	}
+	return state && Cipher::IsHwSupportEnabled();
+#else
+	return false;
+#endif
+}
+
 namespace VeraCrypt
 {
 	Cipher::Cipher () : Initialized (false)
@@ -349,6 +366,39 @@ namespace VeraCrypt
 	{
 		camellia_set_key (key, ScheduledKey.Ptr());
 	}
+	
+	void CipherCamellia::EncryptBlocks (byte *data, size_t blockCount) const
+	{
+		if (!Initialized)
+			throw NotInitialized (SRC_POS);
+
+#if CRYPTOPP_BOOL_X64
+		camellia_encrypt_blocks ( ScheduledKey.Ptr(), data, data, blockCount);
+#else
+		Cipher::EncryptBlocks (data, blockCount);
+#endif
+	}
+	
+	void CipherCamellia::DecryptBlocks (byte *data, size_t blockCount) const
+	{
+		if (!Initialized)
+			throw NotInitialized (SRC_POS);
+
+#if CRYPTOPP_BOOL_X64
+		camellia_decrypt_blocks ( ScheduledKey.Ptr(), data, data, blockCount);
+#else
+		Cipher::DecryptBlocks (data, blockCount);
+#endif
+	}
+	
+	bool CipherCamellia::IsHwSupportAvailable () const
+	{
+#if CRYPTOPP_BOOL_X64
+		return true;
+#else
+		return false;
+#endif
+	}
 
 	// GOST89
 	void CipherGost89::Decrypt (byte *data) const
-- 
cgit v1.2.3