From 48809d4e85c125814425c621d8d0d89f95405924 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Thu, 5 Nov 2015 01:59:46 -0500
Subject: CRYPTOPP 5.6.3 RC6 checkin

---
 mdc.h | 145 +++++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 73 insertions(+), 72 deletions(-)

(limited to 'mdc.h')

diff --git a/mdc.h b/mdc.h
index cc90cdc4..797e722e 100644
--- a/mdc.h
+++ b/mdc.h
@@ -1,72 +1,73 @@
- // mdc.h - written and placed in the public domain by Wei Dai
-
-#ifndef CRYPTOPP_MDC_H
-#define CRYPTOPP_MDC_H
-
-/** \file
-*/
-
-#include "seckey.h"
-#include "misc.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-//! _
-template <class T>
-struct MDC_Info : public FixedBlockSize<T::DIGESTSIZE>, public FixedKeyLength<T::BLOCKSIZE>
-{
-	static std::string StaticAlgorithmName() {return std::string("MDC/")+T::StaticAlgorithmName();}
-};
-
-//! <a href="http://www.weidai.com/scan-mirror/cs.html#MDC">MDC</a>
-/*! a construction by Peter Gutmann to turn an iterated hash function into a PRF */
-template <class T>
-class MDC : public MDC_Info<T>
-{
-	class CRYPTOPP_NO_VTABLE Enc : public BlockCipherImpl<MDC_Info<T> >
-	{
-		typedef typename T::HashWordType HashWordType;
-
-	public:
-		void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs &params)
-		{
-			this->AssertValidKeyLength(length);
-			memcpy_s(m_key, m_key.size(), userKey, this->KEYLENGTH);
-			T::CorrectEndianess(Key(), Key(), this->KEYLENGTH);
-		}
-
-		void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const
-		{
-			T::CorrectEndianess(Buffer(), (HashWordType *)inBlock, this->BLOCKSIZE);
-			T::Transform(Buffer(), Key());
-			if (xorBlock)
-			{
-				T::CorrectEndianess(Buffer(), Buffer(), this->BLOCKSIZE);
-				xorbuf(outBlock, xorBlock, m_buffer, this->BLOCKSIZE);
-			}
-			else
-				T::CorrectEndianess((HashWordType *)outBlock, Buffer(), this->BLOCKSIZE);
-		}
-
-		bool IsPermutation() const {return false;}
-
-		unsigned int OptimalDataAlignment() const {return sizeof(HashWordType);}
-
-	private:
-		HashWordType *Key() {return (HashWordType *)m_key.data();}
-		const HashWordType *Key() const {return (const HashWordType *)m_key.data();}
-		HashWordType *Buffer() const {return (HashWordType *)m_buffer.data();}
-
-		// VC60 workaround: bug triggered if using FixedSizeAllocatorWithCleanup
-		FixedSizeSecBlock<byte, MDC_Info<T>::KEYLENGTH, AllocatorWithCleanup<byte> > m_key;
-		mutable FixedSizeSecBlock<byte, MDC_Info<T>::BLOCKSIZE, AllocatorWithCleanup<byte> > m_buffer;
-	};
-
-public:
-	//! use BlockCipher interface
-	typedef BlockCipherFinal<ENCRYPTION, Enc> Encryption;
-};
-
-NAMESPACE_END
-
-#endif
+ // mdc.h - written and placed in the public domain by Wei Dai
+
+#ifndef CRYPTOPP_MDC_H
+#define CRYPTOPP_MDC_H
+
+/** \file
+*/
+
+#include "seckey.h"
+#include "secblock.h"
+#include "misc.h"
+
+NAMESPACE_BEGIN(CryptoPP)
+
+//! _
+template <class T>
+struct MDC_Info : public FixedBlockSize<T::DIGESTSIZE>, public FixedKeyLength<T::BLOCKSIZE>
+{
+	static std::string StaticAlgorithmName() {return std::string("MDC/")+T::StaticAlgorithmName();}
+};
+
+//! <a href="http://www.weidai.com/scan-mirror/cs.html#MDC">MDC</a>
+/*! a construction by Peter Gutmann to turn an iterated hash function into a PRF */
+template <class T>
+class MDC : public MDC_Info<T>
+{
+	class CRYPTOPP_NO_VTABLE Enc : public BlockCipherImpl<MDC_Info<T> >
+	{
+		typedef typename T::HashWordType HashWordType;
+
+	public:
+		void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs &params)
+		{
+			this->AssertValidKeyLength(length);
+			memcpy_s(m_key, m_key.size(), userKey, this->KEYLENGTH);
+			T::CorrectEndianess(Key(), Key(), this->KEYLENGTH);
+		}
+
+		void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const
+		{
+			T::CorrectEndianess(Buffer(), (HashWordType *)inBlock, this->BLOCKSIZE);
+			T::Transform(Buffer(), Key());
+			if (xorBlock)
+			{
+				T::CorrectEndianess(Buffer(), Buffer(), this->BLOCKSIZE);
+				xorbuf(outBlock, xorBlock, m_buffer, this->BLOCKSIZE);
+			}
+			else
+				T::CorrectEndianess((HashWordType *)outBlock, Buffer(), this->BLOCKSIZE);
+		}
+
+		bool IsPermutation() const {return false;}
+
+		unsigned int OptimalDataAlignment() const {return sizeof(HashWordType);}
+
+	private:
+		HashWordType *Key() {return (HashWordType *)m_key.data();}
+		const HashWordType *Key() const {return (const HashWordType *)m_key.data();}
+		HashWordType *Buffer() const {return (HashWordType *)m_buffer.data();}
+
+		// VC60 workaround: bug triggered if using FixedSizeAllocatorWithCleanup
+		FixedSizeSecBlock<byte, MDC_Info<T>::KEYLENGTH, AllocatorWithCleanup<byte> > m_key;
+		mutable FixedSizeSecBlock<byte, MDC_Info<T>::BLOCKSIZE, AllocatorWithCleanup<byte> > m_buffer;
+	};
+
+public:
+	//! use BlockCipher interface
+	typedef BlockCipherFinal<ENCRYPTION, Enc> Encryption;
+};
+
+NAMESPACE_END
+
+#endif
-- 
cgit v1.2.1