Replace Decryptor CRTP base with a concept.

Chaos/Cipher/Block/Decryptor.hpp

@@ -1,44 +1,27 @@
 #ifndef CHAOS_CIPHER_BLOCK_DECRYPTOR_HPP
 #define CHAOS_CIPHER_BLOCK_DECRYPTOR_HPP
 
+#include <concepts>
+#include <cstdint>
+#include <type_traits>
+
 namespace Chaos::Cipher::Block
 {
 
 template<typename T>
-class Decryptor
+concept Decryptor = requires(T decryptor,
+                             typename T::Block block,
+                             uint8_t * outBegin, uint8_t * outEnd,
+                             uint8_t * inBegin, uint8_t * inEnd)
 {
-public:
+    typename T::Block;
-    template<typename OutputIt, typename InputIt>
+    typename T::Key;
-    void DecryptBlock(OutputIt outBegin, OutputIt outEnd,
+    requires std::constructible_from<T, typename T::Key>;
-                      InputIt inBegin, InputIt inEnd) const
+    requires std::unsigned_integral<std::remove_cvref_t<decltype(T::BlockSize)>>;
-    {
+    requires std::unsigned_integral<std::remove_cvref_t<decltype(T::KeySize)>>;
-        Impl().DecryptBlock(outBegin, outEnd, inBegin, inEnd);
+    decryptor.DecryptBlock(outBegin, outEnd, inBegin, inEnd);
-    }
+    { decryptor.DecryptBlock(block) } -> std::same_as<typename T::Block>;
-
+    { decryptor.GetBlockSize() } -> std::unsigned_integral;
-    template<typename Block>
-    auto DecryptBlock(Block block) const
-    {
-        return Impl().DecryptBlock(block);
-    }
-
-    auto GetBlockSize() const
-    {
-        return Impl().GetBlockSize();
-    }
-
-protected:
-    Decryptor() = default;
-
-private:
-    const T & Impl() const
-    {
-        return static_cast<const T &>(*this);
-    }
-
-    T & Impl()
-    {
-        return static_cast<T &>(*this);
-    }
 };
 
 } // namespace Chaos::Cipher::Block

Chaos/Cipher/Block/Des/DesCrypt.hpp

@@ -233,9 +233,10 @@ public:
         Inner_::RawKey Key_;
     };
 
-    class Encryptor : public Chaos::Cipher::Block::Encryptor<Encryptor>
+    class Encryptor
     {
     public:
+        using Block = DesCrypt::Block;
         using Key = DesCrypt::Key;
         static constexpr size_t BlockSize = DesCrypt::BlockSize;
         static constexpr size_t KeySize = DesCrypt::KeySize;
@@ -278,9 +279,12 @@ public:
         Inner_::KeySchedule Schedule_;
     };
 
-    class Decryptor : public Chaos::Cipher::Block::Decryptor<Decryptor>
+    static_assert(Chaos::Cipher::Block::Encryptor<Encryptor>);
+
+    class Decryptor
     {
     public:
+        using Block = DesCrypt::Block;
         using Key = DesCrypt::Key;
         static constexpr size_t BlockSize = DesCrypt::BlockSize;
         static constexpr size_t KeySize = DesCrypt::KeySize;
@@ -323,6 +327,8 @@ public:
         Inner_::KeySchedule Schedule_;
     };
 
+    static_assert(Chaos::Cipher::Block::Decryptor<Decryptor>);
+
 private:
     using BlockHalf = uint32_t;
     using RawBlockArray = Service::SeArray<uint8_t, 8>;

Chaos/Cipher/Block/Encryptor.hpp

@@ -1,44 +1,27 @@
 #ifndef CHAOS_CIPHER_BLOCK_ENCRYPTOR_HPP
 #define CHAOS_CIPHER_BLOCK_ENCRYPTOR_HPP
 
