VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Crypto/Twofish.c
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2014-09-27 16:04:07 +0200
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2014-11-08 23:23:37 +0100
commit0178a6d33ff6afc7d0305619d3d250235ae55d09 (patch)
tree5c0cdc28b7ff07b02de5f05f70f16a46416f97b6 /src/Crypto/Twofish.c
parent411e8599f39a601b26429b3d1183488c413eb21b (diff)
downloadVeraCrypt-0178a6d33ff6afc7d0305619d3d250235ae55d09.tar.gz
VeraCrypt-0178a6d33ff6afc7d0305619d3d250235ae55d09.zip
Optimize code space and solve the Serpent issue (https://sourceforge.net/p/veracrypt/discussion/technical/thread/fb09633a/#6406) by removing key length parameter from serpent_set_key and twofish_set_key
Diffstat (limited to 'src/Crypto/Twofish.c')
-rw-r--r--src/Crypto/Twofish.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Crypto/Twofish.c b/src/Crypto/Twofish.c
index 7e438d1a..de5b1b66 100644
--- a/src/Crypto/Twofish.c
+++ b/src/Crypto/Twofish.c
@@ -369,7 +369,7 @@ static u4byte mds_rem(u4byte p0, u4byte p1)
/* initialise the key schedule from the user supplied key */
-u4byte *twofish_set_key(TwofishInstance *instance, const u4byte in_key[], const u4byte key_len)
+u4byte *twofish_set_key(TwofishInstance *instance, const u4byte in_key[])
{ u4byte i, a, b, me_key[4], mo_key[4];
u4byte *l_key, *s_key;
@@ -390,7 +390,7 @@ u4byte *twofish_set_key(TwofishInstance *instance, const u4byte in_key[], const
}
#endif
- instance->k_len = key_len / 64; /* 2, 3 or 4 */
+ instance->k_len = 4;
for(i = 0; i < instance->k_len; ++i)
{