hashlag/chaos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: hashlag:d194fef1afe9cd34baa124e21037ffcbdae92c01
Branches Tags
hashlag:main hashlag:pad
..
compare: hashlag:9734f9a5171fb73598e0e1b8c57b3df5c9fbb110
Branches Tags
hashlag:pad hashlag:main

4 Commits
d194fef1af ... 9734f9a517

Author SHA1 Message Date
hashlag
9734f9a517 Merge branch 'block-exp-bounds' into explicit-bounds
All checks were successful
Chaos Ci / test-and-benchmark (push) Successful in 1m49s
Details 
Implement explicit bounds requirements for block ciphers.
 2026-02-02 01:51:58 +03:00
hashlag
3de69d3298 Fix assertion style. 
It should be expectation-first...
 2026-02-02 01:15:38 +03:00
hashlag
a0f17ea127 Decryptor: Require end of the output span to be indicated explicitly. 
Usage becomes much less error-prone.
 2026-02-02 01:10:22 +03:00
hashlag
67709e5361 Encryptor: Require end of the output span to be indicated explicitly. 
Usage becomes much less error-prone.
 2026-02-02 00:52:08 +03:00
4 changed files with 52 additions and 94 deletions
Expand all files Collapse all files

5
Chaos/Cipher/Block/Decryptor.hpp
View File

@@ -9,9 +9,10 @@ class Decryptor
{
public:
template<typename OutputIt, typename InputIt>
void DecryptBlock(OutputIt out, InputIt inBegin, InputIt inEnd) const
void DecryptBlock(OutputIt outBegin, OutputIt outEnd,
InputIt inBegin, InputIt inEnd) const
{
Impl().DecryptBlock(out, inBegin, inEnd);
Impl().DecryptBlock(outBegin, outEnd, inBegin, inEnd);
}
template<typename Block>

20
Chaos/Cipher/Block/Des/DesCrypt.hpp
View File

@@ -90,6 +90,16 @@ struct Bitwise
*out++ = (value >> (56 - (i * 8))) & Mask<8>();
}
}
template<typename OutputIt>
static void CrunchUInt64(OutputIt outBegin, OutputIt outEnd, uint64_t value)
{
int_fast8_t i = 0;
for (OutputIt out = outBegin; i < 8 && out != outEnd; ++i, ++out)
{
*out = (value >> (56 - (i * 8))) & Mask<8>();
}
}
};
using RawKey = Service::SeArray<uint8_t, 8>;
@@ -237,7 +247,8 @@ public:
{ }
template<typename OutputIt, typename InputIt>
void EncryptBlock(OutputIt out, InputIt inBegin, InputIt inEnd) const
void EncryptBlock(OutputIt outBegin, OutputIt outEnd,
InputIt inBegin, InputIt inEnd) const
{
RawBlockArray block;
@@ -252,7 +263,7 @@ public:
block.End()),
Schedule_);
Inner_::Bitwise::CrunchUInt64(out, encrypted);
Inner_::Bitwise::CrunchUInt64(outBegin, outEnd, encrypted);
}
Block EncryptBlock(Block block) const
@@ -279,7 +290,8 @@ public:
{ }
template<typename OutputIt, typename InputIt>
void DecryptBlock(OutputIt out, InputIt inBegin, InputIt inEnd) const
void DecryptBlock(OutputIt outBegin, OutputIt outEnd,
InputIt inBegin, InputIt inEnd) const
{
RawBlockArray block;
@@ -294,7 +306,7 @@ public:
block.End()),
Schedule_);
Inner_::Bitwise::CrunchUInt64(out, decrypted);
Inner_::Bitwise::CrunchUInt64(outBegin, outEnd, decrypted);
}
Block DecryptBlock(Block block) const

5
Chaos/Cipher/Block/Encryptor.hpp
View File

