CRYPTOPP 5.6.3 RC6 checkin

1 files changed, 57 insertions, 54 deletions

diff --git a/mars.h b/mars.h
index 414adf42..424554df 100644
--- a/mars.h
+++ b/mars.h
@@ -1,54 +1,57 @@
-#ifndef CRYPTOPP_MARS_H
-#define CRYPTOPP_MARS_H
-
-/** \file
-*/
-
-#include "seckey.h"
-#include "secblock.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! _
-struct MARS_Info : public FixedBlockSize<16>, public VariableKeyLength<16, 16, 56, 4>
-{
-	static const char *StaticAlgorithmName() {return "MARS";}
-};
-
-/// <a href="http://www.weidai.com/scan-mirror/cs.html#MARS">MARS</a>
-class MARS : public MARS_Info, public BlockCipherDocumentation
-{
-	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<MARS_Info>
-	{
-	public:
-		void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs &params);
-
-	protected:
-		static const word32 Sbox[512];
-
-		FixedSizeSecBlock<word32, 40> m_k;
-	};
-
-	class CRYPTOPP_NO_VTABLE Enc : public Base
-	{
-	public:
-		void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const;
-	};
-
-	class CRYPTOPP_NO_VTABLE Dec : public Base
-	{
-	public:
-		void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const;
-	};
-
-public:
-	typedef BlockCipherFinal<ENCRYPTION, Enc> Encryption;
-	typedef BlockCipherFinal<DECRYPTION, Dec> Decryption;
-};
-
-typedef MARS::Encryption MARSEncryption;
-typedef MARS::Decryption MARSDecryption;
-
-NAMESPACE_END
-
-#endif
+// mars.h - written and placed in the public domain by Wei Dai

+

+//! \file

+//! \brief Implementation of the MARS cipher (IBM AES submission)

+

+

+#ifndef CRYPTOPP_MARS_H

+#define CRYPTOPP_MARS_H

+

+#include "seckey.h"

+#include "secblock.h"

+

+NAMESPACE_BEGIN(CryptoPP)

+

+//! _

+struct MARS_Info : public FixedBlockSize<16>, public VariableKeyLength<16, 16, 56, 4>

+{

+	static const char *StaticAlgorithmName() {return "MARS";}

+};

+

+/// <a href="http://www.weidai.com/scan-mirror/cs.html#MARS">MARS</a>

+class MARS : public MARS_Info, public BlockCipherDocumentation

+{

+	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<MARS_Info>

+	{

+	public:

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

+

+	protected:

+		static const word32 Sbox[512];

+

+		FixedSizeSecBlock<word32, 40> m_k;

+	};

+

+	class CRYPTOPP_NO_VTABLE Enc : public Base

+	{

+	public:

+		void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const;

+	};

+

+	class CRYPTOPP_NO_VTABLE Dec : public Base

+	{

+	public:

+		void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const;

+	};

+

+public:

+	typedef BlockCipherFinal<ENCRYPTION, Enc> Encryption;

+	typedef BlockCipherFinal<DECRYPTION, Dec> Decryption;

+};

+

+typedef MARS::Encryption MARSEncryption;

+typedef MARS::Decryption MARSDecryption;

+

+NAMESPACE_END

+

+#endif