From c1378f781aaaa4d9e57c0a383cded7173bde7663 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Sun, 26 Oct 2014 00:33:18 +0200
Subject: Bootloader: optimize code size in single cipher mode by manually
 inlining EAInit, EAGetFirst and EAGetKeySize, and by removing the loop in
 ReadVolumeHeader that tests for encryption algorithms.

---
 src/Common/Crypto.c | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

(limited to 'src/Common/Crypto.c')

diff --git a/src/Common/Crypto.c b/src/Common/Crypto.c
index 9fc69022..e47f9565 100644
--- a/src/Common/Crypto.c
+++ b/src/Common/Crypto.c
@@ -965,20 +965,11 @@ void DecipherBlock(int cipher, void *data, void *ks)
 #endif
 }
 
-int EAGetFirst ()
-{
-	return 1;
-}
-
-int EAGetNext (int previousEA)
-{
-	return 0;
-}
 
-int EAInit (int ea, unsigned char *key, unsigned __int8 *ks)
-{
 #ifdef TC_WINDOWS_BOOT_AES
 
+int EAInit (unsigned char *key, unsigned __int8 *ks)
+{
 	aes_init();
 
 	if (aes_encrypt_key256 (key, (aes_encrypt_ctx *) ks) != EXIT_SUCCESS)
@@ -986,23 +977,11 @@ int EAInit (int ea, unsigned char *key, unsigned __int8 *ks)
 	if (aes_decrypt_key256 (key, (aes_decrypt_ctx *) (ks + sizeof (aes_encrypt_ctx))) != EXIT_SUCCESS)
 		return ERR_CIPHER_INIT_FAILURE;
 
-#elif defined (TC_WINDOWS_BOOT_SERPENT)
-	serpent_set_key (key, ks);
-#elif defined (TC_WINDOWS_BOOT_TWOFISH)
-	twofish_set_key ((TwofishInstance *)ks, (const u4byte *)key);
-#endif
 	return ERR_SUCCESS;
 }
 
-int EAGetKeySize (int ea)
-{
-	return 32;
-}
+#endif
 
-int EAGetFirstCipher (int ea)
-{
-	return 1;
-}
 
 void EncryptBuffer (unsigned __int8 *buf, TC_LARGEST_COMPILER_UINT len, PCRYPTO_INFO cryptoInfo)
 {
-- 
cgit v1.2.3