+#include <concepts>
+#include <cstdint>
+#include <type_traits>
+
 namespace Chaos::Cipher::Block
 {
 
 template<typename T>
-class Encryptor
+concept Encryptor = requires(T encryptor,
+                             typename T::Block block,
+                             uint8_t * outBegin, uint8_t * outEnd,
+                             uint8_t * inBegin, uint8_t * inEnd)
 {
-public:
+    typename T::Block;
-    template<typename OutputIt, typename InputIt>
+    typename T::Key;
-    void EncryptBlock(OutputIt outBegin, OutputIt outEnd,
+    requires std::constructible_from<T, typename T::Key>;
-                      InputIt inBegin, InputIt inEnd) const
+    requires std::unsigned_integral<std::remove_cvref_t<decltype(T::BlockSize)>>;
-    {
+    requires std::unsigned_integral<std::remove_cvref_t<decltype(T::KeySize)>>;
-        Impl().EncryptBlock(outBegin, outEnd, inBegin, inEnd);
+    encryptor.EncryptBlock(outBegin, outEnd, inBegin, inEnd);
-    }
+    { encryptor.EncryptBlock(block) } -> std::same_as<typename T::Block>;
-
+    { encryptor.GetBlockSize() } -> std::unsigned_integral;
-    template<typename Block>
-    auto EncryptBlock(Block block) const
-    {
-        return Impl().EncryptBlock(block);
-    }
-
-    auto GetBlockSize() const
-    {
-        return Impl().GetBlockSize();
-    }
-
-protected:
-    Encryptor() = default;
-
-private:
-    const T & Impl() const
-    {
-        return static_cast<const T &>(*this);
-    }
-
-    T & Impl()
-    {
-        return static_cast<T &>(*this);
-    }
 };
 
 } // namespace Chaos::Cipher::Block

Chaos/Hash/Hash.hpp

@@ -1,38 +1,17 @@
 #ifndef CHAOS_HASH_HASH_HPP
 #define CHAOS_HASH_HASH_HPP
 
+#include <concepts>
 #include <string>
 
 namespace Chaos::Hash
 {
 
 template<typename T>
-class Hash
+concept Hash = requires(T hash)
 {
-public:
+    hash.GetRawDigest();
-    auto GetRawDigest() const
+    { hash.ToHexString() } -> std::same_as<std::string>;
-    {
-        return Impl().GetRawDigest();
-    }
-
-    std::string ToHexString() const
-    {
-        return Impl().ToHexString();
-    }
-
-protected:
-    Hash() = default;
-
-private:
-    const T & Impl() const
-    {
-        return static_cast<const T &>(*this);
-    }
-
-    T & Impl()
-    {
-        return static_cast<T &>(*this);
-    }
 };
 
 } // namespace Chaos::Hash

Chaos/Hash/Hasher.hpp

@@ -1,42 +1,19 @@
 #ifndef CHAOS_HASH_HASHER_HPP
 #define CHAOS_HASH_HASHER_HPP
 
+#include <cstdint>
+
+#include "Hash.hpp"
+
 namespace Chaos::Hash
 {
 
 template<typename T>
-class Hasher
+concept Hasher = requires(T hasher, uint8_t * begin, uint8_t * end)
 {
-public:
+    hasher.Reset();
-    void Reset()
+    hasher.Update(begin, end);
-    {
+    { hasher.Finish() } -> Hash;
-        Impl().Reset();
-    }
-
-    template<typename InputIt>
-    void Update(InputIt begin, InputIt end)
-    {
-        Impl().Update(begin, end);
-    }
-
-    auto Finish()
-    {
-        return Impl().Finish();
-    }
-
-protected:
-    Hasher() = default;
-
-private:
-    const T & Impl() const
-    {
-        return static_cast<const T &>(*this);
-    }
-
-    T & Impl()
-    {
-        return static_cast<T &>(*this);
-    }
 };
 
 } // namespace Chaos::Hash

Chaos/Hash/Md4.hpp

