nihilist/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt synced 2024-09-20 21:06:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Optimization to reduce code size of derive_u_ripemd160. Useful for boatloader.

Browse Source
This commit is contained in:
Mounir IDRASSI 2014-10-05 00:34:41 +02:00
parent 0178a6d33f
commit 50ca9fe46f
1 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/Common/Pkcs5.c
View File

@ -247,8 +247,20 @@ void derive_u_ripemd160 (BOOL bNotTest, char *pwd, int pwd_len, char *salt, int
char j[RIPEMD160_DIGESTSIZE], k[RIPEMD160_DIGESTSIZE]; char j[RIPEMD160_DIGESTSIZE], k[RIPEMD160_DIGESTSIZE];
char init[128]; char init[128];
char counter[4]; char counter[4];
int c, i, l; uint32 c;
int EnhanceSecurityLoops = (bNotTest)? 20 : 1; int i;
if (bNotTest)
{
if (iterations == 32767)
c = 655331;
else
c = 327661;
}
else
{
c = iterations;
}
/* iteration 1 */ /* iteration 1 */
memset (counter, 0, 4); memset (counter, 0, 4);
@ -259,34 +271,17 @@ void derive_u_ripemd160 (BOOL bNotTest, char *pwd, int pwd_len, char *salt, int
memcpy (u, j, RIPEMD160_DIGESTSIZE); memcpy (u, j, RIPEMD160_DIGESTSIZE);
/* remaining iterations */ /* remaining iterations */
for (l = 0; l < EnhanceSecurityLoops; l++) while ( c > 1)
{ {
for (c = 1; c < iterations; c++) hmac_ripemd160 (pwd, pwd_len, j, RIPEMD160_DIGESTSIZE, k);
for (i = 0; i < RIPEMD160_DIGESTSIZE; i++)
{ {
hmac_ripemd160 (pwd, pwd_len, j, RIPEMD160_DIGESTSIZE, k); u[i] ^= k[i];
for (i = 0; i < RIPEMD160_DIGESTSIZE; i++) j[i] = k[i];
{
u[i] ^= k[i];
j[i] = k[i];
}
} }
c--;
} }
/* add extra 10 loops to ensure backward compatibilty with the previous count (327661 for boot, 655331 for normal) */
if (iterations == 32767)
{
/* case of normal partition : add 10 iterations to have a total of 655331 = (32767 - 1)*20 + 1 + 10 */
for (c = 0; c < 10; c++)
{
hmac_ripemd160 (pwd, pwd_len, j, RIPEMD160_DIGESTSIZE, k);
for (i = 0; i < RIPEMD160_DIGESTSIZE; i++)
{
u[i] ^= k[i];
j[i] = k[i];
}
}
}
/* Prevent possible leaks. */ /* Prevent possible leaks. */
burn (j, sizeof(j)); burn (j, sizeof(j));
burn (k, sizeof(k)); burn (k, sizeof(k));