From 4e99bcc40db7203e010203d125b0bfe6f27fb99e Mon Sep 17 00:00:00 2001
From: weidai <weidai11@users.noreply.github.com>
Date: Tue, 9 Mar 2004 12:40:59 +0000
Subject: fix assert when keylen not multiple of 4

---
 shacal2.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'shacal2.cpp')

diff --git a/shacal2.cpp b/shacal2.cpp
index 971aec02..78e4a839 100644
--- a/shacal2.cpp
+++ b/shacal2.cpp
@@ -38,11 +38,7 @@ void SHACAL2::Base::UncheckedSetKey(CipherDir dir, const byte *userKey, unsigned
 	word32 *rk = m_key;
 	unsigned int i;
 
-	GetUserKey(BIG_ENDIAN_ORDER, rk, keylen/4, userKey, keylen);
-	if (keylen != MAX_KEYLENGTH)
-	{
-		memset(rk + keylen/4, 0, MAX_KEYLENGTH - keylen);
-	}
+	GetUserKey(BIG_ENDIAN_ORDER, rk, m_key.size(), userKey, keylen);
 	for (i = 0; i < 48; i++, rk++)
 	{
 		rk[16] = rk[0] + s0(rk[1]) + rk[9] + s1(rk[14]);
-- 
cgit v1.2.1