diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2015-07-31 08:23:53 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2015-07-31 08:23:53 -0400 |
| commit | d935fd80ba0aaf3e40f7023f7ec02cb32e27e688 (patch) | |
| tree | 14428e37232bb88dd8c7226c8250fc73943c472c /datatest.cpp | |
| parent | 8796c9e684e2e4056821e4485dc1180d82767181 (diff) | |
| download | cryptopp-git-d935fd80ba0aaf3e40f7023f7ec02cb32e27e688.tar.gz | |
Partial cut-over to static local strings for DefaultChannel() and AadChannel(). Cout-over DEFAULT_CHANNEL and AAD_CHANNEL to use them behind the scenes
Diffstat (limited to 'datatest.cpp')
| -rw-r--r-- | datatest.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/datatest.cpp b/datatest.cpp index d0f69c6d..5595c4a1 100644 --- a/datatest.cpp +++ b/datatest.cpp @@ -61,7 +61,7 @@ const std::string & GetRequiredDatum(const TestData &data, const char *name) return i->second; } -void RandomizedTransfer(BufferedTransformation &source, BufferedTransformation &target, bool finish, const std::string &channel=DEFAULT_CHANNEL) +void RandomizedTransfer(BufferedTransformation &source, BufferedTransformation &target, bool finish, const std::string &channel=DefaultChannel()) { while (source.MaxRetrievable() > (finish ? 0 : 4096)) { @@ -492,16 +492,16 @@ void TestAuthenticatedSymmetricCipher(TestData &v, const NameValuePairs &overrid if (macAtBegin) RandomizedTransfer(sm, df, true); - sh.CopyTo(df, LWORD_MAX, AAD_CHANNEL); + sh.CopyTo(df, LWORD_MAX, AadChannel()); RandomizedTransfer(sc, df, true); - sf.CopyTo(df, LWORD_MAX, AAD_CHANNEL); + sf.CopyTo(df, LWORD_MAX, AadChannel()); if (!macAtBegin) RandomizedTransfer(sm, df, true); df.MessageEnd(); - RandomizedTransfer(sh, ef, true, AAD_CHANNEL); + RandomizedTransfer(sh, ef, true, AadChannel()); RandomizedTransfer(sp, ef, true); - RandomizedTransfer(sf, ef, true, AAD_CHANNEL); + RandomizedTransfer(sf, ef, true, AadChannel()); ef.MessageEnd(); if (test == "Encrypt" && encrypted != ciphertext+mac) |