From 6c5a12f33997e98dc1f6667a0d71508d2d951818 Mon Sep 17 00:00:00 2001 From: hashlag Date: Mon, 22 Jun 2026 02:02:44 +0300 Subject: [PATCH] Standartize block cipher's inner encryptor/decryptor class names. --- Chaos/Cipher/Block/Des/DesCrypt.hpp | 8 +++---- ChaosTests/Cipher/DesCryptTests.cpp | 36 ++++++++++++++--------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Chaos/Cipher/Block/Des/DesCrypt.hpp b/Chaos/Cipher/Block/Des/DesCrypt.hpp index f3457de..a9e50c5 100644 --- a/Chaos/Cipher/Block/Des/DesCrypt.hpp +++ b/Chaos/Cipher/Block/Des/DesCrypt.hpp @@ -230,14 +230,14 @@ public: Inner_::RawKey Key_; }; - class DesEncryptor : public Encryptor + class Encryptor : public Chaos::Cipher::Block::Encryptor { public: using Key = DesCrypt::Key; static constexpr size_t BlockSize = DesCrypt::BlockSize; static constexpr size_t KeySize = DesCrypt::KeySize; - DesEncryptor(const Key & key) + Encryptor(const Key & key) : Schedule_(Inner_::KeySchedule::Direction::Encrypt, key.Key_) { } @@ -275,14 +275,14 @@ public: Inner_::KeySchedule Schedule_; }; - class DesDecryptor : public Decryptor + class Decryptor : public Chaos::Cipher::Block::Decryptor { public: using Key = DesCrypt::Key; static constexpr size_t BlockSize = DesCrypt::BlockSize; static constexpr size_t KeySize = DesCrypt::KeySize; - DesDecryptor(const Key & key) + Decryptor(const Key & key) : Schedule_(Inner_::KeySchedule::Direction::Decrypt, key.Key_) { } diff --git a/ChaosTests/Cipher/DesCryptTests.cpp b/ChaosTests/Cipher/DesCryptTests.cpp index f29e0f0..9a06d00 100644 --- a/ChaosTests/Cipher/DesCryptTests.cpp +++ b/ChaosTests/Cipher/DesCryptTests.cpp @@ -49,7 +49,7 @@ TEST(DesCryptTests, EncryptTest) std::array result = {}; DesCrypt::Key desKey(key.begin(), key.end()); - DesCrypt::DesEncryptor enc(desKey); + DesCrypt::Encryptor enc(desKey); enc.EncryptBlock(result.begin(), result.end(), data.begin(), data.end()); return result; @@ -94,7 +94,7 @@ TEST(DesCryptTests, EncryptUInt64BlockTest) const std::array & key) const { DesCrypt::Key desKey(key.begin(), key.end()); - DesCrypt::DesEncryptor enc(desKey); + DesCrypt::Encryptor enc(desKey); return enc.EncryptBlock(data); } @@ -141,7 +141,7 @@ TEST(DesCryptTests, EncryptShortDataTest) result.resize(DesCrypt::BlockSize, 0); DesCrypt::Key desKey(key.begin(), key.end()); - DesCrypt::DesEncryptor enc(desKey); + DesCrypt::Encryptor enc(desKey); enc.EncryptBlock(result.begin(), result.end(), data.begin(), data.end()); return result; @@ -175,7 +175,7 @@ TEST(DesCryptTests, EncryptLongDataTest) result.resize(DesCrypt::BlockSize, 0); DesCrypt::Key desKey(key.begin(), key.end()); - DesCrypt::DesEncryptor enc(desKey); + DesCrypt::Encryptor enc(desKey); enc.EncryptBlock(result.begin(), result.end(), data.begin(), data.end()); return result; @@ -208,7 +208,7 @@ TEST(DesCryptTests, DecryptTest) std::array result = {}; DesCrypt::Key desKey(key.begin(), key.end()); - DesCrypt::DesDecryptor dec(desKey); + DesCrypt::Decryptor dec(desKey); dec.DecryptBlock(result.begin(), result.end(), data.begin(), data.end()); return result; @@ -253,7 +253,7 @@ TEST(DesCryptTests, DecryptUInt64BlockTest) const std::array & key) const { DesCrypt::Key desKey(key.begin(), key.end()); - DesCrypt::DesDecryptor dec(desKey); + DesCrypt::Decryptor dec(desKey); return dec.DecryptBlock(data); } @@ -300,7 +300,7 @@ TEST(DesCryptTests, DecryptShortDataTest) result.resize(DesCrypt::BlockSize, 0); DesCrypt::Key desKey(key.begin(), key.end()); - DesCrypt::DesDecryptor dec(desKey); + DesCrypt::Decryptor dec(desKey); dec.DecryptBlock(result.begin(), result.end(), data.begin(), data.end()); return result; @@ -334,7 +334,7 @@ TEST(DesCryptTests, DecryptLongDataTest) result.resize(DesCrypt::BlockSize, 0); DesCrypt::Key desKey(key.begin(), key.end()); - DesCrypt::DesDecryptor dec(desKey); + DesCrypt::Decryptor dec(desKey); dec.DecryptBlock(result.begin(), result.end(), data.begin(), data.end()); return result; @@ -384,7 +384,7 @@ TEST(DesCryptTests, OutIteratorUsageEncryptTest) std::array expected = { 0x00, 0x00, 0x00, 0x42, 0x27, 0x88, 0xa6, 0x7b, 0x00, 0x00, 0x00 }; DesCrypt::Key desKey(key.begin(), key.end()); - DesCrypt::DesEncryptor enc(desKey); + DesCrypt::Encryptor enc(desKey); enc.EncryptBlock(fact.begin() + 3, fact.end() - 3, data.begin(), data.end()); ASSERT_EQ(expected, fact); @@ -399,7 +399,7 @@ TEST(DesCryptTests, OutIteratorUsageEncryptTest) std::array expected = { 0x00, 0x00, 0x00, 0x00, 0x42, 0x27, 0x88, 0xa6, 0x00, 0x00, 0x00, 0x00 }; DesCrypt::Key desKey(key.begin(), key.end()); - DesCrypt::DesEncryptor enc(desKey); + DesCrypt::Encryptor enc(desKey); enc.EncryptBlock(fact.begin() + 4, fact.end() - 4, data.begin(), data.end()); ASSERT_EQ(expected, fact); @@ -413,7 +413,7 @@ TEST(DesCryptTests, OutIteratorUsageEncryptTest) std::array expected = {}; DesCrypt::Key desKey(key.begin(), key.end()); - DesCrypt::DesEncryptor enc(desKey); + DesCrypt::Encryptor enc(desKey); enc.EncryptBlock(fact.begin() + 3, fact.begin() + 3, data.begin(), data.end()); ASSERT_EQ(expected, fact); @@ -431,7 +431,7 @@ TEST(DesCryptTests, OutIteratorUsageDecryptTest) std::array expected = { 0x00, 0x00, 0x00, 0x45, 0x69, 0x71, 0x17, 0x13, 0x00, 0x00, 0x00 }; DesCrypt::Key desKey(key.begin(), key.end()); - DesCrypt::DesDecryptor dec(desKey); + DesCrypt::Decryptor dec(desKey); dec.DecryptBlock(fact.begin() + 3, fact.end() - 3, data.begin(), data.end()); ASSERT_EQ(expected, fact); @@ -446,7 +446,7 @@ TEST(DesCryptTests, OutIteratorUsageDecryptTest) std::array expected = { 0x00, 0x00, 0x00, 0x00, 0x45, 0x69, 0x71, 0x17, 0x00, 0x00, 0x00, 0x00 }; DesCrypt::Key desKey(key.begin(), key.end()); - DesCrypt::DesDecryptor dec(desKey); + DesCrypt::Decryptor dec(desKey); dec.DecryptBlock(fact.begin() + 4, fact.end() - 4, data.begin(), data.end()); ASSERT_EQ(expected, fact); @@ -460,7 +460,7 @@ TEST(DesCryptTests, OutIteratorUsageDecryptTest) std::array expected = {}; DesCrypt::Key desKey(key.begin(), key.end()); - DesCrypt::DesDecryptor dec(desKey); + DesCrypt::Decryptor dec(desKey); dec.DecryptBlock(fact.begin() + 3, fact.begin() + 3, data.begin(), data.end()); ASSERT_EQ(expected, fact); @@ -486,7 +486,7 @@ TEST(DesCryptTests, EncryptThroughBaseTest) std::vector expected = { 0x85, 0xe8, 0x13, 0x54, 0x0f, 0x0a, 0xb4, 0x05 }; DesCrypt::Key desKey(key.begin(), key.end()); - DesCrypt::DesEncryptor enc(desKey); + DesCrypt::Encryptor enc(desKey); ASSERT_EQ(expected, EncryptThroughBase(enc, data.begin(), data.end())); } @@ -505,7 +505,7 @@ TEST(DesCryptTests, EncryptUInt64BlockThroughBaseTest) uint64_t expected = 0x85e813540f0ab405; DesCrypt::Key desKey(key.begin(), key.end()); - DesCrypt::DesEncryptor enc(desKey); + DesCrypt::Encryptor enc(desKey); ASSERT_EQ(expected, EncryptUInt64BlockThroughBase(enc, data)); } @@ -529,7 +529,7 @@ TEST(DesCryptTests, DecryptThroughBaseTest) std::vector expected = { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef }; DesCrypt::Key desKey(key.begin(), key.end()); - DesCrypt::DesDecryptor dec(desKey); + DesCrypt::Decryptor dec(desKey); ASSERT_EQ(expected, DecryptThroughBase(dec, data.begin(), data.end())); } @@ -548,7 +548,7 @@ TEST(DesCryptTests, DecryptUInt64BlockThroughBaseTest) uint64_t expected = 0x0123456789abcdef; DesCrypt::Key desKey(key.begin(), key.end()); - DesCrypt::DesDecryptor dec(desKey); + DesCrypt::Decryptor dec(desKey); ASSERT_EQ(expected, DecryptUInt64BlockThroughBase(dec, data)); }