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

Static Code Analysis: clarify macros definition and use.

Browse Source
This commit is contained in:
Mounir IDRASSI
2015-02-08 23:26:39 +01:00
parent 4e03adc2e7
commit 651bea29b4
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Common/Endian.h
View File

@@ -108,7 +108,7 @@ extern "C"
( ( unsigned __int32 ) memPtr[ -2 ] << 8 ) | ( unsigned __int32 ) memPtr[ -1 ] ) ( ( unsigned __int32 ) memPtr[ -2 ] << 8 ) | ( unsigned __int32 ) memPtr[ -1 ] )
#define mgetWord(memPtr) \ #define mgetWord(memPtr) \
( memPtr += 2, ( unsigned short ) memPtr[ -2 ] << 8 ) | ( ( unsigned short ) memPtr[ -1 ] ) ( memPtr += 2, ((( unsigned short ) memPtr[ -2 ] << 8 ) | ( ( unsigned short ) memPtr[ -1 ] )) )
#define mgetByte(memPtr) \ #define mgetByte(memPtr) \
( ( unsigned char ) *memPtr++ ) ( ( unsigned char ) *memPtr++ )

8
src/Crypto/Aeskey.c
View File

@@ -521,10 +521,10 @@ AES_RETURN aes_decrypt_key256(const unsigned char *key, aes_decrypt_ctx cx[1])
#endif #endif
} }
#else #else
cx->ks[v(56,(4))] = ff(ss[4] = word_in(key, 4)); ss[4] = word_in(key, 4); cx->ks[v(56,(4))] = ff(ss[4]);
cx->ks[v(56,(5))] = ff(ss[5] = word_in(key, 5)); ss[5] = word_in(key, 5); cx->ks[v(56,(5))] = ff(ss[5]);
cx->ks[v(56,(6))] = ff(ss[6] = word_in(key, 6)); ss[6] = word_in(key, 6); cx->ks[v(56,(6))] = ff(ss[6]);
cx->ks[v(56,(7))] = ff(ss[7] = word_in(key, 7)); ss[7] = word_in(key, 7); cx->ks[v(56,(7))] = ff(ss[7]);
kdf8(cx->ks, 0); kd8(cx->ks, 1); kdf8(cx->ks, 0); kd8(cx->ks, 1);
kd8(cx->ks, 2); kd8(cx->ks, 3); kd8(cx->ks, 2); kd8(cx->ks, 3);
kd8(cx->ks, 4); kd8(cx->ks, 5); kd8(cx->ks, 4); kd8(cx->ks, 5);