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

Encryptor: Require end of the output span to be indicated explicitly.

Browse Source 
Usage becomes much less error-prone.
This commit is contained in:
hashlag
2026-02-02 00:52:08 +03:00
parent d194fef1af
commit 67709e5361
3 changed files with 31 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
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

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>