Fixed errors

external/ours/library/crypto/src/shared/original/iterhash.cpp

@@ -5,106 +5,6 @@
 
 NAMESPACE_BEGIN(CryptoPP)
 
-template <class T>
-IteratedHashBase<T>::IteratedHashBase(unsigned int blockSize, unsigned int digestSize)
-	: blockSize(blockSize), countLo(0), countHi(0)
-	, data(blockSize/sizeof(T)), digest(digestSize/sizeof(T))
-{
-}
-
-template <class T> void IteratedHashBase<T>::Update(const byte *input, unsigned int len)
-{
-	HashWordType tmp = countLo;
-	if ((countLo = tmp + ((word32)len << 3)) < tmp)
-		countHi++;             // Carry from low to high
-
-   int rshift = (8*sizeof(HashWordType)-3);
-   if (rshift<32)
-   {
-   	countHi += len >> rshift;
-   }
-
-	assert((blockSize & (blockSize-1)) == 0);	// blockSize is a power of 2
-	unsigned int num = (unsigned int)(tmp >> 3) & (blockSize-1);
-
-	if (num != 0)
-	{
-		if ((num+len) >= blockSize)
-		{
-			memcpy((byte *)data.ptr+num, input, blockSize-num);
-			HashBlock(data);
-			input += (blockSize-num);
-			len-=(blockSize - num);
-			num=0;
-			// drop through and do the rest
-		}
-		else
-		{
-			memcpy((byte *)data.ptr+num, input, len);
-			return;
-		}
-	}
-
-	// we now can process the input data in blocks of blockSize
-	// chars and save the leftovers to this->data.
-	if (len >= blockSize)
-	{
-		if (IsAligned<T>(input))
-		{
-			unsigned int leftOver = HashMultipleBlocks((T *)input, len);
-			input += (len - leftOver);
-			len = leftOver;
-		}
-		else
-			do
-			{   // copy input first if it's not aligned correctly
-				memcpy(data, input, blockSize);
-				HashBlock(data);
-				input+=blockSize;
-				len-=blockSize;
-			} while (len >= blockSize);
-	}
-
-	memcpy(data, input, len);
-}
-
-template <class T> unsigned int IteratedHashBase<T>::HashMultipleBlocks(const T *input, unsigned int length)
-{
-	do
-	{
-		HashBlock(input);
-		input += blockSize/sizeof(T);
-		length -= blockSize;
-	}
-	while (length >= blockSize);
-	return length;
-}
-
-template <class T> void IteratedHashBase<T>::PadLastBlock(unsigned int lastBlockSize, byte padFirst)
-{
-	unsigned int num = (unsigned int)(countLo >> 3) & (blockSize-1);
-	assert(num < blockSize);
-	((byte *)data.ptr)[num++]=padFirst;
-	if (num <= lastBlockSize)
-		memset((byte *)data.ptr+num, 0, lastBlockSize-num);
-	else
-	{
-		memset((byte *)data.ptr+num, 0, blockSize-num);
-		HashBlock(data);
-		memset(data, 0, lastBlockSize);
-	}
-}
-
-template <class T> void IteratedHashBase<T>::Reinit()
-{
-	countLo = countHi = 0;
-	Init();
-}
-
-// provide empty definitions to avoid instantiation warnings
-template <class T> void IteratedHashBase<T>::Init() {}
-template <class T> void IteratedHashBase<T>::HashBlock(const T *input) {}
-
 #ifdef WORD64_AVAILABLE
 template class IteratedHashBase<word64>;
 #endif

external/ours/library/crypto/src/shared/original/iterhash.h

@@ -34,6 +34,106 @@ protected:
 	SecBlock<T> digest;			// Message digest
 };
 
