Replace Padder CRTP base with a concept.
Chaos Ci / test (push) Successful in 3m1s
Chaos Ci / benchmark (push) Successful in 1m51s

This commit is contained in:
hashlag
2026-09-01 00:43:27 +03:00
parent 7d028cce66
commit 1c341c6888
5 changed files with 23 additions and 41 deletions
+6 -6
View File
@@ -109,8 +109,8 @@ TEST(PadIso7816Tests, PadOutIteratorUsageTest)
}
}
template<typename Impl, typename OutputIt>
void PadThroughBase(const Padder<Impl> & padder, OutputIt begin, OutputIt end)
template<Padder PadderImpl, typename OutputIt>
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>
auto ComputeUnpadThroughBase(const Padder<Impl> & padder, OutputIt begin, OutputIt end)
template<Padder PadderImpl, typename OutputIt>
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_);
+6 -6
View File
@@ -137,8 +137,8 @@ TEST(PadPkcs7Tests, PadOutIteratorUsageTest)
}
}
template<typename Impl, typename OutputIt>
void PadThroughBase(const Padder<Impl> & padder, OutputIt begin, OutputIt end)
template<Padder PadderImpl, typename OutputIt>
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>
auto ComputeUnpadThroughBase(const Padder<Impl> & padder, OutputIt begin, OutputIt end)
template<Padder PadderImpl, typename OutputIt>
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_);