- add EAX mode, XSalsa20

- speed up GCM key setup
- wipe stack in AES assembly code
- speed up CFB mode

1 files changed, 52 insertions, 48 deletions

diff --git a/cmac.h b/cmac.h
index 176a8b7c..ab3ecf8c 100644
--- a/cmac.h
+++ b/cmac.h
@@ -1,48 +1,52 @@
-#ifndef CRYPTOPP_CMAC_H
-#define CRYPTOPP_CMAC_H
-
-#include "seckey.h"
-#include "secblock.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! _
-class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CMAC_Base : public MessageAuthenticationCode
-{
-public:
-	CMAC_Base() {}
-
-	void UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs &params);
-	void Update(const byte *input, size_t length);
-	void TruncatedFinal(byte *mac, size_t size);
-	unsigned int DigestSize() const {return const_cast<CMAC_Base*>(this)->AccessCipher().BlockSize();}
-
-protected:
-	virtual BlockCipher & AccessCipher() =0;
-
-private:
-	void ProcessBuf();
-	SecByteBlock m_reg;
-	unsigned int m_counter;
-};
-
-/// <a href="http://www.cryptolounge.org/wiki/CMAC">CMAC</a>
-/*! Template parameter T should be a class derived from BlockCipherDocumentation, for example AES, with a block size of 8, 16, or 32 */
-template <class T>
-class CMAC : public MessageAuthenticationCodeImpl<CMAC_Base, CMAC<T> >, public SameKeyLengthAs<T>
-{
-public:
-	CMAC() {}
-	CMAC(const byte *key, size_t length=SameKeyLengthAs<T>::DEFAULT_KEYLENGTH)
-		{this->SetKey(key, length);}
-
-	static std::string StaticAlgorithmName() {return std::string("CMAC(") + T::StaticAlgorithmName() + ")";}
-
-private:
-	BlockCipher & AccessCipher() {return m_cipher;}
-	typename T::Encryption m_cipher;
-};
-
-NAMESPACE_END
-
-#endif
+#ifndef CRYPTOPP_CMAC_H

+#define CRYPTOPP_CMAC_H

+

+#include "seckey.h"

+#include "secblock.h"

+

+NAMESPACE_BEGIN(CryptoPP)

+

+//! _

+class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CMAC_Base : public MessageAuthenticationCode

+{

+public:

+	CMAC_Base() {}

+

+	void UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs &params);

+	void Update(const byte *input, size_t length);

+	void TruncatedFinal(byte *mac, size_t size);

+	unsigned int DigestSize() const {return GetCipher().BlockSize();}

+	unsigned int OptimalBlockSize() const {return GetCipher().BlockSize();}

+	unsigned int OptimalDataAlignment() const {return GetCipher().OptimalDataAlignment();}

+

+protected:

+	friend class EAX_Base;

+

+	const BlockCipher & GetCipher() const {return const_cast<CMAC_Base*>(this)->AccessCipher();}

+	virtual BlockCipher & AccessCipher() =0;

+

+	void ProcessBuf();

+	SecByteBlock m_reg;

+	unsigned int m_counter;

+};

+

+/// <a href="http://www.cryptolounge.org/wiki/CMAC">CMAC</a>

+/*! Template parameter T should be a class derived from BlockCipherDocumentation, for example AES, with a block size of 8, 16, or 32 */

+template <class T>

+class CMAC : public MessageAuthenticationCodeImpl<CMAC_Base, CMAC<T> >, public SameKeyLengthAs<T>

+{

+public:

+	CMAC() {}

+	CMAC(const byte *key, size_t length=SameKeyLengthAs<T>::DEFAULT_KEYLENGTH)

+		{this->SetKey(key, length);}

+

+	static std::string StaticAlgorithmName() {return std::string("CMAC(") + T::StaticAlgorithmName() + ")";}

+

+private:

+	BlockCipher & AccessCipher() {return m_cipher;}

+	typename T::Encryption m_cipher;

+};

+

+NAMESPACE_END

+

+#endif