nihilist/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt synced 2024-11-30 23:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Windows: Enable Twofish optimized 64-bit assembly for UEFI bootloader since a pre-compiled object file was included to its build system.

Browse Source
This commit is contained in:
Mounir IDRASSI 2016-12-19 17:46:38 +01:00
parent 1ef6177ae3
commit 5493de11d5
No known key found for this signature in database
GPG Key ID: DD0C382D5FCFB8FC
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Common/Crypto.c
View File

@ -247,7 +247,7 @@ void EncipherBlocks (int cipher, void *dataPtr, void *ks, size_t blockCount)
#endif #endif
} }
#endif #endif
#if CRYPTOPP_BOOL_X64 && !defined(_UEFI) #if CRYPTOPP_BOOL_X64
else if (cipher == TWOFISH) { else if (cipher == TWOFISH) {
twofish_encrypt_blocks(ks, data, data, (uint32) blockCount); twofish_encrypt_blocks(ks, data, data, (uint32) blockCount);
} }
@ -347,7 +347,7 @@ void DecipherBlocks (int cipher, void *dataPtr, void *ks, size_t blockCount)
#endif #endif
} }
#endif #endif
#if CRYPTOPP_BOOL_X64 && !defined(_UEFI) #if CRYPTOPP_BOOL_X64
else if (cipher == TWOFISH) { else if (cipher == TWOFISH) {
twofish_decrypt_blocks(ks, data, data, (uint32) blockCount); twofish_decrypt_blocks(ks, data, data, (uint32) blockCount);
} }
@ -428,7 +428,7 @@ BOOL CipherSupportsIntraDataUnitParallelization (int cipher)
#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE && !defined (_UEFI) #if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE && !defined (_UEFI)
|| (cipher == SERPENT && HasSSE2()) || (cipher == SERPENT && HasSSE2())
#endif #endif
#if CRYPTOPP_BOOL_X64 && !defined(_UEFI) #if CRYPTOPP_BOOL_X64
|| (cipher == TWOFISH) || (cipher == TWOFISH)
#endif #endif
; ;

8
src/Crypto/Twofish.c
View File

@ -54,7 +54,7 @@
#define UNROLL_TWOFISH #define UNROLL_TWOFISH
#endif #endif
#if CRYPTOPP_BOOL_X64 && !defined(_UEFI) #if CRYPTOPP_BOOL_X64
/* these are 64-bit assembly implementation taken from https://github.com/jkivilin/supercop-blockciphers /* these are 64-bit assembly implementation taken from https://github.com/jkivilin/supercop-blockciphers
Copyright © 2011-2013 Jussi Kivilinna <jussi.kivilinna@iki.fi> Copyright © 2011-2013 Jussi Kivilinna <jussi.kivilinna@iki.fi>
@ -630,7 +630,7 @@ void twofish_set_key(TwofishInstance *instance, const u4byte in_key[])
uint32 b = rotl32(MDSQ[0][Q[0][Q[0][Q[1][Q[1][i + 1] ^ key[28]] ^ key[20]] ^ key[12]] ^ key[4]] ^ MDSQ[1][Q[0][Q[1][Q[1][Q[0][i + 1] ^ key[29]] ^ key[21]] ^ key[13]] ^ key[5]] uint32 b = rotl32(MDSQ[0][Q[0][Q[0][Q[1][Q[1][i + 1] ^ key[28]] ^ key[20]] ^ key[12]] ^ key[4]] ^ MDSQ[1][Q[0][Q[1][Q[1][Q[0][i + 1] ^ key[29]] ^ key[21]] ^ key[13]] ^ key[5]]
^ MDSQ[2][Q[1][Q[0][Q[0][Q[0][i + 1] ^ key[30]] ^ key[22]] ^ key[14]] ^ key[6]] ^ MDSQ[3][Q[1][Q[1][Q[0][Q[1][i + 1] ^ key[31]] ^ key[23]] ^ key[15]] ^ key[7]], 8); ^ MDSQ[2][Q[1][Q[0][Q[0][Q[0][i + 1] ^ key[30]] ^ key[22]] ^ key[14]] ^ key[6]] ^ MDSQ[3][Q[1][Q[1][Q[0][Q[1][i + 1] ^ key[31]] ^ key[23]] ^ key[15]] ^ key[7]], 8);
a += b; a += b;
#if CRYPTOPP_BOOL_X64 && !defined(_UEFI) #if CRYPTOPP_BOOL_X64
if (i < 8) if (i < 8)
{ {
instance->w[i] = a; instance->w[i] = a;
@ -998,7 +998,7 @@ void twofish_set_key(TwofishInstance *instance, const u4byte in_key[])
#ifndef TC_MINIMIZE_CODE_SIZE #ifndef TC_MINIMIZE_CODE_SIZE
#if (CRYPTOPP_BOOL_X64 == 0) || defined(_UEFI) #if (CRYPTOPP_BOOL_X64 == 0)
void twofish_encrypt(TwofishInstance *ks, const u4byte in_blk[4], u4byte out_blk[4]) void twofish_encrypt(TwofishInstance *ks, const u4byte in_blk[4], u4byte out_blk[4])
{ {
uint32* rk = ks->l_key; uint32* rk = ks->l_key;
@ -1071,7 +1071,7 @@ void twofish_encrypt(TwofishInstance *instance, const u4byte in_blk[4], u4byte o
#ifndef TC_MINIMIZE_CODE_SIZE #ifndef TC_MINIMIZE_CODE_SIZE
#if (CRYPTOPP_BOOL_X64 == 0) || defined(_UEFI) #if (CRYPTOPP_BOOL_X64 == 0)
void twofish_decrypt(TwofishInstance *ks, const u4byte in_blk[4], u4byte out_blk[4]) void twofish_decrypt(TwofishInstance *ks, const u4byte in_blk[4], u4byte out_blk[4])
{ {
uint32* rk = ks->l_key; uint32* rk = ks->l_key;

4
src/Crypto/Twofish.h
View File

@ -35,7 +35,7 @@ extern "C"
#endif #endif
typedef struct typedef struct
{ {
#if CRYPTOPP_BOOL_X64 && !defined(_UEFI) #if CRYPTOPP_BOOL_X64
u4byte mk_tab[4][256], w[8], k[32]; u4byte mk_tab[4][256], w[8], k[32];
#else #else
u4byte l_key[40]; u4byte l_key[40];
@ -52,7 +52,7 @@ typedef struct
/* in_key must be 32-bytes long */ /* in_key must be 32-bytes long */
void twofish_set_key(TwofishInstance *instance, const u4byte in_key[]); void twofish_set_key(TwofishInstance *instance, const u4byte in_key[]);
#if CRYPTOPP_BOOL_X64 && !defined(_UEFI) #if CRYPTOPP_BOOL_X64
void twofish_encrypt_blocks(TwofishInstance *instance, const byte* in_blk, byte* out_blk, uint32 blockCount); void twofish_encrypt_blocks(TwofishInstance *instance, const byte* in_blk, byte* out_blk, uint32 blockCount);
void twofish_decrypt_blocks(TwofishInstance *instance, const byte* in_blk, byte* out_blk, uint32 blockCount); void twofish_decrypt_blocks(TwofishInstance *instance, const byte* in_blk, byte* out_blk, uint32 blockCount);
#define twofish_encrypt(instance,in_blk,out_blk) twofish_encrypt_blocks(instance, (const byte*) in_blk, (byte*) out_blk, 1) #define twofish_encrypt(instance,in_blk,out_blk) twofish_encrypt_blocks(instance, (const byte*) in_blk, (byte*) out_blk, 1)