Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 11:08:02 -06:00
Code Activity

Crypto: make HMAC-SHA512 code more clear by removing the memory usage optimization and make field k of hmac_sha512_ctx big enough to hold computation results instead of relying on the field u that follows it.

Browse Source
This commit is contained in:
Mounir IDRASSI
2016-09-20 14:14:49 +02:00
parent 479925f403
commit b81ec7d7e0
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Common/Pkcs5.c
View File

@@ -280,7 +280,7 @@ typedef struct hmac_sha512_ctx_struct
sha512_ctx ctx; sha512_ctx ctx;
sha512_ctx inner_digest_ctx; /*pre-computed inner digest context */ sha512_ctx inner_digest_ctx; /*pre-computed inner digest context */
sha512_ctx outer_digest_ctx; /*pre-computed outer digest context */ sha512_ctx outer_digest_ctx; /*pre-computed outer digest context */
char k[PKCS5_SALT_SIZE + 4]; /* enough to hold (salt_len + 4) and also the SHA512 hash */ char k[SHA512_BLOCKSIZE]; /* enough to hold (salt_len + 4) and also the SHA512 hash */
char u[SHA512_DIGESTSIZE]; char u[SHA512_DIGESTSIZE];
} hmac_sha512_ctx; } hmac_sha512_ctx;
@@ -322,9 +322,7 @@ void hmac_sha512
{ {
hmac_sha512_ctx hmac; hmac_sha512_ctx hmac;
sha512_ctx* ctx; sha512_ctx* ctx;
char* buf = hmac.k; /* there is enough space to hold SHA512_BLOCKSIZE (128) bytes char* buf = hmac.k;
* because k is followed by u in hmac_sha512_ctx
*/
int b; int b;
char key[SHA512_DIGESTSIZE]; char key[SHA512_DIGESTSIZE];
@@ -405,9 +403,7 @@ void derive_key_sha512 (char *pwd, int pwd_len, char *salt, int salt_len, uint32
{ {
hmac_sha512_ctx hmac; hmac_sha512_ctx hmac;
sha512_ctx* ctx; sha512_ctx* ctx;
char* buf = hmac.k; /* there is enough space to hold SHA512_BLOCKSIZE (128) bytes char* buf = hmac.k;
* because k is followed by u in hmac_sha512_ctx
*/
int b, l, r; int b, l, r;
char key[SHA512_DIGESTSIZE]; char key[SHA512_DIGESTSIZE];