@@ -136,7 +136,7 @@ private:
 namespace Chaos::Hash::Md4
 {
 
-struct Md4Hash : public Hash<Md4Hash>
+struct Md4Hash
 {
     std::array<uint8_t, 16> GetRawDigest() const
     {
@@ -161,7 +161,9 @@ struct Md4Hash : public Hash<Md4Hash>
     std::array<uint8_t, 16> RawDigest_;
 };
 
-class Md4Hasher : public Hasher<Md4Hasher>
+static_assert(Hash<Md4Hash>);
+
+class Md4Hasher
 {
 public:
     using HashType = Md4Hash;
@@ -302,6 +304,8 @@ private:
     }
 };
 
+static_assert(Hasher<Md4Hasher>);
+
 } // namespace Chaos::Hash::Md4
 
 #endif // CHAOS_HASH_MD4_HPP

Chaos/Hash/Md5.hpp

@@ -160,7 +160,7 @@ private:
 namespace Chaos::Hash::Md5
 {
 
-struct Md5Hash : public Hash<Md5Hash>
+struct Md5Hash
 {
     std::array<uint8_t, 16> GetRawDigest() const
     {
@@ -185,7 +185,9 @@ struct Md5Hash : public Hash<Md5Hash>
     std::array<uint8_t, 16> RawDigest_;
 };
 
-class Md5Hasher : public Hasher<Md5Hasher>
+static_assert(Hash<Md5Hash>);
+
+class Md5Hasher
 {
 public:
     using HashType = Md5Hash;
@@ -326,6 +328,8 @@ private:
     }
 };
 
+static_assert(Hasher<Md5Hasher>);
+
 } // namespace Chaos::Hash::Md5
 
 #endif // CHAOS_HASH_MD5_HPP

Chaos/Hash/Sha1.hpp

@@ -129,7 +129,7 @@ private:
 namespace Chaos::Hash::Sha1
 {
 
-struct Sha1Hash : public Hash<Sha1Hash>
+struct Sha1Hash
 {
     std::array<uint8_t, 20> GetRawDigest() const
     {
@@ -155,7 +155,9 @@ struct Sha1Hash : public Hash<Sha1Hash>
     std::array<uint8_t, 20> RawDigest_;
 };
 
-class Sha1Hasher : public Hasher<Sha1Hasher>
+static_assert(Hash<Sha1Hash>);
+
+class Sha1Hasher
 {
 public:
     using HashType = Sha1Hash;
@@ -296,6 +298,8 @@ private:
     }
 };
 
+static_assert(Hasher<Sha1Hasher>);
+
 } // namespace Chaos::Hash::Sha1
 
 #endif // CHAOS_HASH_SHA1_HPP

Chaos/Mac/Hmac.hpp

@@ -3,7 +3,6 @@
 
 #include <array>
 #include <cstdint>
-#include <type_traits>
 
 #include "Hash/Hasher.hpp"
 #include "Service/ChaosException.hpp"
@@ -11,8 +10,7 @@
 namespace Chaos::Mac::Hmac
 {
 
-template<typename HasherImpl,
+template<Hash::Hasher HasherImpl>
-         typename = std::enable_if_t<std::is_base_of_v<Hash::Hasher<HasherImpl>, HasherImpl>>>
 class Hmac
 {
 public:

Chaos/Padding/Padder.hpp

@@ -1,38 +1,16 @@
 #ifndef CHAOS_PADDING_PADDER_HPP
 #define CHAOS_PADDING_PADDER_HPP
 
+#include <cstdint>
+
 namespace Chaos::Padding
 {
 
 template<typename T>
-class Padder
+concept Padder = requires(uint8_t * begin, uint8_t * end)
 {
-public:
+    T::Pad(begin, end);
-    template<typename OutputIt>
+    { T::ComputeUnpad(begin, end) } noexcept;
-    void Pad(OutputIt begin, OutputIt end) const
-    {
-        Impl().Pad(begin, end);
-    }
-
-    template<typename InputIt>
-    auto ComputeUnpad(InputIt begin, InputIt end) const noexcept
-    {
-        return Impl().ComputeUnpad(begin, end);
-    }
-
-protected:
-    Padder() = default;
-
-private:
-    const T & Impl() const
-    {
-        return static_cast<const T &>(*this);
-    }
-
-    T & Impl()
-    {
-        return static_cast<T &>(*this);
-    }
 };
 
 } // namespace Chaos::Padding

Chaos/Padding/PadderIso7816.hpp

@@ -12,7 +12,7 @@
 namespace Chaos::Padding
 {
 
-class PadderIso7816 : public Padder<PadderIso7816>
+class PadderIso7816
 {
 public:
     template<typename OutputIt>
@@ -82,6 +82,8 @@ private:
     using Branchless = Service::Branchless;
 };
 
+static_assert(Padder<PadderIso7816>);
+
 } // namespace Chaos::Padding
 
 #endif // CHAOS_PADDING_PADDERISO7816_HPP

Chaos/Padding/PadderPkcs7.hpp

@@ -13,7 +13,7 @@
 namespace Chaos::Padding
 {
 
-class PadderPkcs7 : public Padder<PadderPkcs7>
+class PadderPkcs7
 {
 public:
     template<typename OutputIt>
@@ -75,6 +75,8 @@ private:
     using Branchless = Service::Branchless;
 };
 
+static_assert(Padder<PadderPkcs7>);
+
 } // namespace Chaos::Padding
 
 #endif // CHAOS_PADDING_PADDERPKCS7_HPP

Chaos/Service/SeArray.hpp

@@ -2,14 +2,13 @@
 #define CHAOS_SERVICE_SEARRAY_HPP
 
 #include <array>
-#include <type_traits>
+#include <concepts>
 #include <cstddef>
 
 namespace Chaos::Service
 {
 
-template<typename T, size_t S,
+template<std::integral T, size_t S>
-         typename = std::enable_if_t<std::is_integral_v<T>>>
 class SeArray
 {
 public:

ChaosTests/CMakeLists.txt

@@ -4,8 +4,8 @@ cmake_policy(SET CMP0135 NEW)
 
 FetchContent_Declare(
         googletest
-        URL https://git.hashlag.net/hashlag/chaos-deps/raw/branch/main/google_googletest/googletest-1.18.0.tar.gz
+        URL https://git.hashlag.net/hashlag/chaos-deps/raw/branch/main/google_googletest/googletest-1.17.0.tar.gz
-        URL_HASH SHA256=6e3191c1455468b3fc35a417fb565c1c5071aee1b7e7f85e30cf48a98d37d8b5
+        URL_HASH SHA256=65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c
 )
 
 set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)

ChaosTests/Cipher/Block/Des/DesCryptTests.cpp

@@ -486,9 +486,9 @@ TEST(DesCryptTests, OutIteratorUsageDecryptTest)
     }
 }
 
-template<typename Impl, typename InputIt>
+template<Encryptor EncryptorImpl, typename InputIt>
-static std::vector<uint8_t> EncryptThroughBase(const Encryptor<Impl> & enc,
+static std::vector<uint8_t> EncryptGeneric(const EncryptorImpl & enc,
-                                               InputIt begin, InputIt end)
+                                           InputIt begin, InputIt end)
 {
     std::vector<uint8_t> result;
     result.resize(enc.GetBlockSize(), 0);
@@ -497,7 +497,7 @@ static std::vector<uint8_t> EncryptThroughBase(const Encryptor<Impl> & enc,
     return result;
 }
 
-TEST(DesCryptTests, EncryptThroughBaseTest)
+TEST(DesCryptTests, EncryptGenericTest)
 {
     std::array<uint8_t, DesCrypt::KeySize> key = { 0x13, 0x34, 0x57, 0x79, 0x9b, 0xbc, 0xdf, 0xf1 };
 
@@ -507,16 +507,16 @@ TEST(DesCryptTests, EncryptThroughBaseTest)
     DesCrypt::Key desKey(key.begin(), key.end());
     DesCrypt::Encryptor enc(desKey);
 
-    ASSERT_EQ(expected, EncryptThroughBase(enc, data.begin(), data.end()));
+    ASSERT_EQ(expected, EncryptGeneric(enc, data.begin(), data.end()));
 }
 
-template<typename Impl>
+template<Encryptor EncryptorImpl>
-static uint64_t EncryptUInt64BlockThroughBase(const Encryptor<Impl> & enc, uint64_t block)
+static uint64_t EncryptUInt64BlockGeneric(const EncryptorImpl & enc, uint64_t block)
 {
     return enc.EncryptBlock(block);
 }
 
-TEST(DesCryptTests, EncryptUInt64BlockThroughBaseTest)
+TEST(DesCryptTests, EncryptUInt64BlockGenericTest)
 {
     std::array<uint8_t, DesCrypt::KeySize> key = { 0x13, 0x34, 0x57, 0x79, 0x9b, 0xbc, 0xdf, 0xf1 };
 
@@ -526,12 +526,12 @@ TEST(DesCryptTests, EncryptUInt64BlockThroughBaseTest)
     DesCrypt::Key desKey(key.begin(), key.end());
     DesCrypt::Encryptor enc(desKey);
 
-    ASSERT_EQ(expected, EncryptUInt64BlockThroughBase(enc, data));
+    ASSERT_EQ(expected, EncryptUInt64BlockGeneric(enc, data));
 }
 
-template<typename Impl, typename InputIt>
+template<Decryptor DecryptorImpl, typename InputIt>
-static std::vector<uint8_t> DecryptThroughBase(const Decryptor<Impl> & dec,
+static std::vector<uint8_t> DecryptGeneric(const DecryptorImpl & dec,
-                                               InputIt begin, InputIt end)
+                                           InputIt begin, InputIt end)
 {
     std::vector<uint8_t> result;
     result.resize(dec.GetBlockSize(), 0);
@@ -540,7 +540,7 @@ static std::vector<uint8_t> DecryptThroughBase(const Decryptor<Impl> & dec,
     return result;
 }
 
-TEST(DesCryptTests, DecryptThroughBaseTest)
+TEST(DesCryptTests, DecryptGenericTest)
 {
     std::array<uint8_t, DesCrypt::KeySize> key = { 0x13, 0x34, 0x57, 0x79, 0x9b, 0xbc, 0xdf, 0xf1 };
 
@@ -550,16 +550,16 @@ TEST(DesCryptTests, DecryptThroughBaseTest)
     DesCrypt::Key desKey(key.begin(), key.end());
     DesCrypt::Decryptor dec(desKey);
 
-    ASSERT_EQ(expected, DecryptThroughBase(dec, data.begin(), data.end()));
+    ASSERT_EQ(expected, DecryptGeneric(dec, data.begin(), data.end()));
 }
 
-template<typename Impl>
+template<Decryptor DecryptorImpl>
-static uint64_t DecryptUInt64BlockThroughBase(const Decryptor<Impl> & dec, uint64_t block)
+static uint64_t DecryptUInt64BlockGeneric(const DecryptorImpl & dec, uint64_t block)
 {
     return dec.DecryptBlock(block);
 }
 
-TEST(DesCryptTests, DecryptUInt64BlockThroughBaseTest)
+TEST(DesCryptTests, DecryptUInt64BlockGenericTest)
 {
     std::array<uint8_t, DesCrypt::KeySize> key = { 0x13, 0x34, 0x57, 0x79, 0x9b, 0xbc, 0xdf, 0xf1 };
 
@@ -569,5 +569,5 @@ TEST(DesCryptTests, DecryptUInt64BlockThroughBaseTest)
     DesCrypt::Key desKey(key.begin(), key.end());
     DesCrypt::Decryptor dec(desKey);
 
-    ASSERT_EQ(expected, DecryptUInt64BlockThroughBase(dec, data));
+    ASSERT_EQ(expected, DecryptUInt64BlockGeneric(dec, data));
 }

ChaosTests/Padding/PadderIso7816Tests.cpp

@@ -109,8 +109,8 @@ TEST(PadIso7816Tests, PadOutIteratorUsageTest)
     }
 }
 
-template<typename Impl, typename OutputIt>
+template<Padder PadderImpl, typename OutputIt>
-void PadThroughBase(const Padder<Impl> & padder, OutputIt begin, OutputIt end)
+void PadGeneric(const PadderImpl & padder, OutputIt begin, OutputIt end)
 {
     padder.Pad(begin, end);
 }
@@ -127,7 +127,7 @@ TEST(PadIso7816Tests, PadThroughBaseTest)
         };
 
         const PadderIso7816 padder;