+template <class T>
+IteratedHashBase<T>::IteratedHashBase(unsigned int blockSize, unsigned int digestSize)
+	: blockSize(blockSize), countLo(0), countHi(0)
+	, data(blockSize/sizeof(T)), digest(digestSize/sizeof(T))
+{
+}
+
+template <class T> void IteratedHashBase<T>::Update(const byte *input, unsigned int len)
+{
+	HashWordType tmp = countLo;
+	if ((countLo = tmp + ((word32)len << 3)) < tmp)
+		countHi++;             // Carry from low to high
+
+   int rshift = (8*sizeof(HashWordType)-3);
+   if (rshift<32)
+   {
+   	countHi += len >> rshift;
+   }
+
+	assert((blockSize & (blockSize-1)) == 0);	// blockSize is a power of 2
+	unsigned int num = (unsigned int)(tmp >> 3) & (blockSize-1);
+
+	if (num != 0)
+	{
+		if ((num+len) >= blockSize)
+		{
+			memcpy((byte *)data.ptr+num, input, blockSize-num);
+			HashBlock(data);
+			input += (blockSize-num);
+			len-=(blockSize - num);
+			num=0;
+			// drop through and do the rest
+		}
+		else
+		{
+			memcpy((byte *)data.ptr+num, input, len);
+			return;
+		}
+	}
+
+	// we now can process the input data in blocks of blockSize
+	// chars and save the leftovers to this->data.
+	if (len >= blockSize)
+	{
+		if (IsAligned<T>(input))
+		{
+			unsigned int leftOver = HashMultipleBlocks((T *)input, len);
+			input += (len - leftOver);
+			len = leftOver;
+		}
+		else
+			do
+			{   // copy input first if it's not aligned correctly
+				memcpy(data, input, blockSize);
+				HashBlock(data);
+				input+=blockSize;
+				len-=blockSize;
+			} while (len >= blockSize);
+	}
+
+	memcpy(data, input, len);
+}
+
+template <class T> unsigned int IteratedHashBase<T>::HashMultipleBlocks(const T *input, unsigned int length)
+{
+	do
+	{
+		HashBlock(input);
+		input += blockSize/sizeof(T);
+		length -= blockSize;
+	}
+	while (length >= blockSize);
+	return length;
+}
+
+template <class T> void IteratedHashBase<T>::PadLastBlock(unsigned int lastBlockSize, byte padFirst)
+{
+	unsigned int num = (unsigned int)(countLo >> 3) & (blockSize-1);
+	assert(num < blockSize);
+	((byte *)data.ptr)[num++]=padFirst;
+	if (num <= lastBlockSize)
+		memset((byte *)data.ptr+num, 0, lastBlockSize-num);
+	else
+	{
+		memset((byte *)data.ptr+num, 0, blockSize-num);
+		HashBlock(data);
+		memset(data, 0, lastBlockSize);
+	}
+}
+
+template <class T> void IteratedHashBase<T>::Reinit()
+{
+	countLo = countHi = 0;
+	Init();
+}
+
+// provide empty definitions to avoid instantiation warnings
+template <class T> void IteratedHashBase<T>::Init() {}
+template <class T> void IteratedHashBase<T>::HashBlock(const T *input) {}
+
 //! .
 template <class T, bool H, unsigned int S>
 class IteratedHash : public IteratedHashBase<T>
@@ -41,7 +141,7 @@ class IteratedHash : public IteratedHashBase<T>
 public:
 	typedef T HashWordType;
 	enum {HIGHFIRST = H, BLOCKSIZE = S};
-	
+
 	IteratedHash(unsigned int digestSize) : IteratedHashBase<T>(BLOCKSIZE, digestSize) {}
 
 	inline static void CorrectEndianess(HashWordType *out, const HashWordType *in, unsigned int byteCount)
@@ -54,7 +154,7 @@ public:
 
 	void Final(byte *hash)
 	{
-		PadLastBlock(BLOCKSIZE - 2*sizeof(HashWordType));
+		this->PadLastBlock(BLOCKSIZE - 2*sizeof(HashWordType));
 		CorrectEndianess(this->data, this->data, BLOCKSIZE - 2*sizeof(HashWordType));
 
 		this->data[this->data.size-2] = HIGHFIRST ? this->countHi : this->countLo;