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

Rework UncheckedSetKey to rearrange words in ExpandKey (GH #538)

Browse Source
This commit is contained in:
Jeffrey Walton 2017-11-21 17:43:28 -05:00
parent 6992de66ea
commit b4cecfef95
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
speck.cpp
View File

@ -87,7 +87,7 @@ template <class W, unsigned int R>
inline void SPECK_ExpandKey_2W(W key[R], const W k[2]) inline void SPECK_ExpandKey_2W(W key[R], const W k[2])
{ {
CRYPTOPP_ASSERT(R==32); CRYPTOPP_ASSERT(R==32);
W i=0, B=k[1], A=k[0]; W i=0, B=k[0], A=k[1];
while(i<R-1) while(i<R-1)
{ {
@ -107,7 +107,7 @@ template <class W, unsigned int R>
inline void SPECK_ExpandKey_3W(W key[R], const W k[3]) inline void SPECK_ExpandKey_3W(W key[R], const W k[3])
{ {
CRYPTOPP_ASSERT(R==33 || R==26); CRYPTOPP_ASSERT(R==33 || R==26);
W i=0, C=k[2], B=k[1], A=k[0]; W i=0, C=k[0], B=k[1], A=k[2];
unsigned int blocks = R/2; unsigned int blocks = R/2;
while(blocks--) while(blocks--)
@ -134,7 +134,7 @@ template <class W, unsigned int R>
inline void SPECK_ExpandKey_4W(W key[R], const W k[4]) inline void SPECK_ExpandKey_4W(W key[R], const W k[4])
{ {
CRYPTOPP_ASSERT(R==34 || R==27); CRYPTOPP_ASSERT(R==34 || R==27);
W i=0, D=k[3], C=k[2], B=k[1], A=k[0]; W i=0, D=k[0], C=k[1], B=k[2], A=k[3];
unsigned int blocks = R/3; unsigned int blocks = R/3;
while(blocks--) while(blocks--)
@ -172,22 +172,16 @@ void SPECK64::Base::UncheckedSetKey(const byte *userKey, unsigned int keyLength,
// Encrypting and decrypting requires 4 words workspace. // Encrypting and decrypting requires 4 words workspace.
m_kwords = keyLength/sizeof(word32); m_kwords = keyLength/sizeof(word32);
m_wspace.New(STDMAX(m_kwords,4U)); m_wspace.New(STDMAX(m_kwords,4U));
GetUserKey(BIG_ENDIAN_ORDER, m_wspace.begin(), m_kwords, userKey, keyLength);
// Avoid GetUserKey. SPECK does unusual things with key string and word ordering
// {A,B} -> {B,A}, {A,B,C} -> {C,B,A}, etc.
typedef GetBlock<word32, BigEndian, false> InBlock;
InBlock iblk(userKey);
switch (m_kwords) switch (m_kwords)
{ {
case 3: case 3:
m_rkey.New(26); m_rkey.New(26);
iblk(m_wspace[2])(m_wspace[1])(m_wspace[0]);
SPECK_ExpandKey_3W<word32, 26>(m_rkey, m_wspace); SPECK_ExpandKey_3W<word32, 26>(m_rkey, m_wspace);
break; break;
case 4: case 4:
m_rkey.New(27); m_rkey.New(27);
iblk(m_wspace[3])(m_wspace[2])(m_wspace[1])(m_wspace[0]);
SPECK_ExpandKey_4W<word32, 27>(m_rkey, m_wspace); SPECK_ExpandKey_4W<word32, 27>(m_rkey, m_wspace);
break; break;
default: default:
@ -252,27 +246,20 @@ void SPECK128::Base::UncheckedSetKey(const byte *userKey, unsigned int keyLength
// Encrypting and decrypting requires 4 words workspace. // Encrypting and decrypting requires 4 words workspace.
m_kwords = keyLength/sizeof(word64); m_kwords = keyLength/sizeof(word64);
m_wspace.New(STDMAX(m_kwords,4U)); m_wspace.New(STDMAX(m_kwords,4U));
GetUserKey(BIG_ENDIAN_ORDER, m_wspace.begin(), m_kwords, userKey, keyLength);
// Avoid GetUserKey. SPECK does unusual things with key string and word ordering
// {A,B} -> {B,A}, {A,B,C} -> {C,B,A}, etc.
typedef GetBlock<word64, BigEndian, false> InBlock;
InBlock iblk(userKey);
switch (m_kwords) switch (m_kwords)
{ {
case 2: case 2:
m_rkey.New(32); m_rkey.New(32);
iblk(m_wspace[1])(m_wspace[0]);
SPECK_ExpandKey_2W<word64, 32>(m_rkey, m_wspace); SPECK_ExpandKey_2W<word64, 32>(m_rkey, m_wspace);
break; break;
case 3: case 3:
m_rkey.New(33); m_rkey.New(33);
iblk(m_wspace[2])(m_wspace[1])(m_wspace[0]);
SPECK_ExpandKey_3W<word64, 33>(m_rkey, m_wspace); SPECK_ExpandKey_3W<word64, 33>(m_rkey, m_wspace);
break; break;
case 4: case 4:
m_rkey.New(34); m_rkey.New(34);
iblk(m_wspace[3])(m_wspace[2])(m_wspace[1])(m_wspace[0]);
SPECK_ExpandKey_4W<word64, 34>(m_rkey, m_wspace); SPECK_ExpandKey_4W<word64, 34>(m_rkey, m_wspace);
break; break;
default: default: