arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Sync with Upstream master

pull/461/head
Jeffrey Walton 2017-08-13 05:01:57 -04:00
parent 5f3a3f29e8 f02bf91ee5
commit d8e56b8250
2 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gcm.cpp
View File

@ -1,6 +1,6 @@
// gcm.cpp - originally written and placed in the public domain by Wei Dai // gcm.cpp - originally written and placed in the public domain by Wei Dai.
// ARM and Aarch64 added by Jeffrey Walton. The ARM carryless // ARM and Aarch64 added by Jeffrey Walton. The ARM carryless
// multiply routines are less efficient because they shadowed x86. // multiply routines are less efficient because they shadow x86.
// The precomputed key table integration makes it tricky to use the // The precomputed key table integration makes it tricky to use the
// more efficient ARMv8 implementation of the multiply and reduce. // more efficient ARMv8 implementation of the multiply and reduce.
@ -158,7 +158,7 @@ void GCM_Base::SetKeyWithoutResync(const byte *userKey, size_t keylength, const
m_buffer.resize(3*blockSize + tableSize); m_buffer.resize(3*blockSize + tableSize);
byte *mulTable = MulTable(); byte *mulTable = MulTable();
byte *hashKey = HashKey(); byte *hashKey = HashKey();
memset(hashKey, 0, blockSize); memset(hashKey, 0, REQUIRED_BLOCKSIZE);
blockCipher.ProcessBlock(hashKey); blockCipher.ProcessBlock(hashKey);
#if CRYPTOPP_CLMUL_AVAILABLE #if CRYPTOPP_CLMUL_AVAILABLE
@ -295,13 +295,6 @@ void GCM_Base::Resync(const byte *iv, size_t len)
BlockCipher &cipher = AccessBlockCipher(); BlockCipher &cipher = AccessBlockCipher();
byte *hashBuffer = HashBuffer(); byte *hashBuffer = HashBuffer();
// GCM is only defined for 16-byte block ciphers at the moment.
// However, variable blocksize support means we have to defer
// blocksize checks to runtime after the key is set. Also see
// https://github.com/weidai11/cryptopp/issues/408.
const unsigned int blockSize = cipher.BlockSize();
CRYPTOPP_ASSERT(blockSize == REQUIRED_BLOCKSIZE);
if (len == 12) if (len == 12)
{ {
memcpy(hashBuffer, iv, len); memcpy(hashBuffer, iv, len);
@ -333,7 +326,7 @@ void GCM_Base::Resync(const byte *iv, size_t len)
} }
if (m_state >= State_IVSet) if (m_state >= State_IVSet)
m_ctr.Resynchronize(hashBuffer, blockSize); m_ctr.Resynchronize(hashBuffer, REQUIRED_BLOCKSIZE);
else else
m_ctr.SetCipherWithIV(cipher, hashBuffer); m_ctr.SetCipherWithIV(cipher, hashBuffer);
@ -396,7 +389,7 @@ size_t GCM_Base::AuthenticateBlocks(const byte *data, size_t len)
{ {
case 0: // non-SSE2 and 2K tables case 0: // non-SSE2 and 2K tables
{ {
byte *table = MulTable(); byte *mulTable = MulTable();
word64 x0 = hashBuffer[0], x1 = hashBuffer[1]; word64 x0 = hashBuffer[0], x1 = hashBuffer[1];
do do
@ -409,7 +402,7 @@ size_t GCM_Base::AuthenticateBlocks(const byte *data, size_t len)
data += HASH_BLOCKSIZE; data += HASH_BLOCKSIZE;
len -= HASH_BLOCKSIZE; len -= HASH_BLOCKSIZE;
#define READ_TABLE_WORD64_COMMON(a, b, c, d) *(word64 *)(void *)(table+(a*1024)+(b*256)+c+d*8) #define READ_TABLE_WORD64_COMMON(a, b, c, d) *(word64 *)(void *)(mulTable+(a*1024)+(b*256)+c+d*8)
#ifdef IS_LITTLE_ENDIAN #ifdef IS_LITTLE_ENDIAN
#if CRYPTOPP_BOOL_SLOW_WORD64 #if CRYPTOPP_BOOL_SLOW_WORD64
@ -464,7 +457,7 @@ size_t GCM_Base::AuthenticateBlocks(const byte *data, size_t len)
case 2: // non-SSE2 and 64K tables case 2: // non-SSE2 and 64K tables
{ {
byte *table = MulTable(); byte *mulTable = MulTable();
word64 x0 = hashBuffer[0], x1 = hashBuffer[1]; word64 x0 = hashBuffer[0], x1 = hashBuffer[1];
do do
@ -480,7 +473,7 @@ size_t GCM_Base::AuthenticateBlocks(const byte *data, size_t len)
#undef READ_TABLE_WORD64_COMMON #undef READ_TABLE_WORD64_COMMON
#undef READ_TABLE_WORD64 #undef READ_TABLE_WORD64
#define READ_TABLE_WORD64_COMMON(a, c, d) *(word64 *)(void *)(table+(a)*256*16+(c)+(d)*8) #define READ_TABLE_WORD64_COMMON(a, c, d) *(word64 *)(void *)(mulTable+(a)*256*16+(c)+(d)*8)
#ifdef IS_LITTLE_ENDIAN #ifdef IS_LITTLE_ENDIAN
#if CRYPTOPP_BOOL_SLOW_WORD64 #if CRYPTOPP_BOOL_SLOW_WORD64

6
gcm.h
View File

@ -74,9 +74,9 @@ protected:
virtual GCM_TablesOption GetTablesOption() const =0; virtual GCM_TablesOption GetTablesOption() const =0;
const BlockCipher & GetBlockCipher() const {return const_cast<GCM_Base *>(this)->AccessBlockCipher();}; const BlockCipher & GetBlockCipher() const {return const_cast<GCM_Base *>(this)->AccessBlockCipher();};
byte *HashBuffer() {return m_buffer+GetBlockCipher().BlockSize();} byte *HashBuffer() {return m_buffer+REQUIRED_BLOCKSIZE;}
byte *HashKey() {return m_buffer+2*GetBlockCipher().BlockSize();} byte *HashKey() {return m_buffer+2*REQUIRED_BLOCKSIZE;}
byte *MulTable() {return m_buffer+3*GetBlockCipher().BlockSize();} byte *MulTable() {return m_buffer+3*REQUIRED_BLOCKSIZE;}
inline void ReverseHashBufferIfNeeded(); inline void ReverseHashBufferIfNeeded();
class CRYPTOPP_DLL GCTR : public CTR_Mode_ExternalCipher::Encryption class CRYPTOPP_DLL GCTR : public CTR_Mode_ExternalCipher::Encryption