diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-02-08 23:26:39 +0100 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-02-09 11:01:06 +0100 |
| commit | 651bea29b4a433972d06cd12be5ef91ec544a41a (patch) | |
| tree | 84e08a572fd3c90d0e31a0882bb4b5eee3be3c0a | |
| parent | 4e03adc2e7ddaa9c61ded36ec87668c901d43867 (diff) | |
| download | VeraCrypt-651bea29b4a433972d06cd12be5ef91ec544a41a.tar.gz VeraCrypt-651bea29b4a433972d06cd12be5ef91ec544a41a.zip | |
Static Code Analysis: clarify macros definition and use.
| -rw-r--r-- | src/Common/Endian.h | 2 | ||||
| -rw-r--r-- | src/Crypto/Aeskey.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/Common/Endian.h b/src/Common/Endian.h index 38af8cfb..bffcb868 100644 --- a/src/Common/Endian.h +++ b/src/Common/Endian.h @@ -108,7 +108,7 @@ extern "C" ( ( unsigned __int32 ) memPtr[ -2 ] << 8 ) | ( unsigned __int32 ) memPtr[ -1 ] )
#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) \
( ( unsigned char ) *memPtr++ )
diff --git a/src/Crypto/Aeskey.c b/src/Crypto/Aeskey.c index 55b6a3c7..948b9238 100644 --- a/src/Crypto/Aeskey.c +++ b/src/Crypto/Aeskey.c @@ -521,10 +521,10 @@ AES_RETURN aes_decrypt_key256(const unsigned char *key, aes_decrypt_ctx cx[1]) #endif
}
#else
- cx->ks[v(56,(4))] = ff(ss[4] = word_in(key, 4));
- cx->ks[v(56,(5))] = ff(ss[5] = word_in(key, 5));
- cx->ks[v(56,(6))] = ff(ss[6] = word_in(key, 6));
- cx->ks[v(56,(7))] = ff(ss[7] = word_in(key, 7));
+ ss[4] = word_in(key, 4); cx->ks[v(56,(4))] = ff(ss[4]);
+ ss[5] = word_in(key, 5); cx->ks[v(56,(5))] = ff(ss[5]);
+ ss[6] = word_in(key, 6); cx->ks[v(56,(6))] = ff(ss[6]);
+ ss[7] = word_in(key, 7); cx->ks[v(56,(7))] = ff(ss[7]);
kdf8(cx->ks, 0); kd8(cx->ks, 1);
kd8(cx->ks, 2); kd8(cx->ks, 3);
kd8(cx->ks, 4); kd8(cx->ks, 5);
|