Revert 95ee8975b4fc and 7d21cdd54e95 (Issue 408)

This broke some OS X builds. We need more testing. Ugh...

1 files changed, 3 insertions, 3 deletions

diff --git a/gcm.h b/gcm.h
index 478b95b1..de5fe8b5 100644
--- a/gcm.h
+++ b/gcm.h
@@ -74,9 +74,9 @@ protected:
 	virtual GCM_TablesOption GetTablesOption() const =0;

 

 	const BlockCipher & GetBlockCipher() const {return const_cast<GCM_Base *>(this)->AccessBlockCipher();};

-	byte *HashBuffer() {return m_buffer+GetBlockCipher().BlockSize();}

-	byte *HashKey() {return m_buffer+2*GetBlockCipher().BlockSize();}

-	byte *MulTable() {return m_buffer+3*GetBlockCipher().BlockSize();}

+	byte *HashBuffer() {return m_buffer+REQUIRED_BLOCKSIZE;}

+	byte *HashKey() {return m_buffer+2*REQUIRED_BLOCKSIZE;}

+	byte *MulTable() {return m_buffer+3*REQUIRED_BLOCKSIZE;}

 	inline void ReverseHashBufferIfNeeded();

 

 	class CRYPTOPP_DLL GCTR : public CTR_Mode_ExternalCipher::Encryption