diff --git a/Chaos/Cipher/Des/DesCrypt.hpp b/Chaos/Cipher/Des/DesCrypt.hpp index 67e7f3d..247993b 100644 --- a/Chaos/Cipher/Des/DesCrypt.hpp +++ b/Chaos/Cipher/Des/DesCrypt.hpp @@ -88,7 +88,7 @@ struct Bitwise } }; -using RawKeyArray = Service::SeArray; +using RawKey = Service::SeArray; class KeySchedule { @@ -98,9 +98,9 @@ public: using RoundKey48 = uint64_t; - KeySchedule(const RawKeyArray & rawKeyArray) + KeySchedule(const RawKey & rawKey) { - Key56 key56 = Pc1(Bitwise::PackUInt64(rawKeyArray.Begin(), rawKeyArray.End())); + Key56 key56 = Pc1(Bitwise::PackUInt64(rawKey.Begin(), rawKey.End())); auto [c28, d28] = Bitwise::Split<28>(key56); @@ -204,7 +204,7 @@ public: } private: - Inner_::RawKeyArray Key_; + Inner_::RawKey Key_; }; template diff --git a/ChaosTests/Cipher/DesCryptTests.cpp b/ChaosTests/Cipher/DesCryptTests.cpp index 6dbabff..73828ec 100644 --- a/ChaosTests/Cipher/DesCryptTests.cpp +++ b/ChaosTests/Cipher/DesCryptTests.cpp @@ -6,7 +6,7 @@ using namespace Chaos::Cipher::Des; TEST(DesCryptTests, KeyScheduleTest) { - Inner_::RawKeyArray key; + Inner_::RawKey key; key[0] = 0b00010011; key[1] = 0b00110100;