CRYPTOPP 5.6.3 RC6 checkin

1 files changed, 54 insertions, 54 deletions

diff --git a/shacal2.h b/shacal2.h
index 66c987fd..5a95f8be 100644
--- a/shacal2.h
+++ b/shacal2.h
@@ -1,54 +1,54 @@
-#ifndef CRYPTOPP_SHACAL2_H
-#define CRYPTOPP_SHACAL2_H
-
-/** \file
-*/
-
-#include "seckey.h"
-#include "secblock.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! _
-struct SHACAL2_Info : public FixedBlockSize<32>, public VariableKeyLength<16, 16, 64>
-{
-	static const char *StaticAlgorithmName() {return "SHACAL-2";}
-};
-
-/// <a href="http://www.weidai.com/scan-mirror/cs.html#SHACAL-2">SHACAL-2</a>
-class SHACAL2 : public SHACAL2_Info, public BlockCipherDocumentation
-{
-	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<SHACAL2_Info>
-	{
-	public:
-		void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs &params);
-
-	protected:
-		FixedSizeSecBlock<word32, 64> m_key;
-
-		static const word32 K[64];
-	};
-
-	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 SHACAL2::Encryption SHACAL2Encryption;
-typedef SHACAL2::Decryption SHACAL2Decryption;
-
-NAMESPACE_END
-
-#endif
+#ifndef CRYPTOPP_SHACAL2_H

+#define CRYPTOPP_SHACAL2_H

+

+/** \file

+*/

+

+#include "seckey.h"

+#include "secblock.h"

+

+NAMESPACE_BEGIN(CryptoPP)

+

+//! _

+struct SHACAL2_Info : public FixedBlockSize<32>, public VariableKeyLength<16, 16, 64>

+{

+	static const char *StaticAlgorithmName() {return "SHACAL-2";}

+};

+

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

+class SHACAL2 : public SHACAL2_Info, public BlockCipherDocumentation

+{

+	class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<SHACAL2_Info>

+	{

+	public:

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

+

+	protected:

+		FixedSizeSecBlock<word32, 64> m_key;

+

+		static const word32 K[64];

+	};

+

+	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 SHACAL2::Encryption SHACAL2Encryption;

+typedef SHACAL2::Decryption SHACAL2Decryption;

+

+NAMESPACE_END

+

+#endif