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

Rename DesCrypt::Encryptor --> DesEncryptor, DesCrypt::Decryptor --> DesDecryptor.
All checks were successful
Chaos Ci / test-and-benchmark (push) Successful in 1m46s
Details

Browse Source 
Maintain naming consistency with Hash subproject.
This commit is contained in:
hashlag
2026-01-31 17:18:25 +03:00
parent b5d1f9a6fc
commit 9a3b6edfc3
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Chaos/Cipher/Des/DesCrypt.hpp
View File

@@ -221,10 +221,10 @@ public:
Inner_::RawKey Key_; Inner_::RawKey Key_;
}; };
class Encryptor class DesEncryptor
{ {
public: public:
Encryptor(const Key & key) DesEncryptor(const Key & key)
: Schedule_(Inner_::KeySchedule::Direction::Encrypt, key.Key_) : Schedule_(Inner_::KeySchedule::Direction::Encrypt, key.Key_)
{ } { }
@@ -256,10 +256,10 @@ public:
Inner_::KeySchedule Schedule_; Inner_::KeySchedule Schedule_;
}; };
class Decryptor class DesDecryptor
{ {
public: public:
Decryptor(const Key & key) DesDecryptor(const Key & key)
: Schedule_(Inner_::KeySchedule::Direction::Decrypt, key.Key_) : Schedule_(Inner_::KeySchedule::Direction::Decrypt, key.Key_)
{ } { }

24
ChaosTests/Cipher/DesCryptTests.cpp
View File

@@ -48,7 +48,7 @@ TEST(DesCryptTests, EncryptTest)
result.fill(0); result.fill(0);
DesCrypt::Key desKey(key.begin(), key.end()); DesCrypt::Key desKey(key.begin(), key.end());
DesCrypt::Encryptor enc(desKey); DesCrypt::DesEncryptor enc(desKey);
enc.EncryptBlock(result.begin(), data.begin(), data.end()); enc.EncryptBlock(result.begin(), data.begin(), data.end());
return result; return result;
@@ -93,7 +93,7 @@ TEST(DesCryptTests, EncryptUInt64BlockTest)
const std::array<uint8_t, 8> & key) const const std::array<uint8_t, 8> & key) const
{ {
DesCrypt::Key desKey(key.begin(), key.end()); DesCrypt::Key desKey(key.begin(), key.end());
DesCrypt::Encryptor enc(desKey); DesCrypt::DesEncryptor enc(desKey);
return enc.EncryptBlock(data); return enc.EncryptBlock(data);
} }
@@ -140,7 +140,7 @@ TEST(DesCryptTests, EncryptShortDataTest)
result.resize(8, 0); result.resize(8, 0);
DesCrypt::Key desKey(key.begin(), key.end()); DesCrypt::Key desKey(key.begin(), key.end());
DesCrypt::Encryptor enc(desKey); DesCrypt::DesEncryptor enc(desKey);
enc.EncryptBlock(result.begin(), data.begin(), data.end()); enc.EncryptBlock(result.begin(), data.begin(), data.end());
return result; return result;
@@ -174,7 +174,7 @@ TEST(DesCryptTests, EncryptLongDataTest)
result.resize(8, 0); result.resize(8, 0);
DesCrypt::Key desKey(key.begin(), key.end()); DesCrypt::Key desKey(key.begin(), key.end());
DesCrypt::Encryptor enc(desKey); DesCrypt::DesEncryptor enc(desKey);
enc.EncryptBlock(result.begin(), data.begin(), data.end()); enc.EncryptBlock(result.begin(), data.begin(), data.end());
return result; return result;
@@ -208,7 +208,7 @@ TEST(DesCryptTests, DecryptTest)
result.fill(0); result.fill(0);
DesCrypt::Key desKey(key.begin(), key.end()); DesCrypt::Key desKey(key.begin(), key.end());
DesCrypt::Decryptor dec(desKey); DesCrypt::DesDecryptor dec(desKey);
dec.DecryptBlock(result.begin(), data.begin(), data.end()); dec.DecryptBlock(result.begin(), data.begin(), data.end());
return result; return result;
@@ -253,7 +253,7 @@ TEST(DesCryptTests, DecryptUInt64BlockTest)
const std::array<uint8_t, 8> & key) const const std::array<uint8_t, 8> & key) const
{ {
DesCrypt::Key desKey(key.begin(), key.end()); DesCrypt::Key desKey(key.begin(), key.end());
DesCrypt::Decryptor dec(desKey); DesCrypt::DesDecryptor dec(desKey);
return dec.DecryptBlock(data); return dec.DecryptBlock(data);
} }
@@ -300,7 +300,7 @@ TEST(DesCryptTests, DecryptShortDataTest)
result.resize(8, 0); result.resize(8, 0);
DesCrypt::Key desKey(key.begin(), key.end()); DesCrypt::Key desKey(key.begin(), key.end());
DesCrypt::Decryptor dec(desKey); DesCrypt::DesDecryptor dec(desKey);
dec.DecryptBlock(result.begin(), data.begin(), data.end()); dec.DecryptBlock(result.begin(), data.begin(), data.end());
return result; return result;
@@ -334,7 +334,7 @@ TEST(DesCryptTests, DecryptLongDataTest)
result.resize(8, 0); result.resize(8, 0);
DesCrypt::Key desKey(key.begin(), key.end()); DesCrypt::Key desKey(key.begin(), key.end());
DesCrypt::Decryptor dec(desKey); DesCrypt::DesDecryptor dec(desKey);
dec.DecryptBlock(result.begin(), data.begin(), data.end()); dec.DecryptBlock(result.begin(), data.begin(), data.end());
return result; return result;
@@ -410,7 +410,7 @@ TEST(DesCryptTests, OutIteratorUsageEncryptTest)
OutputItMock it(asteriskCalls, incrementCalls); OutputItMock it(asteriskCalls, incrementCalls);
DesCrypt::Key desKey(key.begin(), key.end()); DesCrypt::Key desKey(key.begin(), key.end());
DesCrypt::Encryptor enc(desKey); DesCrypt::DesEncryptor enc(desKey);
enc.EncryptBlock(it, data.begin(), data.end()); enc.EncryptBlock(it, data.begin(), data.end());
ASSERT_EQ(8, asteriskCalls); ASSERT_EQ(8, asteriskCalls);
@@ -426,7 +426,7 @@ TEST(DesCryptTests, OutIteratorUsageEncryptTest)
OutputItMock it(asteriskCalls, incrementCalls); OutputItMock it(asteriskCalls, incrementCalls);
DesCrypt::Key desKey(key.begin(), key.end()); DesCrypt::Key desKey(key.begin(), key.end());
DesCrypt::Encryptor enc(desKey); DesCrypt::DesEncryptor enc(desKey);
enc.EncryptBlock(it, data.begin(), data.end()); enc.EncryptBlock(it, data.begin(), data.end());
ASSERT_EQ(8, asteriskCalls); ASSERT_EQ(8, asteriskCalls);
@@ -471,7 +471,7 @@ TEST(DesCryptTests, OutIteratorUsageDecryptTest)
OutputItMock it(asteriskCalls, incrementCalls); OutputItMock it(asteriskCalls, incrementCalls);
DesCrypt::Key desKey(key.begin(), key.end()); DesCrypt::Key desKey(key.begin(), key.end());
DesCrypt::Decryptor dec(desKey); DesCrypt::DesDecryptor dec(desKey);
dec.DecryptBlock(it, data.begin(), data.end()); dec.DecryptBlock(it, data.begin(), data.end());
ASSERT_EQ(8, asteriskCalls); ASSERT_EQ(8, asteriskCalls);
@@ -487,7 +487,7 @@ TEST(DesCryptTests, OutIteratorUsageDecryptTest)
OutputItMock it(asteriskCalls, incrementCalls); OutputItMock it(asteriskCalls, incrementCalls);
DesCrypt::Key desKey(key.begin(), key.end()); DesCrypt::Key desKey(key.begin(), key.end());
DesCrypt::Decryptor dec(desKey); DesCrypt::DesDecryptor dec(desKey);
dec.DecryptBlock(it, data.begin(), data.end()); dec.DecryptBlock(it, data.begin(), data.end());
ASSERT_EQ(8, asteriskCalls); ASSERT_EQ(8, asteriskCalls);