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 /cryptlib.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 'cryptlib.cpp')
| -rw-r--r-- | cryptlib.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/cryptlib.cpp b/cryptlib.cpp index b84a085..0e5bd24 100644 --- a/cryptlib.cpp +++ b/cryptlib.cpp @@ -26,7 +26,10 @@ CRYPTOPP_COMPILE_ASSERT(sizeof(word64) == 8); CRYPTOPP_COMPILE_ASSERT(sizeof(dword) == 2*sizeof(word)); #endif -const std::string BufferedTransformation::NULL_CHANNEL; +const std::string DEFAULT_CHANNEL; +const std::string AAD_CHANNEL = "AAD"; +const std::string &BufferedTransformation::NULL_CHANNEL = DEFAULT_CHANNEL; + const NullNameValuePairs g_nullNameValuePairs; BufferedTransformation & TheBitBucket() @@ -254,12 +257,12 @@ word32 RandomNumberGenerator::GenerateWord32(word32 min, word32 max) void RandomNumberGenerator::GenerateBlock(byte *output, size_t size) { ArraySink s(output, size); - GenerateIntoBufferedTransformation(s, BufferedTransformation::NULL_CHANNEL, size); + GenerateIntoBufferedTransformation(s, DEFAULT_CHANNEL, size); } void RandomNumberGenerator::DiscardBytes(size_t n) { - GenerateIntoBufferedTransformation(TheBitBucket(), BufferedTransformation::NULL_CHANNEL, n); + GenerateIntoBufferedTransformation(TheBitBucket(), DEFAULT_CHANNEL, n); } void RandomNumberGenerator::GenerateIntoBufferedTransformation(BufferedTransformation &target, const std::string &channel, lword length) @@ -593,12 +596,12 @@ size_t BufferedTransformation::ChannelPutWord32(const std::string &channel, word size_t BufferedTransformation::PutWord16(word16 value, ByteOrder order, bool blocking) { - return ChannelPutWord16(NULL_CHANNEL, value, order, blocking); + return ChannelPutWord16(DEFAULT_CHANNEL, value, order, blocking); } size_t BufferedTransformation::PutWord32(word32 value, ByteOrder order, bool blocking) { - return ChannelPutWord32(NULL_CHANNEL, value, order, blocking); + return ChannelPutWord32(DEFAULT_CHANNEL, value, order, blocking); } size_t BufferedTransformation::PeekWord16(word16 &value, ByteOrder order) const |