VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Crypto
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2015-02-08 22:26:39 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2015-02-09 10:01:06 (GMT)
commit651bea29b4a433972d06cd12be5ef91ec544a41a (patch)
tree84e08a572fd3c90d0e31a0882bb4b5eee3be3c0a /src/Crypto
parent4e03adc2e7ddaa9c61ded36ec87668c901d43867 (diff)
downloadVeraCrypt-651bea29b4a433972d06cd12be5ef91ec544a41a.zip
VeraCrypt-651bea29b4a433972d06cd12be5ef91ec544a41a.tar.gz
Static Code Analysis: clarify macros definition and use.
Diffstat (limited to 'src/Crypto')
-rw-r--r--src/Crypto/Aeskey.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Crypto/Aeskey.c b/src/Crypto/Aeskey.c
index 55b6a3c..948b923 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);