From 3438e5d3ddf8444f0e31009ffbe8237ef3752c22 Mon Sep 17 00:00:00 2001
From: Alexander Harkness <bearbin@gmail.com>
Date: Sun, 24 Nov 2013 14:21:13 +0000
Subject: move cryptopp into lib

---
 CryptoPP/misc.cpp | 189 ------------------------------------------------------
 1 file changed, 189 deletions(-)
 delete mode 100644 CryptoPP/misc.cpp

(limited to 'CryptoPP/misc.cpp')

diff --git a/CryptoPP/misc.cpp b/CryptoPP/misc.cpp
deleted file mode 100644
index 93760e3a3..000000000
--- a/CryptoPP/misc.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-// misc.cpp - written and placed in the public domain by Wei Dai
-
-#include "pch.h"
-
-#ifndef CRYPTOPP_IMPORTS
-
-#include "misc.h"
-#include "words.h"
-#include <new>
-
-#if defined(CRYPTOPP_MEMALIGN_AVAILABLE) || defined(CRYPTOPP_MM_MALLOC_AVAILABLE) || defined(QNX)
-#include <malloc.h>
-#endif
-
-NAMESPACE_BEGIN(CryptoPP)
-
-void xorbuf(byte *buf, const byte *mask, size_t count)
-{
-	size_t i;
-
-	if (IsAligned<word32>(buf) && IsAligned<word32>(mask))
-	{
-		if (!CRYPTOPP_BOOL_SLOW_WORD64 && IsAligned<word64>(buf) && IsAligned<word64>(mask))
-		{
-			for (i=0; i<count/8; i++)
-				((word64*)buf)[i] ^= ((word64*)mask)[i];
-			count -= 8*i;
-			if (!count)
-				return;
-			buf += 8*i;
-			mask += 8*i;
-		}
-
-		for (i=0; i<count/4; i++)
-			((word32*)buf)[i] ^= ((word32*)mask)[i];
-		count -= 4*i;
-		if (!count)
-			return;
-		buf += 4*i;
-		mask += 4*i;
-	}
-
-	for (i=0; i<count; i++)
-		buf[i] ^= mask[i];
-}
-
-void xorbuf(byte *output, const byte *input, const byte *mask, size_t count)
-{
-	size_t i;
-
-	if (IsAligned<word32>(output) && IsAligned<word32>(input) && IsAligned<word32>(mask))
-	{
-		if (!CRYPTOPP_BOOL_SLOW_WORD64 && IsAligned<word64>(output) && IsAligned<word64>(input) && IsAligned<word64>(mask))
-		{
-			for (i=0; i<count/8; i++)
-				((word64*)output)[i] = ((word64*)input)[i] ^ ((word64*)mask)[i];
-			count -= 8*i;
-			if (!count)
-				return;
-			output += 8*i;
-			input += 8*i;
-			mask += 8*i;
-		}
-
-		for (i=0; i<count/4; i++)
-			((word32*)output)[i] = ((word32*)input)[i] ^ ((word32*)mask)[i];
-		count -= 4*i;
-		if (!count)
-			return;
-		output += 4*i;
-		input += 4*i;
-		mask += 4*i;
-	}
-
-	for (i=0; i<count; i++)
-		output[i] = input[i] ^ mask[i];
-}
-
-bool VerifyBufsEqual(const byte *buf, const byte *mask, size_t count)
-{
-	size_t i;
-	byte acc8 = 0;
-
-	if (IsAligned<word32>(buf) && IsAligned<word32>(mask))
-	{
-		word32 acc32 = 0;
-		if (!CRYPTOPP_BOOL_SLOW_WORD64 && IsAligned<word64>(buf) && IsAligned<word64>(mask))
-		{
-			word64 acc64 = 0;
-			for (i=0; i<count/8; i++)
-				acc64 |= ((word64*)buf)[i] ^ ((word64*)mask)[i];
-			count -= 8*i;
-			if (!count)
-				return acc64 == 0;
-			buf += 8*i;
-			mask += 8*i;
-			acc32 = word32(acc64) | word32(acc64>>32);
-		}
-
-		for (i=0; i<count/4; i++)
-			acc32 |= ((word32*)buf)[i] ^ ((word32*)mask)[i];
-		count -= 4*i;
-		if (!count)
-			return acc32 == 0;
-		buf += 4*i;
-		mask += 4*i;
-		acc8 = byte(acc32) | byte(acc32>>8) | byte(acc32>>16) | byte(acc32>>24);
-	}
-
-	for (i=0; i<count; i++)
-		acc8 |= buf[i] ^ mask[i];
-	return acc8 == 0;
-}
-
-#if !(defined(_MSC_VER) && (_MSC_VER < 1300)) && !defined(ANDROID_NDK)
-using std::new_handler;
-using std::set_new_handler;
-#endif
-
-void CallNewHandler()
-{
-#if !defined(ANDROID_NDK)
-	new_handler newHandler = set_new_handler(NULL);
-	if (newHandler)
-		set_new_handler(newHandler);
-
-	if (newHandler)
-		newHandler();
-	else
-		throw std::bad_alloc();
-#endif
-}
-
-#if CRYPTOPP_BOOL_ALIGN16_ENABLED
-
-void * AlignedAllocate(size_t size)
-{
-	byte *p;
-#ifdef CRYPTOPP_MM_MALLOC_AVAILABLE
-	while (!(p = (byte *)_mm_malloc(size, 16)))
-#elif defined(CRYPTOPP_MEMALIGN_AVAILABLE)
-	while (!(p = (byte *)memalign(16, size)))
-#elif defined(CRYPTOPP_MALLOC_ALIGNMENT_IS_16)
-	while (!(p = (byte *)malloc(size)))
-#else
-	while (!(p = (byte *)malloc(size + 16)))
-#endif
-		CallNewHandler();
-
-#ifdef CRYPTOPP_NO_ALIGNED_ALLOC
-	size_t adjustment = 16-((size_t)p%16);
-	p += adjustment;
-	p[-1] = (byte)adjustment;
-#endif
-
-	assert(IsAlignedOn(p, 16));
-	return p;
-}
-
-void AlignedDeallocate(void *p)
-{
-#ifdef CRYPTOPP_MM_MALLOC_AVAILABLE
-	_mm_free(p);
-#elif defined(CRYPTOPP_NO_ALIGNED_ALLOC)
-	p = (byte *)p - ((byte *)p)[-1];
-	free(p);
-#else
-	free(p);
-#endif
-}
-
-#endif
-
-void * UnalignedAllocate(size_t size)
-{
-	void *p;
-	while (!(p = malloc(size)))
-		CallNewHandler();
-	return p;
-}
-
-void UnalignedDeallocate(void *p)
-{
-	free(p);
-}
-
-NAMESPACE_END
-
-#endif
-- 
cgit v1.2.3