From 5baede0a1d1698f20c094b1b650d23ced41a49d3 Mon Sep 17 00:00:00 2001 From: hashlag Date: Sun, 8 Feb 2026 23:31:24 +0300 Subject: [PATCH] Rename PadPkcs7 --> PadderPkcs7. --- .../Padding/{PadPkcs7.hpp => PadderPkcs7.hpp} | 8 +++---- ChaosTests/CMakeLists.txt | 2 +- ...PadPkcs7Tests.cpp => PadderPkcs7Tests.cpp} | 22 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) rename Chaos/Padding/{PadPkcs7.hpp => PadderPkcs7.hpp} (82%) rename ChaosTests/Padding/{PadPkcs7Tests.cpp => PadderPkcs7Tests.cpp} (76%) diff --git a/Chaos/Padding/PadPkcs7.hpp b/Chaos/Padding/PadderPkcs7.hpp similarity index 82% rename from Chaos/Padding/PadPkcs7.hpp rename to Chaos/Padding/PadderPkcs7.hpp index 4d8548d..e35d891 100644 --- a/Chaos/Padding/PadPkcs7.hpp +++ b/Chaos/Padding/PadderPkcs7.hpp @@ -1,5 +1,5 @@ -#ifndef CHAOS_PADDING_PADPKCS7_HPP -#define CHAOS_PADDING_PADPKCS7_HPP +#ifndef CHAOS_PADDING_PADDERPKCS7_HPP +#define CHAOS_PADDING_PADDERPKCS7_HPP #include #include @@ -10,7 +10,7 @@ namespace Chaos::Padding { -class PadPkcs7 +class PadderPkcs7 { public: template @@ -34,4 +34,4 @@ public: } // namespace Chaos::Padding -#endif // CHAOS_PADDING_PADPKCS7_HPP +#endif // CHAOS_PADDING_PADDERPKCS7_HPP diff --git a/ChaosTests/CMakeLists.txt b/ChaosTests/CMakeLists.txt index 3413aae..796ce51 100644 --- a/ChaosTests/CMakeLists.txt +++ b/ChaosTests/CMakeLists.txt @@ -18,7 +18,7 @@ set(ChaosTests_SOURCE Hash/Md4HasherTests.cpp Cipher/Arc4GenTests.cpp Cipher/Arc4CryptTests.cpp Cipher/DesCryptTests.cpp - Padding/PadPkcs7Tests.cpp + Padding/PadderPkcs7Tests.cpp Service/SeArrayTests.cpp Service/ChaosExceptionTests.cpp) diff --git a/ChaosTests/Padding/PadPkcs7Tests.cpp b/ChaosTests/Padding/PadderPkcs7Tests.cpp similarity index 76% rename from ChaosTests/Padding/PadPkcs7Tests.cpp rename to ChaosTests/Padding/PadderPkcs7Tests.cpp index b511460..bfbcdaf 100644 --- a/ChaosTests/Padding/PadPkcs7Tests.cpp +++ b/ChaosTests/Padding/PadderPkcs7Tests.cpp @@ -3,7 +3,7 @@ #include #include -#include "Padding/PadPkcs7.hpp" +#include "Padding/PadderPkcs7.hpp" #include "Service/ChaosException.hpp" using namespace Chaos::Padding; @@ -14,7 +14,7 @@ TEST(PadPkcs7Tests, PadTest) std::array fact = {}; std::array expected = { 0x01 }; - PadPkcs7::Pad(fact.begin(), fact.end()); + PadderPkcs7::Pad(fact.begin(), fact.end()); ASSERT_EQ(expected, fact); } @@ -26,7 +26,7 @@ TEST(PadPkcs7Tests, PadTest) 0x07, 0x07 }; - PadPkcs7::Pad(fact.begin(), fact.end()); + PadderPkcs7::Pad(fact.begin(), fact.end()); ASSERT_EQ(expected, fact); } @@ -38,7 +38,7 @@ TEST(PadPkcs7Tests, PadTest) 0x0a, 0x0a, 0x0a, 0x0a, 0x0a }; - PadPkcs7::Pad(fact.begin(), fact.end()); + PadderPkcs7::Pad(fact.begin(), fact.end()); ASSERT_EQ(expected, fact); } @@ -46,7 +46,7 @@ TEST(PadPkcs7Tests, PadTest) { std::vector fact(i, 0x00); - PadPkcs7::Pad(fact.begin(), fact.end()); + PadderPkcs7::Pad(fact.begin(), fact.end()); ASSERT_EQ(std::vector(i, i), fact); } } @@ -56,19 +56,19 @@ TEST(PadPkcs7Tests, PadInvalidRangeTest) { std::array out = {}; - ASSERT_THROW(PadPkcs7::Pad(out.begin(), out.end()), Chaos::Service::ChaosException); + ASSERT_THROW(PadderPkcs7::Pad(out.begin(), out.end()), Chaos::Service::ChaosException); } { std::array out = {}; - ASSERT_THROW(PadPkcs7::Pad(out.begin(), out.end()), Chaos::Service::ChaosException); + ASSERT_THROW(PadderPkcs7::Pad(out.begin(), out.end()), Chaos::Service::ChaosException); } { std::array out = {}; - ASSERT_THROW(PadPkcs7::Pad(out.end(), out.begin()), Chaos::Service::ChaosException); + ASSERT_THROW(PadderPkcs7::Pad(out.end(), out.begin()), Chaos::Service::ChaosException); } } @@ -84,7 +84,7 @@ TEST(PadPkcs7Tests, PadOutIteratorUsageTest) 0x00, 0x00, 0x00 }; - PadPkcs7::Pad(fact.begin() + 3, fact.end() - 3); + PadderPkcs7::Pad(fact.begin() + 3, fact.end() - 3); ASSERT_EQ(expected, fact); } @@ -99,7 +99,7 @@ TEST(PadPkcs7Tests, PadOutIteratorUsageTest) 0x00, 0x00, 0x00 }; - PadPkcs7::Pad(fact.begin() + 3, fact.end() - 3); + PadderPkcs7::Pad(fact.begin() + 3, fact.end() - 3); ASSERT_EQ(expected, fact); } @@ -115,7 +115,7 @@ TEST(PadPkcs7Tests, PadOutIteratorUsageTest) 0xbb, 0xbb, 0xbb, 0xbb, 0xbb }; - PadPkcs7::Pad(fact.begin() + 5, fact.begin() + 5); + PadderPkcs7::Pad(fact.begin() + 5, fact.begin() + 5); ASSERT_EQ(expected, fact); } }