Remove Tweak handling.
We are arriving at incorrect result for G2 after the first Key Injection, and its not readily apparent why.pull/186/merge
parent
b3399b4f86
commit
f60f212687
|
|
@ -272,17 +272,7 @@ void Threefish::Base::UncheckedSetKey(const byte *key, unsigned int keylen, cons
|
||||||
}
|
}
|
||||||
|
|
||||||
m_tweak.New(3);
|
m_tweak.New(3);
|
||||||
ConstByteArrayParameter t;
|
::memset(m_tweak.begin(), 0x00, 24);
|
||||||
if (params.GetValue(Name::Tweak(), t))
|
|
||||||
{
|
|
||||||
CRYPTOPP_ASSERT(t.size() == 16);
|
|
||||||
::memcpy(m_tweak.begin(), t.begin(), 16);
|
|
||||||
m_tweak[2] = m_tweak[0] + m_tweak[1];
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
::memset(m_tweak.begin(), 0x00, 24);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Threefish::Base::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const
|
void Threefish::Base::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue