Rename concept Decryptor --> BlockDecryptor.

Chaos/Cipher/Block/BlockCipher.hpp

@@ -6,7 +6,7 @@
 
 #include "BlockKey.hpp"
 #include "Encryptor.hpp"
-#include "Decryptor.hpp"
+#include "BlockDecryptor.hpp"
 
 namespace Chaos::Cipher::Block
 {
@@ -27,7 +27,7 @@ concept BlockCipher = requires
 
     requires BlockKey<typename T::Key>;
     requires Encryptor<typename T::Encryptor>;
-    requires Decryptor<typename T::Decryptor>;
+    requires BlockDecryptor<typename T::Decryptor>;
 };
 
 } // namespace Chaos::Cipher::Block

Chaos/Cipher/Block/BlockDecryptor.hpp

@@ -1,5 +1,5 @@
-#ifndef CHAOS_CIPHER_BLOCK_DECRYPTOR_HPP
-#define CHAOS_CIPHER_BLOCK_DECRYPTOR_HPP
+#ifndef CHAOS_CIPHER_BLOCK_BLOCKDECRYPTOR_HPP
+#define CHAOS_CIPHER_BLOCK_BLOCKDECRYPTOR_HPP
 
 #include <concepts>
 #include <cstdint>
@@ -9,7 +9,7 @@ namespace Chaos::Cipher::Block
 {
 
 template<typename T>
-concept Decryptor = requires(const T constDecryptor,
+concept BlockDecryptor = requires(const T constDecryptor,
                                   typename T::Block block,
                                   uint8_t * outBegin, uint8_t * outEnd,
                                   uint8_t * inBegin, uint8_t * inEnd)
@@ -31,4 +31,4 @@ concept Decryptor = requires(const T constDecryptor,
 
 } // namespace Chaos::Cipher::Block
 
-#endif // CHAOS_CIPHER_BLOCK_DECRYPTOR_HPP
+#endif // CHAOS_CIPHER_BLOCK_BLOCKDECRYPTOR_HPP

Chaos/Cipher/Block/Des/DesCrypt.hpp

@@ -12,7 +12,7 @@
 
 #include "Cipher/Block/BlockKey.hpp"
 #include "Cipher/Block/Encryptor.hpp"
-#include "Cipher/Block/Decryptor.hpp"
+#include "Cipher/Block/BlockDecryptor.hpp"
 #include "Cipher/Block/BlockCipher.hpp"
 
 namespace Chaos::Cipher::Block::Des::Inner_
@@ -331,7 +331,7 @@ public:
         Inner_::KeySchedule Schedule_;
     };
 
-    static_assert(Chaos::Cipher::Block::Decryptor<Decryptor>);
+    static_assert(Chaos::Cipher::Block::BlockDecryptor<Decryptor>);
 
 private:
     using BlockHalf = uint32_t;

ChaosTests/Cipher/Block/Des/DesCryptTests.cpp

@@ -7,7 +7,7 @@
 
 #include "Cipher/Block/Des/DesCrypt.hpp"
 #include "Cipher/Block/Encryptor.hpp"
-#include "Cipher/Block/Decryptor.hpp"
+#include "Cipher/Block/BlockDecryptor.hpp"
 #include "Service/ChaosException.hpp"
 
 using namespace Chaos::Cipher::Block::Des;
@@ -529,7 +529,7 @@ TEST(DesCryptTests, EncryptUInt64BlockGenericTest)
     ASSERT_EQ(expected, EncryptUInt64BlockGeneric(enc, data));
 }
 
-template<Decryptor DecryptorImpl, typename InputIt>
+template<BlockDecryptor DecryptorImpl, typename InputIt>
 static std::vector<uint8_t> DecryptGeneric(const DecryptorImpl & dec,
                                            InputIt begin, InputIt end)
 {
@@ -553,7 +553,7 @@ TEST(DesCryptTests, DecryptGenericTest)
     ASSERT_EQ(expected, DecryptGeneric(dec, data.begin(), data.end()));
 }
 
-template<Decryptor DecryptorImpl>
+template<BlockDecryptor DecryptorImpl>
 static uint64_t DecryptUInt64BlockGeneric(const DecryptorImpl & dec, uint64_t block)
 {
     return dec.DecryptBlock(block);