From e90e24b30b379752bf6531c663085de1d2a653d7 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Tue, 9 Aug 2016 14:25:52 +0200
Subject: Windows: Add support for Streebog (hash) and kuznyechik (encryption)

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

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

diff --git a/src/Volume/Cipher.cpp b/src/Volume/Cipher.cpp
index a90b3c46..69449088 100644
--- a/src/Volume/Cipher.cpp
+++ b/src/Volume/Cipher.cpp
@@ -16,6 +16,8 @@
 #include "Crypto/Serpent.h"
 #include "Crypto/Twofish.h"
 #include "Crypto/Camellia.h"
+#include "Crypto/GostCipher.h"
+#include "Crypto/kuznyechik.h"
 
 #ifdef TC_AES_HW_CPU
 #	include "Crypto/Aes_hw_cpu.h"
@@ -80,6 +82,8 @@ namespace VeraCrypt
 		l.push_back (shared_ptr <Cipher> (new CipherSerpent ()));
 		l.push_back (shared_ptr <Cipher> (new CipherTwofish ()));
 		l.push_back (shared_ptr <Cipher> (new CipherCamellia ()));
+		l.push_back (shared_ptr <Cipher> (new CipherGost89 ()));
+		l.push_back (shared_ptr <Cipher> (new CipherKuznyechik ()));
 
 		return l;
 	}
@@ -264,6 +268,46 @@ namespace VeraCrypt
 		camellia_set_key (key, ScheduledKey.Ptr());
 	}
 
+	// GOST89
+	void CipherGost89::Decrypt (byte *data) const
+	{
+		gost_decrypt (data, data, (gost_kds *) ScheduledKey.Ptr(), 1);
+	}
+
+	void CipherGost89::Encrypt (byte *data) const
+	{
+		gost_encrypt (data, data, (gost_kds *) ScheduledKey.Ptr(), 1);
+	}
+
+	size_t CipherGost89::GetScheduledKeySize () const
+	{
+		return GOST_KS;
+	}
+
+	void CipherGost89::SetCipherKey (const byte *key)
+	{
+		gost_set_key (key, (gost_kds *) ScheduledKey.Ptr());
+	}
 
+	// Kuznyechik
+	void CipherKuznyechik::Decrypt (byte *data) const
+	{
+		kuznyechik_decrypt_block (data, data, (kuznyechik_kds *) ScheduledKey.Ptr());
+	}
+
+	void CipherKuznyechik::Encrypt (byte *data) const
+	{
+		kuznyechik_encrypt_block (data, data, (kuznyechik_kds *) ScheduledKey.Ptr());
+	}
+
+	size_t CipherKuznyechik::GetScheduledKeySize () const
+	{
+		return KUZNYECHIK_KS;
+	}
+
+	void CipherKuznyechik::SetCipherKey (const byte *key)
+	{
+		kuznyechik_set_key (key, (kuznyechik_kds *) ScheduledKey.Ptr());
+	}
 	bool Cipher::HwSupportEnabled = true;
 }
-- 
cgit v1.2.3