arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix assert when keylen not multiple of 4

pull/2/head
weidai 2004-03-09 12:40:59 +00:00
parent 88076c078d
commit 4e99bcc40d
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shacal2.cpp
View File

@ -38,11 +38,7 @@ void SHACAL2::Base::UncheckedSetKey(CipherDir dir, const byte *userKey, unsigned
word32 *rk = m_key; word32 *rk = m_key;
unsigned int i; unsigned int i;
GetUserKey(BIG_ENDIAN_ORDER, rk, keylen/4, userKey, keylen); GetUserKey(BIG_ENDIAN_ORDER, rk, m_key.size(), userKey, keylen);
if (keylen != MAX_KEYLENGTH)
{
memset(rk + keylen/4, 0, MAX_KEYLENGTH - keylen);
}
for (i = 0; i < 48; i++, rk++) for (i = 0; i < 48; i++, rk++)
{ {
rk[16] = rk[0] + s0(rk[1]) + rk[9] + s1(rk[14]); rk[16] = rk[0] + s0(rk[1]) + rk[9] + s1(rk[14]);