summaryrefslogtreecommitdiff
path: root/threefish.cpp
diff options
context:
space:
mode:
authorJeffrey Walton <noloader@gmail.com>2017-05-15 14:38:24 -0400
committerJeffrey Walton <noloader@gmail.com>2017-05-15 14:38:24 -0400
commitf60f2126875125dd4a0b75e364f7aa11a2b98702 (patch)
tree1bc0fda22c0299eaecd04c9420ca8e8767089f44 /threefish.cpp
parentb3399b4f86918efee66e0831cc88da542c71aa10 (diff)
downloadcryptopp-git-f60f2126875125dd4a0b75e364f7aa11a2b98702.tar.gz
Remove Tweak handling.
We are arriving at incorrect result for G2 after the first Key Injection, and its not readily apparent why.
Diffstat (limited to 'threefish.cpp')
-rw-r--r--threefish.cpp12
1 files changed, 1 insertions, 11 deletions
diff --git a/threefish.cpp b/threefish.cpp
index 8ec51762..66bef801 100644
--- a/threefish.cpp
+++ b/threefish.cpp
@@ -272,17 +272,7 @@ void Threefish::Base::UncheckedSetKey(const byte *key, unsigned int keylen, cons
}
m_tweak.New(3);
- ConstByteArrayParameter t;
- 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);
- }
+ ::memset(m_tweak.begin(), 0x00, 24);
}
void Threefish::Base::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const