-        PadThroughBase(padder, fact.begin(), fact.end());
+        PadGeneric(padder, fact.begin(), fact.end());
 
         ASSERT_EQ(expected, fact);
     }
@@ -324,8 +324,8 @@ TEST(PadIso7816Tests, UnpadErrorTest)
     }
 }
 
-template<typename Impl, typename OutputIt>
+template<Padder PadderImpl, typename OutputIt>
-auto ComputeUnpadThroughBase(const Padder<Impl> & padder, OutputIt begin, OutputIt end)
+auto ComputeUnpadGeneric(const PadderImpl & padder, OutputIt begin, OutputIt end)
 {
     return padder.ComputeUnpad(begin, end);
 }
@@ -336,7 +336,7 @@ TEST(PadIso7816Tests, ComputeUnpadThroughBaseTest)
         std::array<uint8_t, 5> data = { 0x80, 0x00, 0x00, 0x00, 0x00 };
 
         const PadderIso7816 padder;
-        auto result = ComputeUnpadThroughBase(padder, data.begin(), data.end());
+        auto result = ComputeUnpadGeneric(padder, data.begin(), data.end());
 
         ASSERT_TRUE(result.IsOkay_);
         ASSERT_EQ(5, result.PadSize_);

ChaosTests/Padding/PadderPkcs7Tests.cpp

