diff options
| author | weidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0> | 2009-03-10 02:56:19 +0000 |
|---|---|---|
| committer | weidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0> | 2009-03-10 02:56:19 +0000 |
| commit | cc319dc33cc73b0ec368864a4220604170acb674 (patch) | |
| tree | 1c52d52d455d3b48e60bfc8b075f4d611068be14 /datatest.cpp | |
| parent | 77d342339b3149f02aaa3521a27b6216468d43dc (diff) | |
| download | cryptopp-cc319dc33cc73b0ec368864a4220604170acb674.tar.gz | |
add x86/x64 assembly for SHA-256,
add DEFAULT_CHANNEL and AAD_CHANNEL,
fix macChannel for AuthenticatedEncryptionFilter
git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@440 57ff6487-cd31-0410-9ec3-f628ee90f5f0
Diffstat (limited to 'datatest.cpp')
| -rw-r--r-- | datatest.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/datatest.cpp b/datatest.cpp index a028244..3e97a3e 100644 --- a/datatest.cpp +++ b/datatest.cpp @@ -410,19 +410,19 @@ void TestAuthenticatedSymmetricCipher(TestData &v, const NameValuePairs &overrid if (macAtBegin) sm.TransferTo(df); - sh.CopyTo(df, LWORD_MAX, "AAD"); + sh.CopyTo(df, LWORD_MAX, AAD_CHANNEL); sc.TransferTo(df); - sf.CopyTo(df, LWORD_MAX, "AAD"); + sf.CopyTo(df, LWORD_MAX, AAD_CHANNEL); if (!macAtBegin) sm.TransferTo(df); df.MessageEnd(); - sh.TransferTo(ef, sh.MaxRetrievable()/2+1, "AAD"); - sh.TransferTo(ef, LWORD_MAX, "AAD"); + sh.TransferTo(ef, sh.MaxRetrievable()/2+1, AAD_CHANNEL); + sh.TransferTo(ef, LWORD_MAX, AAD_CHANNEL); sp.TransferTo(ef, sp.MaxRetrievable()/2+1); sp.TransferTo(ef); - sf.TransferTo(ef, sf.MaxRetrievable()/2+1, "AAD"); - sf.TransferTo(ef, LWORD_MAX, "AAD"); + sf.TransferTo(ef, sf.MaxRetrievable()/2+1, AAD_CHANNEL); + sf.TransferTo(ef, LWORD_MAX, AAD_CHANNEL); ef.MessageEnd(); if (test == "Encrypt" && encrypted != ciphertext+mac) |