diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2018-01-12 18:59:48 -0500 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2018-01-12 18:59:48 -0500 |
| commit | 746fd6a648baeeb5b32bc90d37d7dade63601445 (patch) | |
| tree | b18b953fb55da379d7a66d1c1ee7d6317b627fed /validat1.cpp | |
| parent | a9d6604ee9122b44ab8250e4b52b0ebd48c514e1 (diff) | |
| download | cryptopp-git-746fd6a648baeeb5b32bc90d37d7dade63601445.tar.gz | |
add self test for custom Encoder and Decoder alphabet (GH #562)
Diffstat (limited to 'validat1.cpp')
| -rw-r--r-- | validat1.cpp | 109 |
1 files changed, 109 insertions, 0 deletions
diff --git a/validat1.cpp b/validat1.cpp index 3f80f97a..5022a3af 100644 --- a/validat1.cpp +++ b/validat1.cpp @@ -106,6 +106,7 @@ bool ValidateAll(bool thorough) pass=TestASN1Parse() && pass;
// Additional tests due to no coverage
pass=ValidateBaseCode() && pass;
+ pass=ValidateEncoder() && pass;
pass=TestCompressors() && pass;
pass=TestSharing() && pass;
pass=TestEncryptors() && pass;
@@ -3165,6 +3166,114 @@ bool ValidateBaseCode() return pass;
}
+class MyEncoder : public SimpleProxyFilter
+{
+public:
+ MyEncoder(BufferedTransformation *attachment = NULLPTR);
+ void IsolatedInitialize(const NameValuePairs ¶ms);
+};
+
+MyEncoder::MyEncoder(BufferedTransformation *attachment)
+ : SimpleProxyFilter(new BaseN_Encoder(new Grouper), attachment)
+{
+ IsolatedInitialize(MakeParameters(Name::InsertLineBreaks(), true)(Name::MaxLineLength(), 72));
+}
+
+void MyEncoder::IsolatedInitialize(const NameValuePairs ¶meters)
+{
+ bool insertLineBreaks = parameters.GetValueWithDefault(Name::InsertLineBreaks(), true);
+ int maxLineLength = parameters.GetIntValueWithDefault(Name::MaxLineLength(), 72);
+
+ const byte padding = '=';
+ const char *lineBreak = insertLineBreaks ? "\n" : "";
+
+ char alphabet[64];
+ memset(alphabet, '*', 64);
+
+ m_filter->Initialize(CombinedNameValuePairs(
+ parameters,
+ MakeParameters(Name::EncodingLookupArray(), (const byte *)&alphabet[0], false)
+ (Name::PaddingByte(), padding)
+ (Name::GroupSize(), insertLineBreaks ? maxLineLength : 0)
+ (Name::Separator(), ConstByteArrayParameter(lineBreak))
+ (Name::Terminator(), ConstByteArrayParameter(lineBreak))
+ (Name::Log2Base(), 6, true)));
+}
+
+class MyDecoder : public BaseN_Decoder
+{
+public:
+ MyDecoder(BufferedTransformation *attachment = NULLPTR);
+ void IsolatedInitialize(const NameValuePairs ¶ms);
+ static const int * CRYPTOPP_API GetDecodingLookupArray();
+};
+
+MyDecoder::MyDecoder(BufferedTransformation *attachment)
+ : BaseN_Decoder(GetDecodingLookupArray(), 6, attachment)
+{
+}
+
+void MyDecoder::IsolatedInitialize(const NameValuePairs ¶meters)
+{
+ BaseN_Decoder::IsolatedInitialize(CombinedNameValuePairs(
+ parameters,
+ MakeParameters(Name::DecodingLookupArray(), GetDecodingLookupArray(), false)(Name::Log2Base(), 6, true)));
+}
+
+const int * MyDecoder::GetDecodingLookupArray()
+{
+ static volatile bool s_initialized = false;
+ static byte s_star[64];
+ static int s_array[256];
+
+ if (!s_initialized)
+ {
+ memset(s_star, '*', 64);
+ InitializeDecodingLookupArray(s_array, s_star, 64, false);
+ s_initialized = true;
+ }
+ return s_array;
+}
+
+bool ValidateEncoder()
+{
+ // The default encoder and decoder alphabet are bogus. They are a
+ // string of '*'. To round trip a string both IsolatedInitialize
+ // must be called and work correctly.
+ std::cout << "\nCustom encoder validation running...\n\n";
+
+ int lookup[255];
+ const char alphabet[64+1] =
+ "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz01234576789*";
+
+ MyEncoder encoder;
+ std::string str1;
+
+ AlgorithmParameters eparams = MakeParameters(Name::EncodingLookupArray(),(const byte*)alphabet);
+ encoder.IsolatedInitialize(eparams);
+
+ encoder.Detach(new StringSink(str1));
+ encoder.Put((const byte*) alphabet, 64);
+ encoder.MessageEnd();
+
+ MyDecoder decoder;
+ std::string str2;
+
+ MyDecoder::InitializeDecodingLookupArray(lookup, (const byte*) alphabet, 64, false);
+ AlgorithmParameters dparams = MakeParameters(Name::DecodingLookupArray(),(const int*)lookup);
+ decoder.IsolatedInitialize(dparams);
+
+ decoder.Detach(new StringSink(str2));
+ decoder.Put((const byte*) str1.data(), str1.size());
+ decoder.MessageEnd();
+
+ bool pass = str2 == std::string(alphabet, 64);
+ std::cout << (pass ? "passed:" : "FAILED:");
+ std::cout << " Encoder encode and Decoder decode\n";
+
+ return pass;
+}
+
bool ValidateSHACAL2()
{
std::cout << "\nSHACAL-2 validation suite running...\n\n";
|