@@ -137,8 +137,8 @@ TEST(PadPkcs7Tests, PadOutIteratorUsageTest)
     }
 }
 
-template<typename Impl, typename OutputIt>
+template<Padder PadderImpl, typename OutputIt>
-void PadThroughBase(const Padder<Impl> & padder, OutputIt begin, OutputIt end)
+void PadGeneric(const PadderImpl & padder, OutputIt begin, OutputIt end)
 {
     padder.Pad(begin, end);
 }
@@ -153,7 +153,7 @@ TEST(PadPkcs7Tests, PadThroughBaseTest)
         };
 
         const PadderPkcs7 padder;
-        PadThroughBase(padder, fact.begin(), fact.end());
+        PadGeneric(padder, fact.begin(), fact.end());
 
         ASSERT_EQ(expected, fact);
     }
@@ -347,8 +347,8 @@ TEST(PadPkcs7Tests, UnpadErrorTest)
     }
 }
 
-template<typename Impl, typename OutputIt>
+template<Padder PadderImpl, typename OutputIt>
-auto ComputeUnpadThroughBase(const Padder<Impl> & padder, OutputIt begin, OutputIt end)
+auto ComputeUnpadGeneric(const PadderImpl & padder, OutputIt begin, OutputIt end)
 {
     return padder.ComputeUnpad(begin, end);
 }
@@ -359,7 +359,7 @@ TEST(PadPkcs7Tests, ComputeUnpadThroughBaseTest)
         std::array<uint8_t, 5> data = { 0x05, 0x05, 0x05, 0x05, 0x05 };
 
         const PadderPkcs7 padder;
-        auto result = ComputeUnpadThroughBase(padder, data.begin(), data.end());
+        auto result = ComputeUnpadGeneric(padder, data.begin(), data.end());
 
         ASSERT_TRUE(result.IsOkay_);
         ASSERT_EQ(5, result.PadSize_);