shadps4-emu/ext-cryptopp
1
0
Fork 0
mirror of https://github.com/shadps4-emu/ext-cryptopp.git synced 2024-11-23 01:49:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix SIMON128 when running on POWER8 and above (GH #1237)

Browse Source 
This was an Asan failure uncovered by cryptest.sh
This commit is contained in:
Jeffrey Walton 2023-09-30 23:16:03 -04:00
parent 34151a54f6
commit 45f8a77f4e
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
simon.cpp
View File

@ -247,12 +247,12 @@ void SIMON64::Base::UncheckedSetKey(const byte *userKey, unsigned int keyLength,
switch (m_kwords)
{
case 3:
m_rkeys.New((m_rounds = 42));
m_rkeys.New((m_rounds = 42)+1);
kblk(m_wspace[2])(m_wspace[1])(m_wspace[0]);
SIMON64_ExpandKey_3W(m_rkeys, m_wspace);
break;
case 4:
m_rkeys.New((m_rounds = 44));
m_rkeys.New((m_rounds = 44)+1);
kblk(m_wspace[3])(m_wspace[2])(m_wspace[1])(m_wspace[0]);
SIMON64_ExpandKey_4W(m_rkeys, m_wspace);
break;
@ -364,17 +364,17 @@ void SIMON128::Base::UncheckedSetKey(const byte *userKey, unsigned int keyLength
switch (m_kwords)
{
case 2:
m_rkeys.New((m_rounds = 68));
m_rkeys.New((m_rounds = 68)+1);
kblk(m_wspace[1])(m_wspace[0]);
SIMON128_ExpandKey_2W(m_rkeys, m_wspace);
break;
case 3:
m_rkeys.New((m_rounds = 69));
m_rkeys.New((m_rounds = 69)+1);
kblk(m_wspace[2])(m_wspace[1])(m_wspace[0]);
SIMON128_ExpandKey_3W(m_rkeys, m_wspace);
break;
case 4:
m_rkeys.New((m_rounds = 72));
m_rkeys.New((m_rounds = 72)+1);
kblk(m_wspace[3])(m_wspace[2])(m_wspace[1])(m_wspace[0]);
SIMON128_ExpandKey_4W(m_rkeys, m_wspace);
break;