@@ -9,9 +9,10 @@ class Encryptor
{
public:
template<typename OutputIt, typename InputIt>
void EncryptBlock(OutputIt out, InputIt inBegin, InputIt inEnd) const
void EncryptBlock(OutputIt outBegin, OutputIt outEnd,
InputIt inBegin, InputIt inEnd) const
{
Impl().EncryptBlock(out, inBegin, inEnd);
Impl().EncryptBlock(outBegin, outEnd, inBegin, inEnd);
}
template<typename Block>

116
ChaosTests/Cipher/DesCryptTests.cpp
View File

@@ -51,7 +51,7 @@ TEST(DesCryptTests, EncryptTest)
DesCrypt::Key desKey(key.begin(), key.end());
DesCrypt::DesEncryptor enc(desKey);
enc.EncryptBlock(result.begin(), data.begin(), data.end());
enc.EncryptBlock(result.begin(), result.end(), data.begin(), data.end());
return result;
}
@@ -143,7 +143,7 @@ TEST(DesCryptTests, EncryptShortDataTest)
DesCrypt::Key desKey(key.begin(), key.end());
DesCrypt::DesEncryptor enc(desKey);
enc.EncryptBlock(result.begin(), data.begin(), data.end());
enc.EncryptBlock(result.begin(), result.end(), data.begin(), data.end());
return result;
}
@@ -177,7 +177,7 @@ TEST(DesCryptTests, EncryptLongDataTest)
DesCrypt::Key desKey(key.begin(), key.end());
DesCrypt::DesEncryptor enc(desKey);
enc.EncryptBlock(result.begin(), data.begin(), data.end());
enc.EncryptBlock(result.begin(), result.end(), data.begin(), data.end());
return result;
}
@@ -211,7 +211,7 @@ TEST(DesCryptTests, DecryptTest)
DesCrypt::Key desKey(key.begin(), key.end());
DesCrypt::DesDecryptor dec(desKey);
dec.DecryptBlock(result.begin(), data.begin(), data.end());
dec.DecryptBlock(result.begin(), result.end(), data.begin(), data.end());
return result;
}
@@ -303,7 +303,7 @@ TEST(DesCryptTests, DecryptShortDataTest)
DesCrypt::Key desKey(key.begin(), key.end());
DesCrypt::DesDecryptor dec(desKey);
dec.DecryptBlock(result.begin(), data.begin(), data.end());
dec.DecryptBlock(result.begin(), result.end(), data.begin(), data.end());
return result;
}
@@ -337,7 +337,7 @@ TEST(DesCryptTests, DecryptLongDataTest)
DesCrypt::Key desKey(key.begin(), key.end());
DesCrypt::DesDecryptor dec(desKey);
dec.DecryptBlock(result.begin(), data.begin(), data.end());
dec.DecryptBlock(result.begin(), result.end(), data.begin(), data.end());
return result;
}
@@ -377,123 +377,67 @@ TEST(DesCryptTests, LongKeyTest)
TEST(DesCryptTests, OutIteratorUsageEncryptTest)
{
struct OutputItMock
{
OutputItMock(size_t & asteriskCalls, size_t & incrementCalls)
: AsteriskCalls_(asteriskCalls)
, IncrementCalls_(incrementCalls)
{ }
uint8_t & operator*()
{
++AsteriskCalls_;
static uint8_t dummy = 0;
return dummy;
}
OutputItMock operator++(int)
{
++IncrementCalls_;
return *this;
}
size_t & AsteriskCalls_;
size_t & IncrementCalls_;
};
{
std::array<uint8_t, DesCrypt::BlockSize> data = { 0xe5, 0x1a, 0x9f, 0xd4, 0x19, 0xa7, 0x93, 0x44 };
std::array<uint8_t, 8> key = { 0xda, 0xec, 0x68, 0xae, 0x83, 0xe0, 0x1e, 0xab };
size_t asteriskCalls = 0;
size_t incrementCalls = 0;
OutputItMock it(asteriskCalls, incrementCalls);
std::array<uint8_t, 8> fact = {};
// Last 3 bytes should be untouched.
std::array<uint8_t, 8> expected = { 0x42, 0x27, 0x88, 0xa6, 0x7b, 0x00, 0x00, 0x00 };
DesCrypt::Key desKey(key.begin(), key.end());
DesCrypt::DesEncryptor enc(desKey);
enc.EncryptBlock(it, data.begin(), data.end());
enc.EncryptBlock(fact.begin(), fact.end() - 3, data.begin(), data.end());
ASSERT_EQ(8, asteriskCalls);
ASSERT_EQ(8, incrementCalls);
ASSERT_EQ(expected, fact);
}
{
std::array<uint8_t, 11> data = { 0xe5, 0x1a, 0x9f, 0xd4, 0x19, 0x9f, 0x9f, 0x9f, 0x9f, 0x9f, 0x9f };
std::array<uint8_t, DesCrypt::BlockSize + 2> data = { 0xe5, 0x1a, 0x9f, 0xd4, 0x19, 0xa7, 0x93, 0x44, 0x44, 0x44 };
std::array<uint8_t, 8> key = { 0xda, 0xec, 0x68, 0xae, 0x83, 0xe0, 0x1e, 0xab };
size_t asteriskCalls = 0;
size_t incrementCalls = 0;
OutputItMock it(asteriskCalls, incrementCalls);
std::array<uint8_t, 8> fact = {};
// Last 4 bytes should be untouched.
std::array<uint8_t, 8> expected = { 0x42, 0x27, 0x88, 0xa6, 0x00, 0x00, 0x00, 0x00 };
DesCrypt::Key desKey(key.begin(), key.end());
DesCrypt::DesEncryptor enc(desKey);
enc.EncryptBlock(it, data.begin(), data.end());
enc.EncryptBlock(fact.begin(), fact.end() - 4, data.begin(), data.end());
ASSERT_EQ(8, asteriskCalls);
ASSERT_EQ(8, incrementCalls);
ASSERT_EQ(expected, fact);
}
}
TEST(DesCryptTests, OutIteratorUsageDecryptTest)
{
struct OutputItMock
{
OutputItMock(size_t & asteriskCalls, size_t & incrementCalls)
: AsteriskCalls_(asteriskCalls)
, IncrementCalls_(incrementCalls)
{ }
uint8_t & operator*()
{
++AsteriskCalls_;
static uint8_t dummy = 0;
return dummy;
}
OutputItMock operator++(int)
{
++IncrementCalls_;
return *this;
}
size_t & AsteriskCalls_;
size_t & IncrementCalls_;
};
{
std::array<uint8_t, DesCrypt::BlockSize> data = { 0xe5, 0x1a, 0x9f, 0xd4, 0x19, 0xa7, 0x93, 0x44 };
std::array<uint8_t, 8> key = { 0xda, 0xec, 0x68, 0xae, 0x83, 0xe0, 0x1e, 0xab };
size_t asteriskCalls = 0;
size_t incrementCalls = 0;
OutputItMock it(asteriskCalls, incrementCalls);
std::array<uint8_t, 8> fact = {};
// Last 3 bytes should be untouched.
std::array<uint8_t, 8> expected = { 0x45, 0x69, 0x71, 0x17, 0x13, 0x00, 0x00, 0x00 };
DesCrypt::Key desKey(key.begin(), key.end());
DesCrypt::DesDecryptor dec(desKey);
dec.DecryptBlock(it, data.begin(), data.end());
dec.DecryptBlock(fact.begin(), fact.end() - 3, data.begin(), data.end());
ASSERT_EQ(8, asteriskCalls);
ASSERT_EQ(8, incrementCalls);
ASSERT_EQ(expected, fact);
}
{
std::array<uint8_t, 11> data = { 0xe5, 0x1a, 0x9f, 0xd4, 0x19, 0x9f, 0x9f, 0x9f, 0x9f, 0x9f, 0x9f };
std::array<uint8_t, DesCrypt::BlockSize + 2> data = { 0xe5, 0x1a, 0x9f, 0xd4, 0x19, 0xa7, 0x93, 0x44, 0x44, 0x44 };
std::array<uint8_t, 8> key = { 0xda, 0xec, 0x68, 0xae, 0x83, 0xe0, 0x1e, 0xab };
size_t asteriskCalls = 0;
size_t incrementCalls = 0;
OutputItMock it(asteriskCalls, incrementCalls);
std::array<uint8_t, 8> fact = {};
// Last 4 bytes should be untouched.
std::array<uint8_t, 8> expected = { 0x45, 0x69, 0x71, 0x17, 0x00, 0x00, 0x00, 0x00 };
DesCrypt::Key desKey(key.begin(), key.end());
DesCrypt::DesDecryptor dec(desKey);
dec.DecryptBlock(it, data.begin(), data.end());
dec.DecryptBlock(fact.begin(), fact.end() - 4, data.begin(), data.end());
ASSERT_EQ(8, asteriskCalls);
ASSERT_EQ(8, incrementCalls);
ASSERT_EQ(expected, fact);
}
}
@@ -504,7 +448,7 @@ static std::vector<uint8_t> EncryptThroughBase(const Encryptor<Impl> & enc,
std::vector<uint8_t> result;
result.resize(enc.GetBlockSize(), 0);
enc.EncryptBlock(result.begin(), begin, end);
enc.EncryptBlock(result.begin(), result.end(), begin, end);
return result;
}
@@ -547,7 +491,7 @@ static std::vector<uint8_t> DecryptThroughBase(const Decryptor<Impl> & dec,
std::vector<uint8_t> result;
result.resize(dec.GetBlockSize(), 0);
dec.DecryptBlock(result.begin(), begin, end);
dec.DecryptBlock(result.begin(), result.end(), begin, end);
return result;
}