From 68b55368fec7e4a236d94b01fa10b23b75bd4014 Mon Sep 17 00:00:00 2001
From: Mayank <mayankrathee.japan@gmail.com>
Date: Wed, 18 Sep 2019 18:41:10 +0530
Subject: [PATCH] Removed extra files

---
 Porthos/files/keyAC                           |    1 -
 Porthos/files/keyAD                           |    1 -
 Porthos/files/keyBC                           |    1 -
 Porthos/files/keyBD                           |    1 -
 Porthos/files/keyC                            |    1 -
 Porthos/files/keyCD                           |    1 -
 Porthos/mnist/MNISTParse.cpp                  |   25 -
 Porthos/mnist/MNISTParse.h                    |   89 --
 Porthos/mnist/globals.h                       |   16 -
 Porthos/mnist/makefile                        |   15 -
 Porthos/mnist/mnist_train_data                |    0
 Porthos/mnist/mnist_train_labels              |    0
 Porthos/mnist/run.sh                          |    7 -
 Porthos/party0.sh                             |    0
 Porthos/party1.sh                             |    0
 Porthos/party2.sh                             |    0
 .../src/example_neural_nets/network_config.h  |    2 +-
 Porthos/src/tools.h                           |    2 -
 Porthos/util/aes.h                            |   94 --
 Porthos/util/aes_core.cpp                     | 1358 -----------------
 Porthos/util/aes_locl.h                       |   89 --
 Porthos/util/cbitvector.cpp                   |  656 --------
 Porthos/util/cbitvector.h                     |  306 ----
 Porthos/util/main_gf_funcs.cpp                |  530 -------
 Porthos/util/main_gf_funcs.h                  |   34 -
 Porthos/util/sha1.cpp                         |  608 --------
 Porthos/util/sha1.h                           |  153 --
 Porthos/util/sha256.cpp                       |  169 --
 Porthos/util/sha256.h                         |   90 --
 Porthos/util/socket.h                         |  278 ----
 Porthos/util/thread.h                         |  253 ---
 Porthos/util/typedefs.h                       |  213 ---
 Porthos/util/utils.hpp                        |   47 -
 33 files changed, 1 insertion(+), 5039 deletions(-)
 delete mode 100644 Porthos/files/keyAC
 delete mode 100644 Porthos/files/keyAD
 delete mode 100644 Porthos/files/keyBC
 delete mode 100644 Porthos/files/keyBD
 delete mode 100644 Porthos/files/keyC
 delete mode 100644 Porthos/files/keyCD
 delete mode 100644 Porthos/mnist/MNISTParse.cpp
 delete mode 100644 Porthos/mnist/MNISTParse.h
 delete mode 100644 Porthos/mnist/globals.h
 delete mode 100644 Porthos/mnist/makefile
 delete mode 100644 Porthos/mnist/mnist_train_data
 delete mode 100644 Porthos/mnist/mnist_train_labels
 delete mode 100644 Porthos/mnist/run.sh
 mode change 100644 => 100755 Porthos/party0.sh
 mode change 100644 => 100755 Porthos/party1.sh
 mode change 100644 => 100755 Porthos/party2.sh
 delete mode 100644 Porthos/util/aes.h
 delete mode 100644 Porthos/util/aes_core.cpp
 delete mode 100644 Porthos/util/aes_locl.h
 delete mode 100644 Porthos/util/cbitvector.cpp
 delete mode 100644 Porthos/util/cbitvector.h
 delete mode 100644 Porthos/util/main_gf_funcs.cpp
 delete mode 100644 Porthos/util/main_gf_funcs.h
 delete mode 100644 Porthos/util/sha1.cpp
 delete mode 100644 Porthos/util/sha1.h
 delete mode 100644 Porthos/util/sha256.cpp
 delete mode 100644 Porthos/util/sha256.h
 delete mode 100644 Porthos/util/socket.h
 delete mode 100644 Porthos/util/thread.h
 delete mode 100644 Porthos/util/typedefs.h
 delete mode 100644 Porthos/util/utils.hpp

diff --git a/Porthos/files/keyAC b/Porthos/files/keyAC
deleted file mode 100644
index d86a60e..0000000
--- a/Porthos/files/keyAC
+++ /dev/null
@@ -1 +0,0 @@
-C038BDA962B7424B5098A503804E49FE
\ No newline at end of file
diff --git a/Porthos/files/keyAD b/Porthos/files/keyAD
deleted file mode 100644
index d86a60e..0000000
--- a/Porthos/files/keyAD
+++ /dev/null
@@ -1 +0,0 @@
-C038BDA962B7424B5098A503804E49FE
\ No newline at end of file
diff --git a/Porthos/files/keyBC b/Porthos/files/keyBC
deleted file mode 100644
index cdd9614..0000000
--- a/Porthos/files/keyBC
+++ /dev/null
@@ -1 +0,0 @@
-DC226B165C1125B44569163805ACA632
\ No newline at end of file
diff --git a/Porthos/files/keyBD b/Porthos/files/keyBD
deleted file mode 100644
index cdd9614..0000000
--- a/Porthos/files/keyBD
+++ /dev/null
@@ -1 +0,0 @@
-DC226B165C1125B44569163805ACA632
\ No newline at end of file
diff --git a/Porthos/files/keyC b/Porthos/files/keyC
deleted file mode 100644
index ff85602..0000000
--- a/Porthos/files/keyC
+++ /dev/null
@@ -1 +0,0 @@
-129CD8AF2822DD4A0499FD873CFBCBF4
\ No newline at end of file
diff --git a/Porthos/files/keyCD b/Porthos/files/keyCD
deleted file mode 100644
index cdd9614..0000000
--- a/Porthos/files/keyCD
+++ /dev/null
@@ -1 +0,0 @@
-DC226B165C1125B44569163805ACA632
\ No newline at end of file
diff --git a/Porthos/mnist/MNISTParse.cpp b/Porthos/mnist/MNISTParse.cpp
deleted file mode 100644
index 66e49c5..0000000
--- a/Porthos/mnist/MNISTParse.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-/* Parse MNIST data from CSV into tab delimited data.
-
-   Inputs: training file and testing file (label, data format)
-   Outputs: training data, training label, testing data, testing label.
-
-   Labels are in one hot encoding.
-*/
-
-
-#include "MNISTParse.h"
-using namespace std;
-
-
-int main(int argc, char** argv)
-{
-	if (argc != 3)
-		ERROR("Syntax: <program> <path-to-training-file> <path-to-testing-file>");
-
-    assert(0 == parse(argv[1], TRAINING));
-    assert(0 == parse(argv[2], TESTING));
-
-    return 0;
-}
\ No newline at end of file
diff --git a/Porthos/mnist/MNISTParse.h b/Porthos/mnist/MNISTParse.h
deleted file mode 100644
index cfccbd6..0000000
--- a/Porthos/mnist/MNISTParse.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-#pragma once
-#include "globals.h"
-#include <stdlib.h>
-#include <assert.h>
-#include <string.h>
-#include <iostream>
-#include <sstream>
-#include <fstream>
-using namespace std;
-
-
-void ERROR(string str)
-{
-	cout << "ERROR: " << str << endl;
-	exit(1); 
-}
-
-
-int parse(char* filename, string type)
-{
-	ifstream input_file(filename);
-	ofstream data_file;
-	ofstream label_file;
-	
-	string line;
-	int data_size;
-	int *inputs;
-
-	if (type == TRAINING)
-	{
-		data_size = TRAINING_DATA_SIZE;
-		data_file.open(TRAINING_DATA);
-		label_file.open(TRAINING_LABEL);
-	}
-	else if (type == TESTING)
-	{
-		data_size = TEST_DATA_SIZE;
-		data_file.open(TESTING_DATA);
-		label_file.open(TESTING_LABEL);
-	}
-	else
-		ERROR("parse() only accepts TRAINING/TESTING");
-
-	//Reading
-	inputs = new int [data_size * (INPUT_DIMENSION + 1)];
-	for (int row = 0; row < data_size; ++row)
-	{
-		getline(input_file, line);
-		stringstream lineStream(line);
-		string cell;
-								
-		for (int column = 0; column < INPUT_DIMENSION + 1; ++column)
-		{
-			getline(lineStream, cell, ',');
-			// if (!cell.empty())
-			inputs[row*(INPUT_DIMENSION+1) + column] = stoi(cell);
-		}
-	}
-
-	//Writing
-	for (int row = 0; row < data_size; ++row)
-	{
-		for (int column = 0; column < INPUT_DIMENSION; ++column)
-		{
-			data_file << inputs[row*(INPUT_DIMENSION+1) + column + 1] << "\t";
-		}
-		data_file << endl;
-	}
-
-	for (int row = 0; row < data_size; ++row)
-	{
-		for (int column = 0; column < OUTPUT_DIMENSION; ++column)
-		{
-			if (column == inputs[row*(INPUT_DIMENSION + 1)])
-				label_file << 1 << "\t";
-			else
-				label_file << 0 << "\t";
-		}
-		label_file << endl;
-	}
-
-	delete[] inputs;
-	input_file.close();
-	data_file.close();
-	label_file.close();
-
-	return 0;
-}
\ No newline at end of file
diff --git a/Porthos/mnist/globals.h b/Porthos/mnist/globals.h
deleted file mode 100644
index b369972..0000000
--- a/Porthos/mnist/globals.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-
-#define	TRAINING_LABEL "mnist_train_labels"
-#define TRAINING_DATA "mnist_train_data"
-#define	TESTING_LABEL "mnist_test_labels"
-#define TESTING_DATA "mnist_test_data"
-
-#define TRAINING "TRAINING"
-#define TESTING "TESTING"
-
-#define TRAINING_DATA_SIZE 60000
-#define TEST_DATA_SIZE 10000
-#define INPUT_DIMENSION 784
-#define OUTPUT_DIMENSION 10
-
diff --git a/Porthos/mnist/makefile b/Porthos/mnist/makefile
deleted file mode 100644
index a165457..0000000
--- a/Porthos/mnist/makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-
-CXX=g++
-RM=rm -f
-FLAGS=-std=c++11
-
-TARGET= build
-
-$(TARGET): MNISTParse.cpp MNISTParse.h globals.h
-	$(CXX) $(FLAGS) -o $(TARGET) MNISTParse.cpp
-
-clean:
-	$(RM) $(TARGET)
-
-superclean:
-	$(RM) mnist_*
\ No newline at end of file
diff --git a/Porthos/mnist/mnist_train_data b/Porthos/mnist/mnist_train_data
deleted file mode 100644
index e69de29..0000000
diff --git a/Porthos/mnist/mnist_train_labels b/Porthos/mnist/mnist_train_labels
deleted file mode 100644
index e69de29..0000000
diff --git a/Porthos/mnist/run.sh b/Porthos/mnist/run.sh
deleted file mode 100644
index 6b3bb5a..0000000
--- a/Porthos/mnist/run.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-make 
-
-./build ~/Downloads/mnist_train ~/Downloads/mnist_test
-
-make clean
diff --git a/Porthos/party0.sh b/Porthos/party0.sh
old mode 100644
new mode 100755
diff --git a/Porthos/party1.sh b/Porthos/party1.sh
old mode 100644
new mode 100755
diff --git a/Porthos/party2.sh b/Porthos/party2.sh
old mode 100644
new mode 100755
diff --git a/Porthos/src/example_neural_nets/network_config.h b/Porthos/src/example_neural_nets/network_config.h
index 733c90b..3556c45 100644
--- a/Porthos/src/example_neural_nets/network_config.h
+++ b/Porthos/src/example_neural_nets/network_config.h
@@ -1,6 +1,6 @@
 //Which network to run
 //New set of main files - choose which one to run
 
-// #define F_RESNET50
+//#define F_RESNET50
 //#define F_DENSENET121
 //#define F_SQUEEZENET_IMAGENET
diff --git a/Porthos/src/tools.h b/Porthos/src/tools.h
index ce8c1f9..2612d71 100644
--- a/Porthos/src/tools.h
+++ b/Porthos/src/tools.h
@@ -13,8 +13,6 @@
 #include <smmintrin.h>
 #include <vector>
 #include <time.h>
-#include "main_gf_funcs.h"
-// #include "../util/sha256.h"
 #include <string>
 #include <openssl/sha.h>
 #include <math.h>
diff --git a/Porthos/util/aes.h b/Porthos/util/aes.h
deleted file mode 100644
index e1cebcd..0000000
--- a/Porthos/util/aes.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* crypto/aes/aes.h -*- mode:C; c-file-style: "eay" -*- */
-/* ====================================================================
- * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- */
-
-#ifndef HEADER_AES_H
-#define HEADER_AES_H
-
-#include <stddef.h>
-
-#define AES_ENCRYPT	1
-#define AES_DECRYPT	0
-
-/* Because array size can't be a const in C, the following two are macros.
-   Both sizes are in bytes. */
-#define AES_MAXNR 14
-#define AES_BLOCK_SIZE 16
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* This should be a hidden type, but EVP requires that the size be known */
-struct aes_key_st {
-#ifdef AES_LONG
-    unsigned long rd_key[4 *(AES_MAXNR + 1)];
-#else
-    unsigned int rd_key[4 *(AES_MAXNR + 1)];
-#endif
-    int rounds;
-};
-typedef struct aes_key_st AES_KEY;
-
-int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-	AES_KEY *key);
-int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-	AES_KEY *key);
-
-void AES_encrypt(const unsigned char *in, unsigned char *out,
-	const AES_KEY *key);
-void AES_decrypt(const unsigned char *in, unsigned char *out,
-	const AES_KEY *key);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif /* !HEADER_AES_H */
diff --git a/Porthos/util/aes_core.cpp b/Porthos/util/aes_core.cpp
deleted file mode 100644
index 4898bbd..0000000
--- a/Porthos/util/aes_core.cpp
+++ /dev/null
@@ -1,1358 +0,0 @@
-/* crypto/aes/aes_core.c -*- mode:C; c-file-style: "eay" -*- */
-/**
- * rijndael-alg-fst.c
- *
- * @version 3.0 (December 2000)
- *
- * Optimised ANSI C code for the Rijndael cipher (now AES)
- *
- * @author Vincent Rijmen <vincent.rijmen@esat.kuleuven.ac.be>
- * @author Antoon Bosselaers <antoon.bosselaers@esat.kuleuven.ac.be>
- * @author Paulo Barreto <paulo.barreto@terra.com.br>
- *
- * This code is hereby placed in the public domain.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* Note: rewritten a little bit to provide error control and an OpenSSL-
-   compatible API */
-
-#ifndef AES_DEBUG
-# ifndef NDEBUG
-#  define NDEBUG
-# endif
-#endif
-#include <assert.h>
-
-#include <stdlib.h>
-#include "aes.h"
-#include "aes_locl.h"
-
-#ifndef AES_ASM
-/*
-Te0[x] = S [x].[02, 01, 01, 03];
-Te1[x] = S [x].[03, 02, 01, 01];
-Te2[x] = S [x].[01, 03, 02, 01];
-Te3[x] = S [x].[01, 01, 03, 02];
-
-Td0[x] = Si[x].[0e, 09, 0d, 0b];
-Td1[x] = Si[x].[0b, 0e, 09, 0d];
-Td2[x] = Si[x].[0d, 0b, 0e, 09];
-Td3[x] = Si[x].[09, 0d, 0b, 0e];
-Td4[x] = Si[x].[01];
-*/
-
-static const u32 Te0[256] = {
-    0xc66363a5U, 0xf87c7c84U, 0xee777799U, 0xf67b7b8dU,
-    0xfff2f20dU, 0xd66b6bbdU, 0xde6f6fb1U, 0x91c5c554U,
-    0x60303050U, 0x02010103U, 0xce6767a9U, 0x562b2b7dU,
-    0xe7fefe19U, 0xb5d7d762U, 0x4dababe6U, 0xec76769aU,
-    0x8fcaca45U, 0x1f82829dU, 0x89c9c940U, 0xfa7d7d87U,
-    0xeffafa15U, 0xb25959ebU, 0x8e4747c9U, 0xfbf0f00bU,
-    0x41adadecU, 0xb3d4d467U, 0x5fa2a2fdU, 0x45afafeaU,
-    0x239c9cbfU, 0x53a4a4f7U, 0xe4727296U, 0x9bc0c05bU,
-    0x75b7b7c2U, 0xe1fdfd1cU, 0x3d9393aeU, 0x4c26266aU,
-    0x6c36365aU, 0x7e3f3f41U, 0xf5f7f702U, 0x83cccc4fU,
-    0x6834345cU, 0x51a5a5f4U, 0xd1e5e534U, 0xf9f1f108U,
-    0xe2717193U, 0xabd8d873U, 0x62313153U, 0x2a15153fU,
-    0x0804040cU, 0x95c7c752U, 0x46232365U, 0x9dc3c35eU,
-    0x30181828U, 0x379696a1U, 0x0a05050fU, 0x2f9a9ab5U,
-    0x0e070709U, 0x24121236U, 0x1b80809bU, 0xdfe2e23dU,
-    0xcdebeb26U, 0x4e272769U, 0x7fb2b2cdU, 0xea75759fU,
-    0x1209091bU, 0x1d83839eU, 0x582c2c74U, 0x341a1a2eU,
-    0x361b1b2dU, 0xdc6e6eb2U, 0xb45a5aeeU, 0x5ba0a0fbU,
-    0xa45252f6U, 0x763b3b4dU, 0xb7d6d661U, 0x7db3b3ceU,
-    0x5229297bU, 0xdde3e33eU, 0x5e2f2f71U, 0x13848497U,
-    0xa65353f5U, 0xb9d1d168U, 0x00000000U, 0xc1eded2cU,
-    0x40202060U, 0xe3fcfc1fU, 0x79b1b1c8U, 0xb65b5bedU,
-    0xd46a6abeU, 0x8dcbcb46U, 0x67bebed9U, 0x7239394bU,
-    0x944a4adeU, 0x984c4cd4U, 0xb05858e8U, 0x85cfcf4aU,
-    0xbbd0d06bU, 0xc5efef2aU, 0x4faaaae5U, 0xedfbfb16U,
-    0x864343c5U, 0x9a4d4dd7U, 0x66333355U, 0x11858594U,
-    0x8a4545cfU, 0xe9f9f910U, 0x04020206U, 0xfe7f7f81U,
-    0xa05050f0U, 0x783c3c44U, 0x259f9fbaU, 0x4ba8a8e3U,
-    0xa25151f3U, 0x5da3a3feU, 0x804040c0U, 0x058f8f8aU,
-    0x3f9292adU, 0x219d9dbcU, 0x70383848U, 0xf1f5f504U,
-    0x63bcbcdfU, 0x77b6b6c1U, 0xafdada75U, 0x42212163U,
-    0x20101030U, 0xe5ffff1aU, 0xfdf3f30eU, 0xbfd2d26dU,
-    0x81cdcd4cU, 0x180c0c14U, 0x26131335U, 0xc3ecec2fU,
-    0xbe5f5fe1U, 0x359797a2U, 0x884444ccU, 0x2e171739U,
-    0x93c4c457U, 0x55a7a7f2U, 0xfc7e7e82U, 0x7a3d3d47U,
-    0xc86464acU, 0xba5d5de7U, 0x3219192bU, 0xe6737395U,
-    0xc06060a0U, 0x19818198U, 0x9e4f4fd1U, 0xa3dcdc7fU,
-    0x44222266U, 0x542a2a7eU, 0x3b9090abU, 0x0b888883U,
-    0x8c4646caU, 0xc7eeee29U, 0x6bb8b8d3U, 0x2814143cU,
-    0xa7dede79U, 0xbc5e5ee2U, 0x160b0b1dU, 0xaddbdb76U,
-    0xdbe0e03bU, 0x64323256U, 0x743a3a4eU, 0x140a0a1eU,
-    0x924949dbU, 0x0c06060aU, 0x4824246cU, 0xb85c5ce4U,
-    0x9fc2c25dU, 0xbdd3d36eU, 0x43acacefU, 0xc46262a6U,
-    0x399191a8U, 0x319595a4U, 0xd3e4e437U, 0xf279798bU,
-    0xd5e7e732U, 0x8bc8c843U, 0x6e373759U, 0xda6d6db7U,
-    0x018d8d8cU, 0xb1d5d564U, 0x9c4e4ed2U, 0x49a9a9e0U,
-    0xd86c6cb4U, 0xac5656faU, 0xf3f4f407U, 0xcfeaea25U,
-    0xca6565afU, 0xf47a7a8eU, 0x47aeaee9U, 0x10080818U,
-    0x6fbabad5U, 0xf0787888U, 0x4a25256fU, 0x5c2e2e72U,
-    0x381c1c24U, 0x57a6a6f1U, 0x73b4b4c7U, 0x97c6c651U,
-    0xcbe8e823U, 0xa1dddd7cU, 0xe874749cU, 0x3e1f1f21U,
-    0x964b4bddU, 0x61bdbddcU, 0x0d8b8b86U, 0x0f8a8a85U,
-    0xe0707090U, 0x7c3e3e42U, 0x71b5b5c4U, 0xcc6666aaU,
-    0x904848d8U, 0x06030305U, 0xf7f6f601U, 0x1c0e0e12U,
-    0xc26161a3U, 0x6a35355fU, 0xae5757f9U, 0x69b9b9d0U,
-    0x17868691U, 0x99c1c158U, 0x3a1d1d27U, 0x279e9eb9U,
-    0xd9e1e138U, 0xebf8f813U, 0x2b9898b3U, 0x22111133U,
-    0xd26969bbU, 0xa9d9d970U, 0x078e8e89U, 0x339494a7U,
-    0x2d9b9bb6U, 0x3c1e1e22U, 0x15878792U, 0xc9e9e920U,
-    0x87cece49U, 0xaa5555ffU, 0x50282878U, 0xa5dfdf7aU,
-    0x038c8c8fU, 0x59a1a1f8U, 0x09898980U, 0x1a0d0d17U,
-    0x65bfbfdaU, 0xd7e6e631U, 0x844242c6U, 0xd06868b8U,
-    0x824141c3U, 0x299999b0U, 0x5a2d2d77U, 0x1e0f0f11U,
-    0x7bb0b0cbU, 0xa85454fcU, 0x6dbbbbd6U, 0x2c16163aU,
-};
-static const u32 Te1[256] = {
-    0xa5c66363U, 0x84f87c7cU, 0x99ee7777U, 0x8df67b7bU,
-    0x0dfff2f2U, 0xbdd66b6bU, 0xb1de6f6fU, 0x5491c5c5U,
-    0x50603030U, 0x03020101U, 0xa9ce6767U, 0x7d562b2bU,
-    0x19e7fefeU, 0x62b5d7d7U, 0xe64dababU, 0x9aec7676U,
-    0x458fcacaU, 0x9d1f8282U, 0x4089c9c9U, 0x87fa7d7dU,
-    0x15effafaU, 0xebb25959U, 0xc98e4747U, 0x0bfbf0f0U,
-    0xec41adadU, 0x67b3d4d4U, 0xfd5fa2a2U, 0xea45afafU,
-    0xbf239c9cU, 0xf753a4a4U, 0x96e47272U, 0x5b9bc0c0U,
-    0xc275b7b7U, 0x1ce1fdfdU, 0xae3d9393U, 0x6a4c2626U,
-    0x5a6c3636U, 0x417e3f3fU, 0x02f5f7f7U, 0x4f83ccccU,
-    0x5c683434U, 0xf451a5a5U, 0x34d1e5e5U, 0x08f9f1f1U,
-    0x93e27171U, 0x73abd8d8U, 0x53623131U, 0x3f2a1515U,
-    0x0c080404U, 0x5295c7c7U, 0x65462323U, 0x5e9dc3c3U,
-    0x28301818U, 0xa1379696U, 0x0f0a0505U, 0xb52f9a9aU,
-    0x090e0707U, 0x36241212U, 0x9b1b8080U, 0x3ddfe2e2U,
-    0x26cdebebU, 0x694e2727U, 0xcd7fb2b2U, 0x9fea7575U,
-    0x1b120909U, 0x9e1d8383U, 0x74582c2cU, 0x2e341a1aU,
-    0x2d361b1bU, 0xb2dc6e6eU, 0xeeb45a5aU, 0xfb5ba0a0U,
-    0xf6a45252U, 0x4d763b3bU, 0x61b7d6d6U, 0xce7db3b3U,
-    0x7b522929U, 0x3edde3e3U, 0x715e2f2fU, 0x97138484U,
-    0xf5a65353U, 0x68b9d1d1U, 0x00000000U, 0x2cc1ededU,
-    0x60402020U, 0x1fe3fcfcU, 0xc879b1b1U, 0xedb65b5bU,
-    0xbed46a6aU, 0x468dcbcbU, 0xd967bebeU, 0x4b723939U,
-    0xde944a4aU, 0xd4984c4cU, 0xe8b05858U, 0x4a85cfcfU,
-    0x6bbbd0d0U, 0x2ac5efefU, 0xe54faaaaU, 0x16edfbfbU,
-    0xc5864343U, 0xd79a4d4dU, 0x55663333U, 0x94118585U,
-    0xcf8a4545U, 0x10e9f9f9U, 0x06040202U, 0x81fe7f7fU,
-    0xf0a05050U, 0x44783c3cU, 0xba259f9fU, 0xe34ba8a8U,
-    0xf3a25151U, 0xfe5da3a3U, 0xc0804040U, 0x8a058f8fU,
-    0xad3f9292U, 0xbc219d9dU, 0x48703838U, 0x04f1f5f5U,
-    0xdf63bcbcU, 0xc177b6b6U, 0x75afdadaU, 0x63422121U,
-    0x30201010U, 0x1ae5ffffU, 0x0efdf3f3U, 0x6dbfd2d2U,
-    0x4c81cdcdU, 0x14180c0cU, 0x35261313U, 0x2fc3ececU,
-    0xe1be5f5fU, 0xa2359797U, 0xcc884444U, 0x392e1717U,
-    0x5793c4c4U, 0xf255a7a7U, 0x82fc7e7eU, 0x477a3d3dU,
-    0xacc86464U, 0xe7ba5d5dU, 0x2b321919U, 0x95e67373U,
-    0xa0c06060U, 0x98198181U, 0xd19e4f4fU, 0x7fa3dcdcU,
-    0x66442222U, 0x7e542a2aU, 0xab3b9090U, 0x830b8888U,
-    0xca8c4646U, 0x29c7eeeeU, 0xd36bb8b8U, 0x3c281414U,
-    0x79a7dedeU, 0xe2bc5e5eU, 0x1d160b0bU, 0x76addbdbU,
-    0x3bdbe0e0U, 0x56643232U, 0x4e743a3aU, 0x1e140a0aU,
-    0xdb924949U, 0x0a0c0606U, 0x6c482424U, 0xe4b85c5cU,
-    0x5d9fc2c2U, 0x6ebdd3d3U, 0xef43acacU, 0xa6c46262U,
-    0xa8399191U, 0xa4319595U, 0x37d3e4e4U, 0x8bf27979U,
-    0x32d5e7e7U, 0x438bc8c8U, 0x596e3737U, 0xb7da6d6dU,
-    0x8c018d8dU, 0x64b1d5d5U, 0xd29c4e4eU, 0xe049a9a9U,
-    0xb4d86c6cU, 0xfaac5656U, 0x07f3f4f4U, 0x25cfeaeaU,
-    0xafca6565U, 0x8ef47a7aU, 0xe947aeaeU, 0x18100808U,
-    0xd56fbabaU, 0x88f07878U, 0x6f4a2525U, 0x725c2e2eU,
-    0x24381c1cU, 0xf157a6a6U, 0xc773b4b4U, 0x5197c6c6U,
-    0x23cbe8e8U, 0x7ca1ddddU, 0x9ce87474U, 0x213e1f1fU,
-    0xdd964b4bU, 0xdc61bdbdU, 0x860d8b8bU, 0x850f8a8aU,
-    0x90e07070U, 0x427c3e3eU, 0xc471b5b5U, 0xaacc6666U,
-    0xd8904848U, 0x05060303U, 0x01f7f6f6U, 0x121c0e0eU,
-    0xa3c26161U, 0x5f6a3535U, 0xf9ae5757U, 0xd069b9b9U,
-    0x91178686U, 0x5899c1c1U, 0x273a1d1dU, 0xb9279e9eU,
-    0x38d9e1e1U, 0x13ebf8f8U, 0xb32b9898U, 0x33221111U,
-    0xbbd26969U, 0x70a9d9d9U, 0x89078e8eU, 0xa7339494U,
-    0xb62d9b9bU, 0x223c1e1eU, 0x92158787U, 0x20c9e9e9U,
-    0x4987ceceU, 0xffaa5555U, 0x78502828U, 0x7aa5dfdfU,
-    0x8f038c8cU, 0xf859a1a1U, 0x80098989U, 0x171a0d0dU,
-    0xda65bfbfU, 0x31d7e6e6U, 0xc6844242U, 0xb8d06868U,
-    0xc3824141U, 0xb0299999U, 0x775a2d2dU, 0x111e0f0fU,
-    0xcb7bb0b0U, 0xfca85454U, 0xd66dbbbbU, 0x3a2c1616U,
-};
-static const u32 Te2[256] = {
-    0x63a5c663U, 0x7c84f87cU, 0x7799ee77U, 0x7b8df67bU,
-    0xf20dfff2U, 0x6bbdd66bU, 0x6fb1de6fU, 0xc55491c5U,
-    0x30506030U, 0x01030201U, 0x67a9ce67U, 0x2b7d562bU,
-    0xfe19e7feU, 0xd762b5d7U, 0xabe64dabU, 0x769aec76U,
-    0xca458fcaU, 0x829d1f82U, 0xc94089c9U, 0x7d87fa7dU,
-    0xfa15effaU, 0x59ebb259U, 0x47c98e47U, 0xf00bfbf0U,
-    0xadec41adU, 0xd467b3d4U, 0xa2fd5fa2U, 0xafea45afU,
-    0x9cbf239cU, 0xa4f753a4U, 0x7296e472U, 0xc05b9bc0U,
-    0xb7c275b7U, 0xfd1ce1fdU, 0x93ae3d93U, 0x266a4c26U,
-    0x365a6c36U, 0x3f417e3fU, 0xf702f5f7U, 0xcc4f83ccU,
-    0x345c6834U, 0xa5f451a5U, 0xe534d1e5U, 0xf108f9f1U,
-    0x7193e271U, 0xd873abd8U, 0x31536231U, 0x153f2a15U,
-    0x040c0804U, 0xc75295c7U, 0x23654623U, 0xc35e9dc3U,
-    0x18283018U, 0x96a13796U, 0x050f0a05U, 0x9ab52f9aU,
-    0x07090e07U, 0x12362412U, 0x809b1b80U, 0xe23ddfe2U,
-    0xeb26cdebU, 0x27694e27U, 0xb2cd7fb2U, 0x759fea75U,
-    0x091b1209U, 0x839e1d83U, 0x2c74582cU, 0x1a2e341aU,
-    0x1b2d361bU, 0x6eb2dc6eU, 0x5aeeb45aU, 0xa0fb5ba0U,
-    0x52f6a452U, 0x3b4d763bU, 0xd661b7d6U, 0xb3ce7db3U,
-    0x297b5229U, 0xe33edde3U, 0x2f715e2fU, 0x84971384U,
-    0x53f5a653U, 0xd168b9d1U, 0x00000000U, 0xed2cc1edU,
-    0x20604020U, 0xfc1fe3fcU, 0xb1c879b1U, 0x5bedb65bU,
-    0x6abed46aU, 0xcb468dcbU, 0xbed967beU, 0x394b7239U,
-    0x4ade944aU, 0x4cd4984cU, 0x58e8b058U, 0xcf4a85cfU,
-    0xd06bbbd0U, 0xef2ac5efU, 0xaae54faaU, 0xfb16edfbU,
-    0x43c58643U, 0x4dd79a4dU, 0x33556633U, 0x85941185U,
-    0x45cf8a45U, 0xf910e9f9U, 0x02060402U, 0x7f81fe7fU,
-    0x50f0a050U, 0x3c44783cU, 0x9fba259fU, 0xa8e34ba8U,
-    0x51f3a251U, 0xa3fe5da3U, 0x40c08040U, 0x8f8a058fU,
-    0x92ad3f92U, 0x9dbc219dU, 0x38487038U, 0xf504f1f5U,
-    0xbcdf63bcU, 0xb6c177b6U, 0xda75afdaU, 0x21634221U,
-    0x10302010U, 0xff1ae5ffU, 0xf30efdf3U, 0xd26dbfd2U,
-    0xcd4c81cdU, 0x0c14180cU, 0x13352613U, 0xec2fc3ecU,
-    0x5fe1be5fU, 0x97a23597U, 0x44cc8844U, 0x17392e17U,
-    0xc45793c4U, 0xa7f255a7U, 0x7e82fc7eU, 0x3d477a3dU,
-    0x64acc864U, 0x5de7ba5dU, 0x192b3219U, 0x7395e673U,
-    0x60a0c060U, 0x81981981U, 0x4fd19e4fU, 0xdc7fa3dcU,
-    0x22664422U, 0x2a7e542aU, 0x90ab3b90U, 0x88830b88U,
-    0x46ca8c46U, 0xee29c7eeU, 0xb8d36bb8U, 0x143c2814U,
-    0xde79a7deU, 0x5ee2bc5eU, 0x0b1d160bU, 0xdb76addbU,
-    0xe03bdbe0U, 0x32566432U, 0x3a4e743aU, 0x0a1e140aU,
-    0x49db9249U, 0x060a0c06U, 0x246c4824U, 0x5ce4b85cU,
-    0xc25d9fc2U, 0xd36ebdd3U, 0xacef43acU, 0x62a6c462U,
-    0x91a83991U, 0x95a43195U, 0xe437d3e4U, 0x798bf279U,
-    0xe732d5e7U, 0xc8438bc8U, 0x37596e37U, 0x6db7da6dU,
-    0x8d8c018dU, 0xd564b1d5U, 0x4ed29c4eU, 0xa9e049a9U,
-    0x6cb4d86cU, 0x56faac56U, 0xf407f3f4U, 0xea25cfeaU,
-    0x65afca65U, 0x7a8ef47aU, 0xaee947aeU, 0x08181008U,
-    0xbad56fbaU, 0x7888f078U, 0x256f4a25U, 0x2e725c2eU,
-    0x1c24381cU, 0xa6f157a6U, 0xb4c773b4U, 0xc65197c6U,
-    0xe823cbe8U, 0xdd7ca1ddU, 0x749ce874U, 0x1f213e1fU,
-    0x4bdd964bU, 0xbddc61bdU, 0x8b860d8bU, 0x8a850f8aU,
-    0x7090e070U, 0x3e427c3eU, 0xb5c471b5U, 0x66aacc66U,
-    0x48d89048U, 0x03050603U, 0xf601f7f6U, 0x0e121c0eU,
-    0x61a3c261U, 0x355f6a35U, 0x57f9ae57U, 0xb9d069b9U,
-    0x86911786U, 0xc15899c1U, 0x1d273a1dU, 0x9eb9279eU,
-    0xe138d9e1U, 0xf813ebf8U, 0x98b32b98U, 0x11332211U,
-    0x69bbd269U, 0xd970a9d9U, 0x8e89078eU, 0x94a73394U,
-    0x9bb62d9bU, 0x1e223c1eU, 0x87921587U, 0xe920c9e9U,
-    0xce4987ceU, 0x55ffaa55U, 0x28785028U, 0xdf7aa5dfU,
-    0x8c8f038cU, 0xa1f859a1U, 0x89800989U, 0x0d171a0dU,
-    0xbfda65bfU, 0xe631d7e6U, 0x42c68442U, 0x68b8d068U,
-    0x41c38241U, 0x99b02999U, 0x2d775a2dU, 0x0f111e0fU,
-    0xb0cb7bb0U, 0x54fca854U, 0xbbd66dbbU, 0x163a2c16U,
-};
-static const u32 Te3[256] = {
-    0x6363a5c6U, 0x7c7c84f8U, 0x777799eeU, 0x7b7b8df6U,
-    0xf2f20dffU, 0x6b6bbdd6U, 0x6f6fb1deU, 0xc5c55491U,
-    0x30305060U, 0x01010302U, 0x6767a9ceU, 0x2b2b7d56U,
-    0xfefe19e7U, 0xd7d762b5U, 0xababe64dU, 0x76769aecU,
-    0xcaca458fU, 0x82829d1fU, 0xc9c94089U, 0x7d7d87faU,
-    0xfafa15efU, 0x5959ebb2U, 0x4747c98eU, 0xf0f00bfbU,
-    0xadadec41U, 0xd4d467b3U, 0xa2a2fd5fU, 0xafafea45U,
-    0x9c9cbf23U, 0xa4a4f753U, 0x727296e4U, 0xc0c05b9bU,
-    0xb7b7c275U, 0xfdfd1ce1U, 0x9393ae3dU, 0x26266a4cU,
-    0x36365a6cU, 0x3f3f417eU, 0xf7f702f5U, 0xcccc4f83U,
-    0x34345c68U, 0xa5a5f451U, 0xe5e534d1U, 0xf1f108f9U,
-    0x717193e2U, 0xd8d873abU, 0x31315362U, 0x15153f2aU,
-    0x04040c08U, 0xc7c75295U, 0x23236546U, 0xc3c35e9dU,
-    0x18182830U, 0x9696a137U, 0x05050f0aU, 0x9a9ab52fU,
-    0x0707090eU, 0x12123624U, 0x80809b1bU, 0xe2e23ddfU,
-    0xebeb26cdU, 0x2727694eU, 0xb2b2cd7fU, 0x75759feaU,
-    0x09091b12U, 0x83839e1dU, 0x2c2c7458U, 0x1a1a2e34U,
-    0x1b1b2d36U, 0x6e6eb2dcU, 0x5a5aeeb4U, 0xa0a0fb5bU,
-    0x5252f6a4U, 0x3b3b4d76U, 0xd6d661b7U, 0xb3b3ce7dU,
-    0x29297b52U, 0xe3e33eddU, 0x2f2f715eU, 0x84849713U,
-    0x5353f5a6U, 0xd1d168b9U, 0x00000000U, 0xeded2cc1U,
-    0x20206040U, 0xfcfc1fe3U, 0xb1b1c879U, 0x5b5bedb6U,
-    0x6a6abed4U, 0xcbcb468dU, 0xbebed967U, 0x39394b72U,
-    0x4a4ade94U, 0x4c4cd498U, 0x5858e8b0U, 0xcfcf4a85U,
-    0xd0d06bbbU, 0xefef2ac5U, 0xaaaae54fU, 0xfbfb16edU,
-    0x4343c586U, 0x4d4dd79aU, 0x33335566U, 0x85859411U,
-    0x4545cf8aU, 0xf9f910e9U, 0x02020604U, 0x7f7f81feU,
-    0x5050f0a0U, 0x3c3c4478U, 0x9f9fba25U, 0xa8a8e34bU,
-    0x5151f3a2U, 0xa3a3fe5dU, 0x4040c080U, 0x8f8f8a05U,
-    0x9292ad3fU, 0x9d9dbc21U, 0x38384870U, 0xf5f504f1U,
-    0xbcbcdf63U, 0xb6b6c177U, 0xdada75afU, 0x21216342U,
-    0x10103020U, 0xffff1ae5U, 0xf3f30efdU, 0xd2d26dbfU,
-    0xcdcd4c81U, 0x0c0c1418U, 0x13133526U, 0xecec2fc3U,
-    0x5f5fe1beU, 0x9797a235U, 0x4444cc88U, 0x1717392eU,
-    0xc4c45793U, 0xa7a7f255U, 0x7e7e82fcU, 0x3d3d477aU,
-    0x6464acc8U, 0x5d5de7baU, 0x19192b32U, 0x737395e6U,
-    0x6060a0c0U, 0x81819819U, 0x4f4fd19eU, 0xdcdc7fa3U,
-    0x22226644U, 0x2a2a7e54U, 0x9090ab3bU, 0x8888830bU,
-    0x4646ca8cU, 0xeeee29c7U, 0xb8b8d36bU, 0x14143c28U,
-    0xdede79a7U, 0x5e5ee2bcU, 0x0b0b1d16U, 0xdbdb76adU,
-    0xe0e03bdbU, 0x32325664U, 0x3a3a4e74U, 0x0a0a1e14U,
-    0x4949db92U, 0x06060a0cU, 0x24246c48U, 0x5c5ce4b8U,
-    0xc2c25d9fU, 0xd3d36ebdU, 0xacacef43U, 0x6262a6c4U,
-    0x9191a839U, 0x9595a431U, 0xe4e437d3U, 0x79798bf2U,
-    0xe7e732d5U, 0xc8c8438bU, 0x3737596eU, 0x6d6db7daU,
-    0x8d8d8c01U, 0xd5d564b1U, 0x4e4ed29cU, 0xa9a9e049U,
-    0x6c6cb4d8U, 0x5656faacU, 0xf4f407f3U, 0xeaea25cfU,
-    0x6565afcaU, 0x7a7a8ef4U, 0xaeaee947U, 0x08081810U,
-    0xbabad56fU, 0x787888f0U, 0x25256f4aU, 0x2e2e725cU,
-    0x1c1c2438U, 0xa6a6f157U, 0xb4b4c773U, 0xc6c65197U,
-    0xe8e823cbU, 0xdddd7ca1U, 0x74749ce8U, 0x1f1f213eU,
-    0x4b4bdd96U, 0xbdbddc61U, 0x8b8b860dU, 0x8a8a850fU,
-    0x707090e0U, 0x3e3e427cU, 0xb5b5c471U, 0x6666aaccU,
-    0x4848d890U, 0x03030506U, 0xf6f601f7U, 0x0e0e121cU,
-    0x6161a3c2U, 0x35355f6aU, 0x5757f9aeU, 0xb9b9d069U,
-    0x86869117U, 0xc1c15899U, 0x1d1d273aU, 0x9e9eb927U,
-    0xe1e138d9U, 0xf8f813ebU, 0x9898b32bU, 0x11113322U,
-    0x6969bbd2U, 0xd9d970a9U, 0x8e8e8907U, 0x9494a733U,
-    0x9b9bb62dU, 0x1e1e223cU, 0x87879215U, 0xe9e920c9U,
-    0xcece4987U, 0x5555ffaaU, 0x28287850U, 0xdfdf7aa5U,
-    0x8c8c8f03U, 0xa1a1f859U, 0x89898009U, 0x0d0d171aU,
-    0xbfbfda65U, 0xe6e631d7U, 0x4242c684U, 0x6868b8d0U,
-    0x4141c382U, 0x9999b029U, 0x2d2d775aU, 0x0f0f111eU,
-    0xb0b0cb7bU, 0x5454fca8U, 0xbbbbd66dU, 0x16163a2cU,
-};
-
-static const u32 Td0[256] = {
-    0x51f4a750U, 0x7e416553U, 0x1a17a4c3U, 0x3a275e96U,
-    0x3bab6bcbU, 0x1f9d45f1U, 0xacfa58abU, 0x4be30393U,
-    0x2030fa55U, 0xad766df6U, 0x88cc7691U, 0xf5024c25U,
-    0x4fe5d7fcU, 0xc52acbd7U, 0x26354480U, 0xb562a38fU,
-    0xdeb15a49U, 0x25ba1b67U, 0x45ea0e98U, 0x5dfec0e1U,
-    0xc32f7502U, 0x814cf012U, 0x8d4697a3U, 0x6bd3f9c6U,
-    0x038f5fe7U, 0x15929c95U, 0xbf6d7aebU, 0x955259daU,
-    0xd4be832dU, 0x587421d3U, 0x49e06929U, 0x8ec9c844U,
-    0x75c2896aU, 0xf48e7978U, 0x99583e6bU, 0x27b971ddU,
-    0xbee14fb6U, 0xf088ad17U, 0xc920ac66U, 0x7dce3ab4U,
-    0x63df4a18U, 0xe51a3182U, 0x97513360U, 0x62537f45U,
-    0xb16477e0U, 0xbb6bae84U, 0xfe81a01cU, 0xf9082b94U,
-    0x70486858U, 0x8f45fd19U, 0x94de6c87U, 0x527bf8b7U,
-    0xab73d323U, 0x724b02e2U, 0xe31f8f57U, 0x6655ab2aU,
-    0xb2eb2807U, 0x2fb5c203U, 0x86c57b9aU, 0xd33708a5U,
-    0x302887f2U, 0x23bfa5b2U, 0x02036abaU, 0xed16825cU,
-    0x8acf1c2bU, 0xa779b492U, 0xf307f2f0U, 0x4e69e2a1U,
-    0x65daf4cdU, 0x0605bed5U, 0xd134621fU, 0xc4a6fe8aU,
-    0x342e539dU, 0xa2f355a0U, 0x058ae132U, 0xa4f6eb75U,
-    0x0b83ec39U, 0x4060efaaU, 0x5e719f06U, 0xbd6e1051U,
-    0x3e218af9U, 0x96dd063dU, 0xdd3e05aeU, 0x4de6bd46U,
-    0x91548db5U, 0x71c45d05U, 0x0406d46fU, 0x605015ffU,
-    0x1998fb24U, 0xd6bde997U, 0x894043ccU, 0x67d99e77U,
-    0xb0e842bdU, 0x07898b88U, 0xe7195b38U, 0x79c8eedbU,
-    0xa17c0a47U, 0x7c420fe9U, 0xf8841ec9U, 0x00000000U,
-    0x09808683U, 0x322bed48U, 0x1e1170acU, 0x6c5a724eU,
-    0xfd0efffbU, 0x0f853856U, 0x3daed51eU, 0x362d3927U,
-    0x0a0fd964U, 0x685ca621U, 0x9b5b54d1U, 0x24362e3aU,
-    0x0c0a67b1U, 0x9357e70fU, 0xb4ee96d2U, 0x1b9b919eU,
-    0x80c0c54fU, 0x61dc20a2U, 0x5a774b69U, 0x1c121a16U,
-    0xe293ba0aU, 0xc0a02ae5U, 0x3c22e043U, 0x121b171dU,
-    0x0e090d0bU, 0xf28bc7adU, 0x2db6a8b9U, 0x141ea9c8U,
-    0x57f11985U, 0xaf75074cU, 0xee99ddbbU, 0xa37f60fdU,
-    0xf701269fU, 0x5c72f5bcU, 0x44663bc5U, 0x5bfb7e34U,
-    0x8b432976U, 0xcb23c6dcU, 0xb6edfc68U, 0xb8e4f163U,
-    0xd731dccaU, 0x42638510U, 0x13972240U, 0x84c61120U,
-    0x854a247dU, 0xd2bb3df8U, 0xaef93211U, 0xc729a16dU,
-    0x1d9e2f4bU, 0xdcb230f3U, 0x0d8652ecU, 0x77c1e3d0U,
-    0x2bb3166cU, 0xa970b999U, 0x119448faU, 0x47e96422U,
-    0xa8fc8cc4U, 0xa0f03f1aU, 0x567d2cd8U, 0x223390efU,
-    0x87494ec7U, 0xd938d1c1U, 0x8ccaa2feU, 0x98d40b36U,
-    0xa6f581cfU, 0xa57ade28U, 0xdab78e26U, 0x3fadbfa4U,
-    0x2c3a9de4U, 0x5078920dU, 0x6a5fcc9bU, 0x547e4662U,
-    0xf68d13c2U, 0x90d8b8e8U, 0x2e39f75eU, 0x82c3aff5U,
-    0x9f5d80beU, 0x69d0937cU, 0x6fd52da9U, 0xcf2512b3U,
-    0xc8ac993bU, 0x10187da7U, 0xe89c636eU, 0xdb3bbb7bU,
-    0xcd267809U, 0x6e5918f4U, 0xec9ab701U, 0x834f9aa8U,
-    0xe6956e65U, 0xaaffe67eU, 0x21bccf08U, 0xef15e8e6U,
-    0xbae79bd9U, 0x4a6f36ceU, 0xea9f09d4U, 0x29b07cd6U,
-    0x31a4b2afU, 0x2a3f2331U, 0xc6a59430U, 0x35a266c0U,
-    0x744ebc37U, 0xfc82caa6U, 0xe090d0b0U, 0x33a7d815U,
-    0xf104984aU, 0x41ecdaf7U, 0x7fcd500eU, 0x1791f62fU,
-    0x764dd68dU, 0x43efb04dU, 0xccaa4d54U, 0xe49604dfU,
-    0x9ed1b5e3U, 0x4c6a881bU, 0xc12c1fb8U, 0x4665517fU,
-    0x9d5eea04U, 0x018c355dU, 0xfa877473U, 0xfb0b412eU,
-    0xb3671d5aU, 0x92dbd252U, 0xe9105633U, 0x6dd64713U,
-    0x9ad7618cU, 0x37a10c7aU, 0x59f8148eU, 0xeb133c89U,
-    0xcea927eeU, 0xb761c935U, 0xe11ce5edU, 0x7a47b13cU,
-    0x9cd2df59U, 0x55f2733fU, 0x1814ce79U, 0x73c737bfU,
-    0x53f7cdeaU, 0x5ffdaa5bU, 0xdf3d6f14U, 0x7844db86U,
-    0xcaaff381U, 0xb968c43eU, 0x3824342cU, 0xc2a3405fU,
-    0x161dc372U, 0xbce2250cU, 0x283c498bU, 0xff0d9541U,
-    0x39a80171U, 0x080cb3deU, 0xd8b4e49cU, 0x6456c190U,
-    0x7bcb8461U, 0xd532b670U, 0x486c5c74U, 0xd0b85742U,
-};
-static const u32 Td1[256] = {
-    0x5051f4a7U, 0x537e4165U, 0xc31a17a4U, 0x963a275eU,
-    0xcb3bab6bU, 0xf11f9d45U, 0xabacfa58U, 0x934be303U,
-    0x552030faU, 0xf6ad766dU, 0x9188cc76U, 0x25f5024cU,
-    0xfc4fe5d7U, 0xd7c52acbU, 0x80263544U, 0x8fb562a3U,
-    0x49deb15aU, 0x6725ba1bU, 0x9845ea0eU, 0xe15dfec0U,
-    0x02c32f75U, 0x12814cf0U, 0xa38d4697U, 0xc66bd3f9U,
-    0xe7038f5fU, 0x9515929cU, 0xebbf6d7aU, 0xda955259U,
-    0x2dd4be83U, 0xd3587421U, 0x2949e069U, 0x448ec9c8U,
-    0x6a75c289U, 0x78f48e79U, 0x6b99583eU, 0xdd27b971U,
-    0xb6bee14fU, 0x17f088adU, 0x66c920acU, 0xb47dce3aU,
-    0x1863df4aU, 0x82e51a31U, 0x60975133U, 0x4562537fU,
-    0xe0b16477U, 0x84bb6baeU, 0x1cfe81a0U, 0x94f9082bU,
-    0x58704868U, 0x198f45fdU, 0x8794de6cU, 0xb7527bf8U,
-    0x23ab73d3U, 0xe2724b02U, 0x57e31f8fU, 0x2a6655abU,
-    0x07b2eb28U, 0x032fb5c2U, 0x9a86c57bU, 0xa5d33708U,
-    0xf2302887U, 0xb223bfa5U, 0xba02036aU, 0x5ced1682U,
-    0x2b8acf1cU, 0x92a779b4U, 0xf0f307f2U, 0xa14e69e2U,
-    0xcd65daf4U, 0xd50605beU, 0x1fd13462U, 0x8ac4a6feU,
-    0x9d342e53U, 0xa0a2f355U, 0x32058ae1U, 0x75a4f6ebU,
-    0x390b83ecU, 0xaa4060efU, 0x065e719fU, 0x51bd6e10U,
-    0xf93e218aU, 0x3d96dd06U, 0xaedd3e05U, 0x464de6bdU,
-    0xb591548dU, 0x0571c45dU, 0x6f0406d4U, 0xff605015U,
-    0x241998fbU, 0x97d6bde9U, 0xcc894043U, 0x7767d99eU,
-    0xbdb0e842U, 0x8807898bU, 0x38e7195bU, 0xdb79c8eeU,
-    0x47a17c0aU, 0xe97c420fU, 0xc9f8841eU, 0x00000000U,
-    0x83098086U, 0x48322bedU, 0xac1e1170U, 0x4e6c5a72U,
-    0xfbfd0effU, 0x560f8538U, 0x1e3daed5U, 0x27362d39U,
-    0x640a0fd9U, 0x21685ca6U, 0xd19b5b54U, 0x3a24362eU,
-    0xb10c0a67U, 0x0f9357e7U, 0xd2b4ee96U, 0x9e1b9b91U,
-    0x4f80c0c5U, 0xa261dc20U, 0x695a774bU, 0x161c121aU,
-    0x0ae293baU, 0xe5c0a02aU, 0x433c22e0U, 0x1d121b17U,
-    0x0b0e090dU, 0xadf28bc7U, 0xb92db6a8U, 0xc8141ea9U,
-    0x8557f119U, 0x4caf7507U, 0xbbee99ddU, 0xfda37f60U,
-    0x9ff70126U, 0xbc5c72f5U, 0xc544663bU, 0x345bfb7eU,
-    0x768b4329U, 0xdccb23c6U, 0x68b6edfcU, 0x63b8e4f1U,
-    0xcad731dcU, 0x10426385U, 0x40139722U, 0x2084c611U,
-    0x7d854a24U, 0xf8d2bb3dU, 0x11aef932U, 0x6dc729a1U,
-    0x4b1d9e2fU, 0xf3dcb230U, 0xec0d8652U, 0xd077c1e3U,
-    0x6c2bb316U, 0x99a970b9U, 0xfa119448U, 0x2247e964U,
-    0xc4a8fc8cU, 0x1aa0f03fU, 0xd8567d2cU, 0xef223390U,
-    0xc787494eU, 0xc1d938d1U, 0xfe8ccaa2U, 0x3698d40bU,
-    0xcfa6f581U, 0x28a57adeU, 0x26dab78eU, 0xa43fadbfU,
-    0xe42c3a9dU, 0x0d507892U, 0x9b6a5fccU, 0x62547e46U,
-    0xc2f68d13U, 0xe890d8b8U, 0x5e2e39f7U, 0xf582c3afU,
-    0xbe9f5d80U, 0x7c69d093U, 0xa96fd52dU, 0xb3cf2512U,
-    0x3bc8ac99U, 0xa710187dU, 0x6ee89c63U, 0x7bdb3bbbU,
-    0x09cd2678U, 0xf46e5918U, 0x01ec9ab7U, 0xa8834f9aU,
-    0x65e6956eU, 0x7eaaffe6U, 0x0821bccfU, 0xe6ef15e8U,
-    0xd9bae79bU, 0xce4a6f36U, 0xd4ea9f09U, 0xd629b07cU,
-    0xaf31a4b2U, 0x312a3f23U, 0x30c6a594U, 0xc035a266U,
-    0x37744ebcU, 0xa6fc82caU, 0xb0e090d0U, 0x1533a7d8U,
-    0x4af10498U, 0xf741ecdaU, 0x0e7fcd50U, 0x2f1791f6U,
-    0x8d764dd6U, 0x4d43efb0U, 0x54ccaa4dU, 0xdfe49604U,
-    0xe39ed1b5U, 0x1b4c6a88U, 0xb8c12c1fU, 0x7f466551U,
-    0x049d5eeaU, 0x5d018c35U, 0x73fa8774U, 0x2efb0b41U,
-    0x5ab3671dU, 0x5292dbd2U, 0x33e91056U, 0x136dd647U,
-    0x8c9ad761U, 0x7a37a10cU, 0x8e59f814U, 0x89eb133cU,
-    0xeecea927U, 0x35b761c9U, 0xede11ce5U, 0x3c7a47b1U,
-    0x599cd2dfU, 0x3f55f273U, 0x791814ceU, 0xbf73c737U,
-    0xea53f7cdU, 0x5b5ffdaaU, 0x14df3d6fU, 0x867844dbU,
-    0x81caaff3U, 0x3eb968c4U, 0x2c382434U, 0x5fc2a340U,
-    0x72161dc3U, 0x0cbce225U, 0x8b283c49U, 0x41ff0d95U,
-    0x7139a801U, 0xde080cb3U, 0x9cd8b4e4U, 0x906456c1U,
-    0x617bcb84U, 0x70d532b6U, 0x74486c5cU, 0x42d0b857U,
-};
-static const u32 Td2[256] = {
-    0xa75051f4U, 0x65537e41U, 0xa4c31a17U, 0x5e963a27U,
-    0x6bcb3babU, 0x45f11f9dU, 0x58abacfaU, 0x03934be3U,
-    0xfa552030U, 0x6df6ad76U, 0x769188ccU, 0x4c25f502U,
-    0xd7fc4fe5U, 0xcbd7c52aU, 0x44802635U, 0xa38fb562U,
-    0x5a49deb1U, 0x1b6725baU, 0x0e9845eaU, 0xc0e15dfeU,
-    0x7502c32fU, 0xf012814cU, 0x97a38d46U, 0xf9c66bd3U,
-    0x5fe7038fU, 0x9c951592U, 0x7aebbf6dU, 0x59da9552U,
-    0x832dd4beU, 0x21d35874U, 0x692949e0U, 0xc8448ec9U,
-    0x896a75c2U, 0x7978f48eU, 0x3e6b9958U, 0x71dd27b9U,
-    0x4fb6bee1U, 0xad17f088U, 0xac66c920U, 0x3ab47dceU,
-    0x4a1863dfU, 0x3182e51aU, 0x33609751U, 0x7f456253U,
-    0x77e0b164U, 0xae84bb6bU, 0xa01cfe81U, 0x2b94f908U,
-    0x68587048U, 0xfd198f45U, 0x6c8794deU, 0xf8b7527bU,
-    0xd323ab73U, 0x02e2724bU, 0x8f57e31fU, 0xab2a6655U,
-    0x2807b2ebU, 0xc2032fb5U, 0x7b9a86c5U, 0x08a5d337U,
-    0x87f23028U, 0xa5b223bfU, 0x6aba0203U, 0x825ced16U,
-    0x1c2b8acfU, 0xb492a779U, 0xf2f0f307U, 0xe2a14e69U,
-    0xf4cd65daU, 0xbed50605U, 0x621fd134U, 0xfe8ac4a6U,
-    0x539d342eU, 0x55a0a2f3U, 0xe132058aU, 0xeb75a4f6U,
-    0xec390b83U, 0xefaa4060U, 0x9f065e71U, 0x1051bd6eU,
-    0x8af93e21U, 0x063d96ddU, 0x05aedd3eU, 0xbd464de6U,
-    0x8db59154U, 0x5d0571c4U, 0xd46f0406U, 0x15ff6050U,
-    0xfb241998U, 0xe997d6bdU, 0x43cc8940U, 0x9e7767d9U,
-    0x42bdb0e8U, 0x8b880789U, 0x5b38e719U, 0xeedb79c8U,
-    0x0a47a17cU, 0x0fe97c42U, 0x1ec9f884U, 0x00000000U,
-    0x86830980U, 0xed48322bU, 0x70ac1e11U, 0x724e6c5aU,
-    0xfffbfd0eU, 0x38560f85U, 0xd51e3daeU, 0x3927362dU,
-    0xd9640a0fU, 0xa621685cU, 0x54d19b5bU, 0x2e3a2436U,
-    0x67b10c0aU, 0xe70f9357U, 0x96d2b4eeU, 0x919e1b9bU,
-    0xc54f80c0U, 0x20a261dcU, 0x4b695a77U, 0x1a161c12U,
-    0xba0ae293U, 0x2ae5c0a0U, 0xe0433c22U, 0x171d121bU,
-    0x0d0b0e09U, 0xc7adf28bU, 0xa8b92db6U, 0xa9c8141eU,
-    0x198557f1U, 0x074caf75U, 0xddbbee99U, 0x60fda37fU,
-    0x269ff701U, 0xf5bc5c72U, 0x3bc54466U, 0x7e345bfbU,
-    0x29768b43U, 0xc6dccb23U, 0xfc68b6edU, 0xf163b8e4U,
-    0xdccad731U, 0x85104263U, 0x22401397U, 0x112084c6U,
-    0x247d854aU, 0x3df8d2bbU, 0x3211aef9U, 0xa16dc729U,
-    0x2f4b1d9eU, 0x30f3dcb2U, 0x52ec0d86U, 0xe3d077c1U,
-    0x166c2bb3U, 0xb999a970U, 0x48fa1194U, 0x642247e9U,
-    0x8cc4a8fcU, 0x3f1aa0f0U, 0x2cd8567dU, 0x90ef2233U,
-    0x4ec78749U, 0xd1c1d938U, 0xa2fe8ccaU, 0x0b3698d4U,
-    0x81cfa6f5U, 0xde28a57aU, 0x8e26dab7U, 0xbfa43fadU,
-    0x9de42c3aU, 0x920d5078U, 0xcc9b6a5fU, 0x4662547eU,
-    0x13c2f68dU, 0xb8e890d8U, 0xf75e2e39U, 0xaff582c3U,
-    0x80be9f5dU, 0x937c69d0U, 0x2da96fd5U, 0x12b3cf25U,
-    0x993bc8acU, 0x7da71018U, 0x636ee89cU, 0xbb7bdb3bU,
-    0x7809cd26U, 0x18f46e59U, 0xb701ec9aU, 0x9aa8834fU,
-    0x6e65e695U, 0xe67eaaffU, 0xcf0821bcU, 0xe8e6ef15U,
-    0x9bd9bae7U, 0x36ce4a6fU, 0x09d4ea9fU, 0x7cd629b0U,
-    0xb2af31a4U, 0x23312a3fU, 0x9430c6a5U, 0x66c035a2U,
-    0xbc37744eU, 0xcaa6fc82U, 0xd0b0e090U, 0xd81533a7U,
-    0x984af104U, 0xdaf741ecU, 0x500e7fcdU, 0xf62f1791U,
-    0xd68d764dU, 0xb04d43efU, 0x4d54ccaaU, 0x04dfe496U,
-    0xb5e39ed1U, 0x881b4c6aU, 0x1fb8c12cU, 0x517f4665U,
-    0xea049d5eU, 0x355d018cU, 0x7473fa87U, 0x412efb0bU,
-    0x1d5ab367U, 0xd25292dbU, 0x5633e910U, 0x47136dd6U,
-    0x618c9ad7U, 0x0c7a37a1U, 0x148e59f8U, 0x3c89eb13U,
-    0x27eecea9U, 0xc935b761U, 0xe5ede11cU, 0xb13c7a47U,
-    0xdf599cd2U, 0x733f55f2U, 0xce791814U, 0x37bf73c7U,
-    0xcdea53f7U, 0xaa5b5ffdU, 0x6f14df3dU, 0xdb867844U,
-    0xf381caafU, 0xc43eb968U, 0x342c3824U, 0x405fc2a3U,
-    0xc372161dU, 0x250cbce2U, 0x498b283cU, 0x9541ff0dU,
-    0x017139a8U, 0xb3de080cU, 0xe49cd8b4U, 0xc1906456U,
-    0x84617bcbU, 0xb670d532U, 0x5c74486cU, 0x5742d0b8U,
-};
-static const u32 Td3[256] = {
-    0xf4a75051U, 0x4165537eU, 0x17a4c31aU, 0x275e963aU,
-    0xab6bcb3bU, 0x9d45f11fU, 0xfa58abacU, 0xe303934bU,
-    0x30fa5520U, 0x766df6adU, 0xcc769188U, 0x024c25f5U,
-    0xe5d7fc4fU, 0x2acbd7c5U, 0x35448026U, 0x62a38fb5U,
-    0xb15a49deU, 0xba1b6725U, 0xea0e9845U, 0xfec0e15dU,
-    0x2f7502c3U, 0x4cf01281U, 0x4697a38dU, 0xd3f9c66bU,
-    0x8f5fe703U, 0x929c9515U, 0x6d7aebbfU, 0x5259da95U,
-    0xbe832dd4U, 0x7421d358U, 0xe0692949U, 0xc9c8448eU,
-    0xc2896a75U, 0x8e7978f4U, 0x583e6b99U, 0xb971dd27U,
-    0xe14fb6beU, 0x88ad17f0U, 0x20ac66c9U, 0xce3ab47dU,
-    0xdf4a1863U, 0x1a3182e5U, 0x51336097U, 0x537f4562U,
-    0x6477e0b1U, 0x6bae84bbU, 0x81a01cfeU, 0x082b94f9U,
-    0x48685870U, 0x45fd198fU, 0xde6c8794U, 0x7bf8b752U,
-    0x73d323abU, 0x4b02e272U, 0x1f8f57e3U, 0x55ab2a66U,
-    0xeb2807b2U, 0xb5c2032fU, 0xc57b9a86U, 0x3708a5d3U,
-    0x2887f230U, 0xbfa5b223U, 0x036aba02U, 0x16825cedU,
-    0xcf1c2b8aU, 0x79b492a7U, 0x07f2f0f3U, 0x69e2a14eU,
-    0xdaf4cd65U, 0x05bed506U, 0x34621fd1U, 0xa6fe8ac4U,
-    0x2e539d34U, 0xf355a0a2U, 0x8ae13205U, 0xf6eb75a4U,
-    0x83ec390bU, 0x60efaa40U, 0x719f065eU, 0x6e1051bdU,
-    0x218af93eU, 0xdd063d96U, 0x3e05aeddU, 0xe6bd464dU,
-    0x548db591U, 0xc45d0571U, 0x06d46f04U, 0x5015ff60U,
-    0x98fb2419U, 0xbde997d6U, 0x4043cc89U, 0xd99e7767U,
-    0xe842bdb0U, 0x898b8807U, 0x195b38e7U, 0xc8eedb79U,
-    0x7c0a47a1U, 0x420fe97cU, 0x841ec9f8U, 0x00000000U,
-    0x80868309U, 0x2bed4832U, 0x1170ac1eU, 0x5a724e6cU,
-    0x0efffbfdU, 0x8538560fU, 0xaed51e3dU, 0x2d392736U,
-    0x0fd9640aU, 0x5ca62168U, 0x5b54d19bU, 0x362e3a24U,
-    0x0a67b10cU, 0x57e70f93U, 0xee96d2b4U, 0x9b919e1bU,
-    0xc0c54f80U, 0xdc20a261U, 0x774b695aU, 0x121a161cU,
-    0x93ba0ae2U, 0xa02ae5c0U, 0x22e0433cU, 0x1b171d12U,
-    0x090d0b0eU, 0x8bc7adf2U, 0xb6a8b92dU, 0x1ea9c814U,
-    0xf1198557U, 0x75074cafU, 0x99ddbbeeU, 0x7f60fda3U,
-    0x01269ff7U, 0x72f5bc5cU, 0x663bc544U, 0xfb7e345bU,
-    0x4329768bU, 0x23c6dccbU, 0xedfc68b6U, 0xe4f163b8U,
-    0x31dccad7U, 0x63851042U, 0x97224013U, 0xc6112084U,
-    0x4a247d85U, 0xbb3df8d2U, 0xf93211aeU, 0x29a16dc7U,
-    0x9e2f4b1dU, 0xb230f3dcU, 0x8652ec0dU, 0xc1e3d077U,
-    0xb3166c2bU, 0x70b999a9U, 0x9448fa11U, 0xe9642247U,
-    0xfc8cc4a8U, 0xf03f1aa0U, 0x7d2cd856U, 0x3390ef22U,
-    0x494ec787U, 0x38d1c1d9U, 0xcaa2fe8cU, 0xd40b3698U,
-    0xf581cfa6U, 0x7ade28a5U, 0xb78e26daU, 0xadbfa43fU,
-    0x3a9de42cU, 0x78920d50U, 0x5fcc9b6aU, 0x7e466254U,
-    0x8d13c2f6U, 0xd8b8e890U, 0x39f75e2eU, 0xc3aff582U,
-    0x5d80be9fU, 0xd0937c69U, 0xd52da96fU, 0x2512b3cfU,
-    0xac993bc8U, 0x187da710U, 0x9c636ee8U, 0x3bbb7bdbU,
-    0x267809cdU, 0x5918f46eU, 0x9ab701ecU, 0x4f9aa883U,
-    0x956e65e6U, 0xffe67eaaU, 0xbccf0821U, 0x15e8e6efU,
-    0xe79bd9baU, 0x6f36ce4aU, 0x9f09d4eaU, 0xb07cd629U,
-    0xa4b2af31U, 0x3f23312aU, 0xa59430c6U, 0xa266c035U,
-    0x4ebc3774U, 0x82caa6fcU, 0x90d0b0e0U, 0xa7d81533U,
-    0x04984af1U, 0xecdaf741U, 0xcd500e7fU, 0x91f62f17U,
-    0x4dd68d76U, 0xefb04d43U, 0xaa4d54ccU, 0x9604dfe4U,
-    0xd1b5e39eU, 0x6a881b4cU, 0x2c1fb8c1U, 0x65517f46U,
-    0x5eea049dU, 0x8c355d01U, 0x877473faU, 0x0b412efbU,
-    0x671d5ab3U, 0xdbd25292U, 0x105633e9U, 0xd647136dU,
-    0xd7618c9aU, 0xa10c7a37U, 0xf8148e59U, 0x133c89ebU,
-    0xa927eeceU, 0x61c935b7U, 0x1ce5ede1U, 0x47b13c7aU,
-    0xd2df599cU, 0xf2733f55U, 0x14ce7918U, 0xc737bf73U,
-    0xf7cdea53U, 0xfdaa5b5fU, 0x3d6f14dfU, 0x44db8678U,
-    0xaff381caU, 0x68c43eb9U, 0x24342c38U, 0xa3405fc2U,
-    0x1dc37216U, 0xe2250cbcU, 0x3c498b28U, 0x0d9541ffU,
-    0xa8017139U, 0x0cb3de08U, 0xb4e49cd8U, 0x56c19064U,
-    0xcb84617bU, 0x32b670d5U, 0x6c5c7448U, 0xb85742d0U,
-};
-static const u8 Td4[256] = {
-    0x52U, 0x09U, 0x6aU, 0xd5U, 0x30U, 0x36U, 0xa5U, 0x38U,
-    0xbfU, 0x40U, 0xa3U, 0x9eU, 0x81U, 0xf3U, 0xd7U, 0xfbU,
-    0x7cU, 0xe3U, 0x39U, 0x82U, 0x9bU, 0x2fU, 0xffU, 0x87U,
-    0x34U, 0x8eU, 0x43U, 0x44U, 0xc4U, 0xdeU, 0xe9U, 0xcbU,
-    0x54U, 0x7bU, 0x94U, 0x32U, 0xa6U, 0xc2U, 0x23U, 0x3dU,
-    0xeeU, 0x4cU, 0x95U, 0x0bU, 0x42U, 0xfaU, 0xc3U, 0x4eU,
-    0x08U, 0x2eU, 0xa1U, 0x66U, 0x28U, 0xd9U, 0x24U, 0xb2U,
-    0x76U, 0x5bU, 0xa2U, 0x49U, 0x6dU, 0x8bU, 0xd1U, 0x25U,
-    0x72U, 0xf8U, 0xf6U, 0x64U, 0x86U, 0x68U, 0x98U, 0x16U,
-    0xd4U, 0xa4U, 0x5cU, 0xccU, 0x5dU, 0x65U, 0xb6U, 0x92U,
-    0x6cU, 0x70U, 0x48U, 0x50U, 0xfdU, 0xedU, 0xb9U, 0xdaU,
-    0x5eU, 0x15U, 0x46U, 0x57U, 0xa7U, 0x8dU, 0x9dU, 0x84U,
-    0x90U, 0xd8U, 0xabU, 0x00U, 0x8cU, 0xbcU, 0xd3U, 0x0aU,
-    0xf7U, 0xe4U, 0x58U, 0x05U, 0xb8U, 0xb3U, 0x45U, 0x06U,
-    0xd0U, 0x2cU, 0x1eU, 0x8fU, 0xcaU, 0x3fU, 0x0fU, 0x02U,
-    0xc1U, 0xafU, 0xbdU, 0x03U, 0x01U, 0x13U, 0x8aU, 0x6bU,
-    0x3aU, 0x91U, 0x11U, 0x41U, 0x4fU, 0x67U, 0xdcU, 0xeaU,
-    0x97U, 0xf2U, 0xcfU, 0xceU, 0xf0U, 0xb4U, 0xe6U, 0x73U,
-    0x96U, 0xacU, 0x74U, 0x22U, 0xe7U, 0xadU, 0x35U, 0x85U,
-    0xe2U, 0xf9U, 0x37U, 0xe8U, 0x1cU, 0x75U, 0xdfU, 0x6eU,
-    0x47U, 0xf1U, 0x1aU, 0x71U, 0x1dU, 0x29U, 0xc5U, 0x89U,
-    0x6fU, 0xb7U, 0x62U, 0x0eU, 0xaaU, 0x18U, 0xbeU, 0x1bU,
-    0xfcU, 0x56U, 0x3eU, 0x4bU, 0xc6U, 0xd2U, 0x79U, 0x20U,
-    0x9aU, 0xdbU, 0xc0U, 0xfeU, 0x78U, 0xcdU, 0x5aU, 0xf4U,
-    0x1fU, 0xddU, 0xa8U, 0x33U, 0x88U, 0x07U, 0xc7U, 0x31U,
-    0xb1U, 0x12U, 0x10U, 0x59U, 0x27U, 0x80U, 0xecU, 0x5fU,
-    0x60U, 0x51U, 0x7fU, 0xa9U, 0x19U, 0xb5U, 0x4aU, 0x0dU,
-    0x2dU, 0xe5U, 0x7aU, 0x9fU, 0x93U, 0xc9U, 0x9cU, 0xefU,
-    0xa0U, 0xe0U, 0x3bU, 0x4dU, 0xaeU, 0x2aU, 0xf5U, 0xb0U,
-    0xc8U, 0xebU, 0xbbU, 0x3cU, 0x83U, 0x53U, 0x99U, 0x61U,
-    0x17U, 0x2bU, 0x04U, 0x7eU, 0xbaU, 0x77U, 0xd6U, 0x26U,
-    0xe1U, 0x69U, 0x14U, 0x63U, 0x55U, 0x21U, 0x0cU, 0x7dU,
-};
-static const u32 rcon[] = {
-	0x01000000, 0x02000000, 0x04000000, 0x08000000,
-	0x10000000, 0x20000000, 0x40000000, 0x80000000,
-	0x1B000000, 0x36000000, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
-};
-
-/**
- * Expand the cipher key into the encryption key schedule.
- */
-int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-			AES_KEY *key) {
-
-	u32 *rk;
-   	int i = 0;
-	u32 temp;
-
-	if (!userKey || !key)
-		return -1;
-	if (bits != 128 && bits != 192 && bits != 256)
-		return -2;
-
-	rk = key->rd_key;
-
-	if (bits==128)
-		key->rounds = 10;
-	else if (bits==192)
-		key->rounds = 12;
-	else
-		key->rounds = 14;
-
-	rk[0] = GETU32(userKey     );
-	rk[1] = GETU32(userKey +  4);
-	rk[2] = GETU32(userKey +  8);
-	rk[3] = GETU32(userKey + 12);
-	if (bits == 128) {
-		while (1) {
-			temp  = rk[3];
-			rk[4] = rk[0] ^
-				(Te2[(temp >> 16) & 0xff] & 0xff000000) ^
-				(Te3[(temp >>  8) & 0xff] & 0x00ff0000) ^
-				(Te0[(temp      ) & 0xff] & 0x0000ff00) ^
-				(Te1[(temp >> 24)       ] & 0x000000ff) ^
-				rcon[i];
-			rk[5] = rk[1] ^ rk[4];
-			rk[6] = rk[2] ^ rk[5];
-			rk[7] = rk[3] ^ rk[6];
-			if (++i == 10) {
-				return 0;
-			}
-			rk += 4;
-		}
-	}
-	rk[4] = GETU32(userKey + 16);
-	rk[5] = GETU32(userKey + 20);
-	if (bits == 192) {
-		while (1) {
-			temp = rk[ 5];
-			rk[ 6] = rk[ 0] ^
-				(Te2[(temp >> 16) & 0xff] & 0xff000000) ^
-				(Te3[(temp >>  8) & 0xff] & 0x00ff0000) ^
-				(Te0[(temp      ) & 0xff] & 0x0000ff00) ^
-				(Te1[(temp >> 24)       ] & 0x000000ff) ^
-				rcon[i];
-			rk[ 7] = rk[ 1] ^ rk[ 6];
-			rk[ 8] = rk[ 2] ^ rk[ 7];
-			rk[ 9] = rk[ 3] ^ rk[ 8];
-			if (++i == 8) {
-				return 0;
-			}
-			rk[10] = rk[ 4] ^ rk[ 9];
-			rk[11] = rk[ 5] ^ rk[10];
-			rk += 6;
-		}
-	}
-	rk[6] = GETU32(userKey + 24);
-	rk[7] = GETU32(userKey + 28);
-	if (bits == 256) {
-		while (1) {
-			temp = rk[ 7];
-			rk[ 8] = rk[ 0] ^
-				(Te2[(temp >> 16) & 0xff] & 0xff000000) ^
-				(Te3[(temp >>  8) & 0xff] & 0x00ff0000) ^
-				(Te0[(temp      ) & 0xff] & 0x0000ff00) ^
-				(Te1[(temp >> 24)       ] & 0x000000ff) ^
-				rcon[i];
-			rk[ 9] = rk[ 1] ^ rk[ 8];
-			rk[10] = rk[ 2] ^ rk[ 9];
-			rk[11] = rk[ 3] ^ rk[10];
-			if (++i == 7) {
-				return 0;
-			}
-			temp = rk[11];
-			rk[12] = rk[ 4] ^
-				(Te2[(temp >> 24)       ] & 0xff000000) ^
-				(Te3[(temp >> 16) & 0xff] & 0x00ff0000) ^
-				(Te0[(temp >>  8) & 0xff] & 0x0000ff00) ^
-				(Te1[(temp      ) & 0xff] & 0x000000ff);
-			rk[13] = rk[ 5] ^ rk[12];
-			rk[14] = rk[ 6] ^ rk[13];
-			rk[15] = rk[ 7] ^ rk[14];
-
-			rk += 8;
-        	}
-	}
-	return 0;
-}
-
-/**
- * Expand the cipher key into the decryption key schedule.
- */
-int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-			 AES_KEY *key) {
-
-        u32 *rk;
-	int i, j, status;
-	u32 temp;
-
-	/* first, start with an encryption schedule */
-	status = private_AES_set_encrypt_key(userKey, bits, key);
-	if (status < 0)
-		return status;
-
-	rk = key->rd_key;
-
-	/* invert the order of the round keys: */
-	for (i = 0, j = 4*(key->rounds); i < j; i += 4, j -= 4) {
-		temp = rk[i    ]; rk[i    ] = rk[j    ]; rk[j    ] = temp;
-		temp = rk[i + 1]; rk[i + 1] = rk[j + 1]; rk[j + 1] = temp;
-		temp = rk[i + 2]; rk[i + 2] = rk[j + 2]; rk[j + 2] = temp;
-		temp = rk[i + 3]; rk[i + 3] = rk[j + 3]; rk[j + 3] = temp;
-	}
-	/* apply the inverse MixColumn transform to all round keys but the first and the last: */
-	for (i = 1; i < (key->rounds); i++) {
-		rk += 4;
-		rk[0] =
-			Td0[Te1[(rk[0] >> 24)       ] & 0xff] ^
-			Td1[Te1[(rk[0] >> 16) & 0xff] & 0xff] ^
-			Td2[Te1[(rk[0] >>  8) & 0xff] & 0xff] ^
-			Td3[Te1[(rk[0]      ) & 0xff] & 0xff];
-		rk[1] =
-			Td0[Te1[(rk[1] >> 24)       ] & 0xff] ^
-			Td1[Te1[(rk[1] >> 16) & 0xff] & 0xff] ^
-			Td2[Te1[(rk[1] >>  8) & 0xff] & 0xff] ^
-			Td3[Te1[(rk[1]      ) & 0xff] & 0xff];
-		rk[2] =
-			Td0[Te1[(rk[2] >> 24)       ] & 0xff] ^
-			Td1[Te1[(rk[2] >> 16) & 0xff] & 0xff] ^
-			Td2[Te1[(rk[2] >>  8) & 0xff] & 0xff] ^
-			Td3[Te1[(rk[2]      ) & 0xff] & 0xff];
-		rk[3] =
-			Td0[Te1[(rk[3] >> 24)       ] & 0xff] ^
-			Td1[Te1[(rk[3] >> 16) & 0xff] & 0xff] ^
-			Td2[Te1[(rk[3] >>  8) & 0xff] & 0xff] ^
-			Td3[Te1[(rk[3]      ) & 0xff] & 0xff];
-	}
-	return 0;
-}
-
-/*
- * Encrypt a single block
- * in and out can overlap
- */
-void AES_encrypt(const unsigned char *in, unsigned char *out,
-		 const AES_KEY *key) {
-
-	const u32 *rk;
-	u32 s0, s1, s2, s3, t0, t1, t2, t3;
-#ifndef FULL_UNROLL
-	int r;
-#endif /* ?FULL_UNROLL */
-
-	assert(in && out && key);
-	rk = key->rd_key;
-
-	/*
-	 * map byte array block to cipher state
-	 * and add initial round key:
-	 */
-	s0 = GETU32(in     ) ^ rk[0];
-	s1 = GETU32(in +  4) ^ rk[1];
-	s2 = GETU32(in +  8) ^ rk[2];
-	s3 = GETU32(in + 12) ^ rk[3];
-#ifdef FULL_UNROLL
-	/* round 1: */
-   	t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[ 4];
-   	t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[ 5];
-   	t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[ 6];
-   	t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[ 7];
-   	/* round 2: */
-   	s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[ 8];
-   	s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[ 9];
-   	s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[10];
-   	s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[11];
-	/* round 3: */
-   	t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[12];
-   	t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[13];
-   	t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[14];
-   	t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[15];
-   	/* round 4: */
-   	s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[16];
-   	s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[17];
-   	s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[18];
-   	s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[19];
-	/* round 5: */
-   	t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[20];
-   	t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[21];
-   	t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[22];
-   	t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[23];
-   	/* round 6: */
-   	s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[24];
-   	s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[25];
-   	s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[26];
-   	s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[27];
-	/* round 7: */
-   	t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[28];
-   	t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[29];
-   	t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[30];
-   	t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[31];
-   	/* round 8: */
-   	s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[32];
-   	s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[33];
-   	s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[34];
-   	s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[35];
-	/* round 9: */
-   	t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[36];
-   	t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[37];
-   	t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[38];
-   	t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[39];
-    if (key->rounds > 10) {
-        /* round 10: */
-        s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[40];
-        s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[41];
-        s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[42];
-        s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[43];
-        /* round 11: */
-        t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[44];
-        t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[45];
-        t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[46];
-        t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[47];
-        if (key->rounds > 12) {
-            /* round 12: */
-            s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[48];
-            s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[49];
-            s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[50];
-            s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[51];
-            /* round 13: */
-            t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[52];
-            t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[53];
-            t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[54];
-            t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[55];
-        }
-    }
-    rk += key->rounds << 2;
-#else  /* !FULL_UNROLL */
-    /*
-     * Nr - 1 full rounds:
-     */
-    r = key->rounds >> 1;
-    for (;;) {
-        t0 =
-            Te0[(s0 >> 24)       ] ^
-            Te1[(s1 >> 16) & 0xff] ^
-            Te2[(s2 >>  8) & 0xff] ^
-            Te3[(s3      ) & 0xff] ^
-            rk[4];
-        t1 =
-            Te0[(s1 >> 24)       ] ^
-            Te1[(s2 >> 16) & 0xff] ^
-            Te2[(s3 >>  8) & 0xff] ^
-            Te3[(s0      ) & 0xff] ^
-            rk[5];
-        t2 =
-            Te0[(s2 >> 24)       ] ^
-            Te1[(s3 >> 16) & 0xff] ^
-            Te2[(s0 >>  8) & 0xff] ^
-            Te3[(s1      ) & 0xff] ^
-            rk[6];
-        t3 =
-            Te0[(s3 >> 24)       ] ^
-            Te1[(s0 >> 16) & 0xff] ^
-            Te2[(s1 >>  8) & 0xff] ^
-            Te3[(s2      ) & 0xff] ^
-            rk[7];
-
-        rk += 8;
-        if (--r == 0) {
-            break;
-        }
-
-        s0 =
-            Te0[(t0 >> 24)       ] ^
-            Te1[(t1 >> 16) & 0xff] ^
-            Te2[(t2 >>  8) & 0xff] ^
-            Te3[(t3      ) & 0xff] ^
-            rk[0];
-        s1 =
-            Te0[(t1 >> 24)       ] ^
-            Te1[(t2 >> 16) & 0xff] ^
-            Te2[(t3 >>  8) & 0xff] ^
-            Te3[(t0      ) & 0xff] ^
-            rk[1];
-        s2 =
-            Te0[(t2 >> 24)       ] ^
-            Te1[(t3 >> 16) & 0xff] ^
-            Te2[(t0 >>  8) & 0xff] ^
-            Te3[(t1      ) & 0xff] ^
-            rk[2];
-        s3 =
-            Te0[(t3 >> 24)       ] ^
-            Te1[(t0 >> 16) & 0xff] ^
-            Te2[(t1 >>  8) & 0xff] ^
-            Te3[(t2      ) & 0xff] ^
-            rk[3];
-    }
-#endif /* ?FULL_UNROLL */
-    /*
-	 * apply last round and
-	 * map cipher state to byte array block:
-	 */
-	s0 =
-		(Te2[(t0 >> 24)       ] & 0xff000000) ^
-		(Te3[(t1 >> 16) & 0xff] & 0x00ff0000) ^
-		(Te0[(t2 >>  8) & 0xff] & 0x0000ff00) ^
-		(Te1[(t3      ) & 0xff] & 0x000000ff) ^
-		rk[0];
-	PUTU32(out     , s0);
-	s1 =
-		(Te2[(t1 >> 24)       ] & 0xff000000) ^
-		(Te3[(t2 >> 16) & 0xff] & 0x00ff0000) ^
-		(Te0[(t3 >>  8) & 0xff] & 0x0000ff00) ^
-		(Te1[(t0      ) & 0xff] & 0x000000ff) ^
-		rk[1];
-	PUTU32(out +  4, s1);
-	s2 =
-		(Te2[(t2 >> 24)       ] & 0xff000000) ^
-		(Te3[(t3 >> 16) & 0xff] & 0x00ff0000) ^
-		(Te0[(t0 >>  8) & 0xff] & 0x0000ff00) ^
-		(Te1[(t1      ) & 0xff] & 0x000000ff) ^
-		rk[2];
-	PUTU32(out +  8, s2);
-	s3 =
-		(Te2[(t3 >> 24)       ] & 0xff000000) ^
-		(Te3[(t0 >> 16) & 0xff] & 0x00ff0000) ^
-		(Te0[(t1 >>  8) & 0xff] & 0x0000ff00) ^
-		(Te1[(t2      ) & 0xff] & 0x000000ff) ^
-		rk[3];
-	PUTU32(out + 12, s3);
-}
-
-/*
- * Decrypt a single block
- * in and out can overlap
- */
-void AES_decrypt(const unsigned char *in, unsigned char *out,
-		 const AES_KEY *key) {
-
-	const u32 *rk;
-	u32 s0, s1, s2, s3, t0, t1, t2, t3;
-#ifndef FULL_UNROLL
-	int r;
-#endif /* ?FULL_UNROLL */
-
-	assert(in && out && key);
-	rk = key->rd_key;
-
-	/*
-	 * map byte array block to cipher state
-	 * and add initial round key:
-	 */
-    s0 = GETU32(in     ) ^ rk[0];
-    s1 = GETU32(in +  4) ^ rk[1];
-    s2 = GETU32(in +  8) ^ rk[2];
-    s3 = GETU32(in + 12) ^ rk[3];
-#ifdef FULL_UNROLL
-    /* round 1: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[ 4];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[ 5];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[ 6];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[ 7];
-    /* round 2: */
-    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[ 8];
-    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[ 9];
-    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[10];
-    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[11];
-    /* round 3: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[12];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[13];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[14];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[15];
-    /* round 4: */
-    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[16];
-    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[17];
-    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[18];
-    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[19];
-    /* round 5: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[20];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[21];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[22];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[23];
-    /* round 6: */
-    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[24];
-    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[25];
-    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[26];
-    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[27];
-    /* round 7: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[28];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[29];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[30];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[31];
-    /* round 8: */
-    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[32];
-    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[33];
-    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[34];
-    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[35];
-    /* round 9: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[36];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[37];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[38];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[39];
-    if (key->rounds > 10) {
-        /* round 10: */
-        s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[40];
-        s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[41];
-        s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[42];
-        s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[43];
-        /* round 11: */
-        t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[44];
-        t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[45];
-        t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[46];
-        t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[47];
-        if (key->rounds > 12) {
-            /* round 12: */
-            s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[48];
-            s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[49];
-            s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[50];
-            s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[51];
-            /* round 13: */
-            t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[52];
-            t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[53];
-            t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[54];
-            t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[55];
-        }
-    }
-	rk += key->rounds << 2;
-#else  /* !FULL_UNROLL */
-    /*
-     * Nr - 1 full rounds:
-     */
-    r = key->rounds >> 1;
-    for (;;) {
-        t0 =
-            Td0[(s0 >> 24)       ] ^
-            Td1[(s3 >> 16) & 0xff] ^
-            Td2[(s2 >>  8) & 0xff] ^
-            Td3[(s1      ) & 0xff] ^
-            rk[4];
-        t1 =
-            Td0[(s1 >> 24)       ] ^
-            Td1[(s0 >> 16) & 0xff] ^
-            Td2[(s3 >>  8) & 0xff] ^
-            Td3[(s2      ) & 0xff] ^
-            rk[5];
-        t2 =
-            Td0[(s2 >> 24)       ] ^
-            Td1[(s1 >> 16) & 0xff] ^
-            Td2[(s0 >>  8) & 0xff] ^
-            Td3[(s3      ) & 0xff] ^
-            rk[6];
-        t3 =
-            Td0[(s3 >> 24)       ] ^
-            Td1[(s2 >> 16) & 0xff] ^
-            Td2[(s1 >>  8) & 0xff] ^
-            Td3[(s0      ) & 0xff] ^
-            rk[7];
-
-        rk += 8;
-        if (--r == 0) {
-            break;
-        }
-
-        s0 =
-            Td0[(t0 >> 24)       ] ^
-            Td1[(t3 >> 16) & 0xff] ^
-            Td2[(t2 >>  8) & 0xff] ^
-            Td3[(t1      ) & 0xff] ^
-            rk[0];
-        s1 =
-            Td0[(t1 >> 24)       ] ^
-            Td1[(t0 >> 16) & 0xff] ^
-            Td2[(t3 >>  8) & 0xff] ^
-            Td3[(t2      ) & 0xff] ^
-            rk[1];
-        s2 =
-            Td0[(t2 >> 24)       ] ^
-            Td1[(t1 >> 16) & 0xff] ^
-            Td2[(t0 >>  8) & 0xff] ^
-            Td3[(t3      ) & 0xff] ^
-            rk[2];
-        s3 =
-            Td0[(t3 >> 24)       ] ^
-            Td1[(t2 >> 16) & 0xff] ^
-            Td2[(t1 >>  8) & 0xff] ^
-            Td3[(t0      ) & 0xff] ^
-            rk[3];
-    }
-#endif /* ?FULL_UNROLL */
-    /*
-	 * apply last round and
-	 * map cipher state to byte array block:
-	 */
-   	s0 =
-   		(Td4[(t0 >> 24)       ] << 24) ^
-   		(Td4[(t3 >> 16) & 0xff] << 16) ^
-   		(Td4[(t2 >>  8) & 0xff] <<  8) ^
-   		(Td4[(t1      ) & 0xff])       ^
-   		rk[0];
-	PUTU32(out     , s0);
-   	s1 =
-   		(Td4[(t1 >> 24)       ] << 24) ^
-   		(Td4[(t0 >> 16) & 0xff] << 16) ^
-   		(Td4[(t3 >>  8) & 0xff] <<  8) ^
-   		(Td4[(t2      ) & 0xff])       ^
-   		rk[1];
-	PUTU32(out +  4, s1);
-   	s2 =
-   		(Td4[(t2 >> 24)       ] << 24) ^
-   		(Td4[(t1 >> 16) & 0xff] << 16) ^
-   		(Td4[(t0 >>  8) & 0xff] <<  8) ^
-   		(Td4[(t3      ) & 0xff])       ^
-   		rk[2];
-	PUTU32(out +  8, s2);
-   	s3 =
-   		(Td4[(t3 >> 24)       ] << 24) ^
-   		(Td4[(t2 >> 16) & 0xff] << 16) ^
-   		(Td4[(t1 >>  8) & 0xff] <<  8) ^
-   		(Td4[(t0      ) & 0xff])       ^
-   		rk[3];
-	PUTU32(out + 12, s3);
-}
-
-#else /* AES_ASM */
-
-static const u8 Te4[256] = {
-    0x63U, 0x7cU, 0x77U, 0x7bU, 0xf2U, 0x6bU, 0x6fU, 0xc5U,
-    0x30U, 0x01U, 0x67U, 0x2bU, 0xfeU, 0xd7U, 0xabU, 0x76U,
-    0xcaU, 0x82U, 0xc9U, 0x7dU, 0xfaU, 0x59U, 0x47U, 0xf0U,
-    0xadU, 0xd4U, 0xa2U, 0xafU, 0x9cU, 0xa4U, 0x72U, 0xc0U,
-    0xb7U, 0xfdU, 0x93U, 0x26U, 0x36U, 0x3fU, 0xf7U, 0xccU,
-    0x34U, 0xa5U, 0xe5U, 0xf1U, 0x71U, 0xd8U, 0x31U, 0x15U,
-    0x04U, 0xc7U, 0x23U, 0xc3U, 0x18U, 0x96U, 0x05U, 0x9aU,
-    0x07U, 0x12U, 0x80U, 0xe2U, 0xebU, 0x27U, 0xb2U, 0x75U,
-    0x09U, 0x83U, 0x2cU, 0x1aU, 0x1bU, 0x6eU, 0x5aU, 0xa0U,
-    0x52U, 0x3bU, 0xd6U, 0xb3U, 0x29U, 0xe3U, 0x2fU, 0x84U,
-    0x53U, 0xd1U, 0x00U, 0xedU, 0x20U, 0xfcU, 0xb1U, 0x5bU,
-    0x6aU, 0xcbU, 0xbeU, 0x39U, 0x4aU, 0x4cU, 0x58U, 0xcfU,
-    0xd0U, 0xefU, 0xaaU, 0xfbU, 0x43U, 0x4dU, 0x33U, 0x85U,
-    0x45U, 0xf9U, 0x02U, 0x7fU, 0x50U, 0x3cU, 0x9fU, 0xa8U,
-    0x51U, 0xa3U, 0x40U, 0x8fU, 0x92U, 0x9dU, 0x38U, 0xf5U,
-    0xbcU, 0xb6U, 0xdaU, 0x21U, 0x10U, 0xffU, 0xf3U, 0xd2U,
-    0xcdU, 0x0cU, 0x13U, 0xecU, 0x5fU, 0x97U, 0x44U, 0x17U,
-    0xc4U, 0xa7U, 0x7eU, 0x3dU, 0x64U, 0x5dU, 0x19U, 0x73U,
-    0x60U, 0x81U, 0x4fU, 0xdcU, 0x22U, 0x2aU, 0x90U, 0x88U,
-    0x46U, 0xeeU, 0xb8U, 0x14U, 0xdeU, 0x5eU, 0x0bU, 0xdbU,
-    0xe0U, 0x32U, 0x3aU, 0x0aU, 0x49U, 0x06U, 0x24U, 0x5cU,
-    0xc2U, 0xd3U, 0xacU, 0x62U, 0x91U, 0x95U, 0xe4U, 0x79U,
-    0xe7U, 0xc8U, 0x37U, 0x6dU, 0x8dU, 0xd5U, 0x4eU, 0xa9U,
-    0x6cU, 0x56U, 0xf4U, 0xeaU, 0x65U, 0x7aU, 0xaeU, 0x08U,
-    0xbaU, 0x78U, 0x25U, 0x2eU, 0x1cU, 0xa6U, 0xb4U, 0xc6U,
-    0xe8U, 0xddU, 0x74U, 0x1fU, 0x4bU, 0xbdU, 0x8bU, 0x8aU,
-    0x70U, 0x3eU, 0xb5U, 0x66U, 0x48U, 0x03U, 0xf6U, 0x0eU,
-    0x61U, 0x35U, 0x57U, 0xb9U, 0x86U, 0xc1U, 0x1dU, 0x9eU,
-    0xe1U, 0xf8U, 0x98U, 0x11U, 0x69U, 0xd9U, 0x8eU, 0x94U,
-    0x9bU, 0x1eU, 0x87U, 0xe9U, 0xceU, 0x55U, 0x28U, 0xdfU,
-    0x8cU, 0xa1U, 0x89U, 0x0dU, 0xbfU, 0xe6U, 0x42U, 0x68U,
-    0x41U, 0x99U, 0x2dU, 0x0fU, 0xb0U, 0x54U, 0xbbU, 0x16U
-};
-static const u32 rcon[] = {
-	0x01000000, 0x02000000, 0x04000000, 0x08000000,
-	0x10000000, 0x20000000, 0x40000000, 0x80000000,
-	0x1B000000, 0x36000000, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
-};
-
-/**
- * Expand the cipher key into the encryption key schedule.
- */
-int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-			AES_KEY *key) {
-	u32 *rk;
-   	int i = 0;
-	u32 temp;
-
-	if (!userKey || !key)
-		return -1;
-	if (bits != 128 && bits != 192 && bits != 256)
-		return -2;
-
-	rk = key->rd_key;
-
-	if (bits==128)
-		key->rounds = 10;
-	else if (bits==192)
-		key->rounds = 12;
-	else
-		key->rounds = 14;
-
-	rk[0] = GETU32(userKey     );
-	rk[1] = GETU32(userKey +  4);
-	rk[2] = GETU32(userKey +  8);
-	rk[3] = GETU32(userKey + 12);
-	if (bits == 128) {
-		while (1) {
-			temp  = rk[3];
-			rk[4] = rk[0] ^
-				(Te4[(temp >> 16) & 0xff] << 24) ^
-				(Te4[(temp >>  8) & 0xff] << 16) ^
-				(Te4[(temp      ) & 0xff] << 8) ^
-				(Te4[(temp >> 24)       ]) ^
-				rcon[i];
-			rk[5] = rk[1] ^ rk[4];
-			rk[6] = rk[2] ^ rk[5];
-			rk[7] = rk[3] ^ rk[6];
-			if (++i == 10) {
-				return 0;
-			}
-			rk += 4;
-		}
-	}
-	rk[4] = GETU32(userKey + 16);
-	rk[5] = GETU32(userKey + 20);
-	if (bits == 192) {
-		while (1) {
-			temp = rk[ 5];
-			rk[ 6] = rk[ 0] ^
-				(Te4[(temp >> 16) & 0xff] << 24) ^
-				(Te4[(temp >>  8) & 0xff] << 16) ^
-				(Te4[(temp      ) & 0xff] << 8) ^
-				(Te4[(temp >> 24)       ]) ^
-				rcon[i];
-			rk[ 7] = rk[ 1] ^ rk[ 6];
-			rk[ 8] = rk[ 2] ^ rk[ 7];
-			rk[ 9] = rk[ 3] ^ rk[ 8];
-			if (++i == 8) {
-				return 0;
-			}
-			rk[10] = rk[ 4] ^ rk[ 9];
-			rk[11] = rk[ 5] ^ rk[10];
-			rk += 6;
-		}
-	}
-	rk[6] = GETU32(userKey + 24);
-	rk[7] = GETU32(userKey + 28);
-	if (bits == 256) {
-		while (1) {
-			temp = rk[ 7];
-			rk[ 8] = rk[ 0] ^
-				(Te4[(temp >> 16) & 0xff] << 24) ^
-				(Te4[(temp >>  8) & 0xff] << 16) ^
-				(Te4[(temp      ) & 0xff] << 8) ^
-				(Te4[(temp >> 24)       ]) ^
-				rcon[i];
-			rk[ 9] = rk[ 1] ^ rk[ 8];
-			rk[10] = rk[ 2] ^ rk[ 9];
-			rk[11] = rk[ 3] ^ rk[10];
-			if (++i == 7) {
-				return 0;
-			}
-			temp = rk[11];
-			rk[12] = rk[ 4] ^
-				(Te4[(temp >> 24)       ] << 24) ^
-				(Te4[(temp >> 16) & 0xff] << 16) ^
-				(Te4[(temp >>  8) & 0xff] << 8) ^
-				(Te4[(temp      ) & 0xff]);
-			rk[13] = rk[ 5] ^ rk[12];
-			rk[14] = rk[ 6] ^ rk[13];
-			rk[15] = rk[ 7] ^ rk[14];
-
-			rk += 8;
-        	}
-	}
-	return 0;
-}
-
-/**
- * Expand the cipher key into the decryption key schedule.
- */
-int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-			 AES_KEY *key) {
-
-        u32 *rk;
-	int i, j, status;
-	u32 temp;
-
-	/* first, start with an encryption schedule */
-	status = private_AES_set_encrypt_key(userKey, bits, key);
-	if (status < 0)
-		return status;
-
-	rk = key->rd_key;
-
-	/* invert the order of the round keys: */
-	for (i = 0, j = 4*(key->rounds); i < j; i += 4, j -= 4) {
-		temp = rk[i    ]; rk[i    ] = rk[j    ]; rk[j    ] = temp;
-		temp = rk[i + 1]; rk[i + 1] = rk[j + 1]; rk[j + 1] = temp;
-		temp = rk[i + 2]; rk[i + 2] = rk[j + 2]; rk[j + 2] = temp;
-		temp = rk[i + 3]; rk[i + 3] = rk[j + 3]; rk[j + 3] = temp;
-	}
-	/* apply the inverse MixColumn transform to all round keys but the first and the last: */
-	for (i = 1; i < (key->rounds); i++) {
-		rk += 4;
-		for (j = 0; j < 4; j++) {
-			u32 tp1, tp2, tp4, tp8, tp9, tpb, tpd, tpe, m;
-
-			tp1 = rk[j];
-			m = tp1 & 0x80808080;
-			tp2 = ((tp1 & 0x7f7f7f7f) << 1) ^
-				((m - (m >> 7)) & 0x1b1b1b1b);
-			m = tp2 & 0x80808080;
-			tp4 = ((tp2 & 0x7f7f7f7f) << 1) ^
-				((m - (m >> 7)) & 0x1b1b1b1b);
-			m = tp4 & 0x80808080;
-			tp8 = ((tp4 & 0x7f7f7f7f) << 1) ^
-				((m - (m >> 7)) & 0x1b1b1b1b);
-			tp9 = tp8 ^ tp1;
-			tpb = tp9 ^ tp2;
-			tpd = tp9 ^ tp4;
-			tpe = tp8 ^ tp4 ^ tp2;
-#if defined(ROTATE)
-			rk[j] = tpe ^ ROTATE(tpd,16) ^
-				ROTATE(tp9,24) ^ ROTATE(tpb,8);
-#else
-			rk[j] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^ 
-				(tp9 >> 8) ^ (tp9 << 24) ^
-				(tpb >> 24) ^ (tpb << 8);
-#endif
-		}
-	}
-	return 0;
-}
-
-#endif /* AES_ASM */
diff --git a/Porthos/util/aes_locl.h b/Porthos/util/aes_locl.h
deleted file mode 100644
index ec61d46..0000000
--- a/Porthos/util/aes_locl.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* crypto/aes/aes.h -*- mode:C; c-file-style: "eay" -*- */
-/* ====================================================================
- * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- */
-
-#ifndef HEADER_AES_LOCL_H
-#define HEADER_AES_LOCL_H
-
-//#include <openssl/e_os2.h>
-
-#ifdef OPENSSL_NO_AES
-#error AES is disabled.
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64))
-# define SWAP(x) (_lrotl(x, 8) & 0x00ff00ff | _lrotr(x, 8) & 0xff00ff00)
-# define GETU32(p) SWAP(*((u32 *)(p)))
-# define PUTU32(ct, st) { *((u32 *)(ct)) = SWAP((st)); }
-#else
-# define GETU32(pt) (((u32)(pt)[0] << 24) ^ ((u32)(pt)[1] << 16) ^ ((u32)(pt)[2] <<  8) ^ ((u32)(pt)[3]))
-# define PUTU32(ct, st) { (ct)[0] = (u8)((st) >> 24); (ct)[1] = (u8)((st) >> 16); (ct)[2] = (u8)((st) >>  8); (ct)[3] = (u8)(st); }
-#endif
-
-#ifdef AES_LONG
-typedef unsigned long u32;
-#else
-typedef unsigned int u32;
-#endif
-typedef unsigned short u16;
-typedef unsigned char u8;
-
-#define MAXKC   (256/32)
-#define MAXKB   (256/8)
-#define MAXNR   14
-
-/* This controls loop-unrolling in aes_core.c */
-#undef FULL_UNROLL
-
-#endif /* !HEADER_AES_LOCL_H */
diff --git a/Porthos/util/cbitvector.cpp b/Porthos/util/cbitvector.cpp
deleted file mode 100644
index 8279633..0000000
--- a/Porthos/util/cbitvector.cpp
+++ /dev/null
@@ -1,656 +0,0 @@
-/*
-* BitVector.cpp
-*
-*  Created on: May 6, 2013
-*      Author: mzohner
-*/
-
-#include "cbitvector.h"
-
-
-/* Fill the bitvector with random values and pre-initialize the key to the seed-key*/
-void CBitVector::FillRand(int bits, BYTE* seed, int& cnt)
-{
-	InitRand(seed);
-	FillRand(bits, cnt);
-}
-
-/* Fill random values using the pre-defined AES key */
-void CBitVector::FillRand(int bits, int& cnt)
-{
-	if(bits > m_nSize<<3)
-		Create(bits);
-
-	BYTE buf[AES_BYTES];
-	memset(buf, 0, AES_BYTES);
-
-	for(int i = 0; i < (int) sizeof(int); i++) {
-		buf[i] = (cnt>>(8*i)) & 0xFF;
-	}
-
-	if(m_nKey.rounds == 0)
-	{
-		cerr << "FillRand called without initializing AES key" << endl;
-		return;
-	}
-
-	int size = CEIL_DIVIDE(bits, AES_BITS);
-	unsigned long long* counter = (unsigned long long*) buf;
-	
-	for(int i = 0; i < size; i++, counter[0]++, cnt++)
-	{
-		OTEXT_AES_ENCRYPT(&m_nKey, m_pBits + i*AES_BYTES, buf);
-	}
-	
-}
-
-void CBitVector::Create(int numelements, int elementlength, BYTE* seed, int& cnt)
-{
-	Create(numelements * elementlength, seed, cnt);
-	m_nElementLength = elementlength;
-	m_nNumElements = numelements;
-	m_nNumElementsDimB = 1;
-}
-
-void CBitVector::Create(int bits, BYTE* seed, int& cnt)
-{
-	Create(bits);
-	FillRand(bits, seed, cnt);
-}
-
-void CBitVector::Create(int bits)
-{
-	if( m_pBits ) free(m_pBits);
-	int size = CEIL_DIVIDE(bits, AES_BITS);
-	m_nSize = size*AES_BYTES;
-	m_pBits = (BYTE*) malloc(sizeof(BYTE) * m_nSize);
-	m_nElementLength = 1;
-	m_nNumElements = m_nSize;
-	m_nNumElementsDimB = 1;
-
-}
-
-void CBitVector::Create(int numelements, int elementlength)
-{
-	Create(numelements * elementlength);
-	m_nElementLength = elementlength;
-	m_nNumElements = numelements;
-	m_nNumElementsDimB = 1;
-}
-
-void CBitVector::Create(int numelementsDimA, int numelementsDimB, int elementlength)
-{
-	Create(numelementsDimA * numelementsDimB * elementlength);
-	m_nElementLength = elementlength;
-	m_nNumElements = numelementsDimA;
-	m_nNumElementsDimB = numelementsDimB;
-}
-void CBitVector::Create(int numelementsDimA, int numelementsDimB, int elementlength, BYTE* seed, int& cnt)
-{
-	Create(numelementsDimA * numelementsDimB * elementlength, seed, cnt);
-	m_nElementLength = elementlength;
-	m_nNumElements = numelementsDimA;
-	m_nNumElementsDimB = numelementsDimB;
-}
-
-
-void CBitVector::ResizeinBytes(int newSizeBytes)
-{
-	BYTE* tBits = m_pBits;
-	int tSize = m_nSize;
-
-	m_nSize = newSizeBytes;
-	m_pBits = new BYTE[m_nSize];
-
-	memcpy(m_pBits, tBits, tSize);
-
-	delete(tBits);
-}
-
-void CBitVector::Copy(BYTE* p, int pos, int len)
-{
-
-	if( pos+len > m_nSize)
-	{
-		if(m_pBits)
-			ResizeinBytes(pos+len);
-		else
-		{
-			CreateBytes(pos+len);
-		}
-	}
-
-	memcpy (m_pBits+pos, p, len);
-}
-
-//pos and len in bits
-void CBitVector::SetBits(BYTE* p, int pos, int len)
-{
-
-	if(len < 1 || (pos+len) > (m_nSize << 3))
-		return;
-
-	if(len == 1)
-	{
-		SetBitNoMask(pos, *p);
-		return;
-	}
-	if(!((pos & 0x07) || (len & 0x07)))
-	{
-
-		SetBytes(p, pos>>3, len>>3);
-		return;
-	}
-	int posctr = pos>>3;
-	int lowermask = pos & 7;
-	int uppermask = 8 - lowermask;
-
-	int i;
-	BYTE temp;
-	for(i = 0; i < len / (sizeof(BYTE)*8); i++, posctr++)
-	{
-		temp = p[i];
-		m_pBits[posctr] = (m_pBits[posctr] & RESET_BIT_POSITIONS[lowermask]) | ((temp << lowermask) & 0xFF);
-		m_pBits[posctr+1] = (m_pBits[posctr+1] & RESET_BIT_POSITIONS_INV[uppermask]) | (temp >> uppermask);
-		//cout << "Iteration for whole byte done" << endl;
-	}
-	int remlen = len & 0x07;
-	if(remlen)
-	{
-		temp = p[i] & RESET_BIT_POSITIONS[remlen];
-		
-		if(remlen <= uppermask)
-		{
-			//cout << "Setting " << remlen  << " lower bits with lowermask = " << lowermask << ", and temp " << (unsigned int) temp << endl;
-			m_pBits[posctr] = (m_pBits[posctr] & (~(((1<<remlen)-1) << lowermask))) | ((temp << lowermask) & 0xFF);
-		}
-		else
-		{
-			//cout << "Setting " << remlen  << " bits with lowermask = " << lowermask << ", uppermask = " << uppermask << ", and temp = " << (unsigned int) temp << endl;
-			m_pBits[posctr] = (m_pBits[posctr] & RESET_BIT_POSITIONS[lowermask]) | ((temp << lowermask) & 0xFF);
-			m_pBits[posctr+1] = (m_pBits[posctr+1] & (~(((1<<(remlen-uppermask))-1)))) | (temp >> uppermask);
-		}
-	}
-}
-
-void CBitVector::SetBitsToZero(int bitpos, int bitlen)
-{
-	int firstlim = CEIL_DIVIDE(bitpos, 8);
-	int firstlen = CEIL_DIVIDE(bitlen - (bitpos % 8), 8);
-	for(int i = bitpos; i < firstlim; i++)
-	{
-		SetBitNoMask(i, 0);
-	}
-	if(bitlen > 7)
-	{
-		memset(m_pBits + firstlim, 0, firstlen);
-	}
-	for(int i = (firstlim + firstlen) << 8; i < bitpos + bitlen; i++)
-	{
-		SetBitNoMask(i, 0);
-	}
-}
-
-
-void CBitVector::GetBits(BYTE* p, int pos, int len)
-{
-	if(len < 1 || (pos+len) > m_nSize << 3)
-		return;
-	if(len == 1)
-	{
-		*p = GetBitNoMask(pos);
-		return;
-	}
-	if(!((pos & 0x07) || (len & 0x07)))
-	{
-		GetBytes(p, pos>>3, len>>3);
-		return;
-	}
-	int posctr = pos>>3;
-	int lowermask = pos & 7;
-	int uppermask = 8 - lowermask;
-
-	int i;
-	BYTE temp;
-	for(i = 0; i < len / (sizeof(BYTE)*8); i++, posctr++)
-	{
-		p[i] = ((m_pBits[posctr] & GET_BIT_POSITIONS[lowermask]) >> lowermask) & 0xFF;
-		p[i] |= (m_pBits[posctr+1] & GET_BIT_POSITIONS_INV[uppermask]) << uppermask;
-	}
-	int remlen = len & 0x07;
-	if(remlen)
-	{
-		//temp = p[i] & GET_BIT_POSITIONS[remlen];
-		if(remlen <= uppermask)
-		{
-			//cout << "Getting " << remlen  << " lower bits with lowermask = " << lowermask << ", " << (unsigned int) m_pBits[posctr] << endl;
-			p[i] = ((m_pBits[posctr] & (((1<<remlen)-1 << lowermask))) >> lowermask) & 0xFF;
-			//cout << "p[i] = " << (unsigned int) p[i] << endl;
-		}
-		else
-		{
-			//cout << "Getting upper" << endl;
-			//cout << "Getting " << remlen  << " upper bits with lowermask = " << lowermask << ", " << (unsigned int) m_pBits[posctr] << ", and uppermask = "
-			//		<< uppermask << ", " << (unsigned int) m_pBits[posctr+1] << endl;
-			p[i] = ((m_pBits[posctr] & GET_BIT_POSITIONS[lowermask]) >> lowermask) & 0xFF;
-			p[i] |= (m_pBits[posctr+1] & (((1<<(remlen-uppermask))-1))) << uppermask;
-			//cout << "p[i] = " << (unsigned int) p[i] << endl;
-		}
-	}
-}
-
-void CBitVector::XORBytesReverse(BYTE* p, int pos, int len)
-{
-	BYTE* src = p;
-	BYTE* dst = m_pBits+pos;
-	BYTE* lim = dst + len;
-	while(dst != lim)
-	{
-		*dst++ ^= REVERSE_BYTE_ORDER[*src++];
-	}
-}
-
-//XOR bits given an offset on the bits for p which is not necessarily divisible by 8
-void CBitVector::XORBitsPosOffset(BYTE* p, int ppos, int pos, int len)
-{
-	for(int i = pos, j = ppos; j < ppos + len; i++, j++)
-	{
-		m_pBits[i/8] ^= (((p[j/8] & (1 << (j%8))) >> j % 8) << i % 8);
-	}
-}
-
-void CBitVector::XORBits(BYTE* p, int pos, int len)
-{
-	if(len < 1 || (pos+len) > m_nSize << 3)
-		return;
-	if(len == 1)
-	{
-		XORBitNoMask(pos, *p);
-		return;
-	}
-	if(!((pos & 0x07) || (len & 0x07)))
-	{
-		XORBytes(p, pos>>3, len>>3);
-		return;
-	}
-	int posctr = pos>>3;
-	int lowermask = pos & 7;
-	int uppermask = 8 - lowermask;
-
-	int i;
-	BYTE temp;
-	for(i = 0; i < len / (sizeof(BYTE)*8); i++, posctr++)
-	{
-		temp = p[i];
-		m_pBits[posctr] ^= ((temp << lowermask) & 0xFF);
-		m_pBits[posctr+1] ^= (temp >> uppermask);
-		//cout << "Iteration for whole byte done" << endl;
-	}
-	int remlen = len & 0x07;
-	if(remlen)
-	{
-		temp = p[i] & RESET_BIT_POSITIONS[remlen];
-		//cout << "temp = " << (unsigned int) temp << endl;
-		if(remlen <= uppermask)
-		{
-			//cout << "Setting " << remlen  << " lower bits with lowermask = " << lowermask << ", and temp " << (unsigned int) temp << endl;
-			m_pBits[posctr] ^= ((temp << lowermask) & 0xFF);
-		}
-		else
-		{
-			//cout << "Setting " << remlen  << " bits with lowermask = " << lowermask << ", uppermask = " << uppermask << ", and temp = " << (unsigned int) temp << endl;
-			m_pBits[posctr] ^= ((temp << lowermask) & 0xFF);
-			m_pBits[posctr+1] ^= (temp >> uppermask);
-		}
-	}
-}
-
-void CBitVector::ORByte(int pos, BYTE p)
-{
-	m_pBits[pos] |= p;
-}
-
-
-//optimized bytewise for set operation
-void CBitVector::GetBytes(BYTE* p, int pos, int len)
-{
-
-	BYTE* src = m_pBits + pos;
-	BYTE* dst = p;
-	//Do many operations on REGSIZE types first and then (if necessary) use bytewise operations
-	GetBytes((REGSIZE*) dst, (REGSIZE*) src, ((REGSIZE*) dst ) + (len>>SHIFTVAL));
-	dst += ((len >> SHIFTVAL) << SHIFTVAL);
-	src += ((len >> SHIFTVAL) << SHIFTVAL);
-	GetBytes(dst, src, dst+(len & ((1<<SHIFTVAL)-1)));
-}
-
-template <class T> void CBitVector::GetBytes(T* dst, T* src, T* lim)
-{
-	while(dst != lim)
-	{
-		*dst++ = *src++;
-	}
-}
-
-//optimized bytewise XOR operation
-void CBitVector::XORBytes(BYTE* p, int pos, int len)
-{
-
-	BYTE* dst = m_pBits + pos;
-	BYTE* src = p;
-	//Do many operations on REGSIZE types first and then (if necessary) use bytewise operations
-	XORBytes((REGSIZE*) dst, (REGSIZE*) src, ((REGSIZE*) dst ) + (len>>SHIFTVAL));
-	dst += ((len >> SHIFTVAL) << SHIFTVAL);
-	src += ((len >> SHIFTVAL) << SHIFTVAL);
-	XORBytes(dst, src, dst+(len & ((1<<SHIFTVAL)-1)));
-}
-
-//Generic bytewise XOR operation
-template <class T> void CBitVector::XORBytes(T* dst, T* src, T* lim)
-{
-	while(dst != lim)
-	{
-		*dst++ ^= *src++;
-	}
-}
-
-void CBitVector::XORRepeat(BYTE* p, int pos, int len, int num)
-{
-	unsigned short* dst = (unsigned short*) (m_pBits + pos);
-	unsigned short* src = (unsigned short*) p;
-	unsigned short* lim = (unsigned short*) (m_pBits+pos+len);
-	for(int i = num; dst != lim; )
-	{
-		*dst++ ^= *src++;
-		if(!(--i))
-		{
-			src = (unsigned short*) p;
-			i = num;
-		}
-	}
-}
-
-//optimized bytewise for set operation
-void CBitVector::SetBytes(BYTE* p, int pos, int len)
-{
-
-	BYTE* dst = m_pBits + pos;
-	BYTE* src = p;
-	//REGSIZE rem = SHIFTVAL-1;
-	//Do many operations on REGSIZE types first and then (if necessary) use bytewise operations
-	SetBytes((REGSIZE*) dst, (REGSIZE*) src, ((REGSIZE*) dst ) + (len>>SHIFTVAL));
-	dst += ((len >> SHIFTVAL) << SHIFTVAL);
-	src += ((len >> SHIFTVAL) << SHIFTVAL);
-	SetBytes(dst, src, dst+(len & ((1<<SHIFTVAL)-1)));
-}
-
-template <class T> void CBitVector::SetBytes(T* dst, T* src, T* lim)
-{
-	while(dst != lim)
-	{
-		*dst++ = *src++;
-	}
-}
-
-//optimized bytewise for AND operation
-void CBitVector::ANDBytes(BYTE* p, int pos, int len)
-{
-
-	BYTE* dst = m_pBits + pos;
-	BYTE* src = p;
-	//Do many operations on REGSIZE types first and then (if necessary) use bytewise operations
-	ANDBytes((REGSIZE*) dst, (REGSIZE*) src, ((REGSIZE*) dst ) + (len>>SHIFTVAL));
-	dst += ((len >> SHIFTVAL) << SHIFTVAL);
-	src += ((len >> SHIFTVAL) << SHIFTVAL);
-	ANDBytes(dst, src, dst+(len & ((1<<SHIFTVAL)-1)));
-}
-template <class T> void CBitVector::ANDBytes(T* dst, T* src, T* lim)
-{
-	while(dst != lim)
-	{
-		*dst++ &= *src++;
-	}
-}
-
-void CBitVector::SetXOR(BYTE* p, BYTE* q, int pos, int len)
-{
-	Copy(p, pos, len);
-	XORBytes(q, pos, len);
-}
-
-void CBitVector::SetAND(BYTE* p, BYTE* q, int pos, int len)
-{
-	Copy(p, pos, len);
-	ANDBytes(q, pos, len);
-}
-
-void CBitVector:: Print(int fromBit, int toBit)
-{
-	int to = toBit > (m_nSize << 3)? (m_nSize << 3) : toBit;
-	for (int i = fromBit; i < to; i++)
-	{
-		cout << (unsigned int) GetBitNoMask(i);
-	}
-	cout << endl;
-}
-
-void CBitVector::PrintHex()
-{
-	for (int i = 0; i < m_nSize; i++)
-	{
-		cout << setw(2) << setfill('0') << (hex) << ((unsigned int) m_pBits[i]);
-		//cout << (hex) << ((unsigned int) m_pBits[i]);
-	}
-	cout << (dec) << endl;
-}
-
-void CBitVector::PrintContent()
-{
-	if(m_nElementLength == 1)
-	{
-		PrintHex();
-		return;
-	}
-	if(m_nNumElementsDimB == 1)
-	{
-		for(int i = 0; i < m_nNumElements; i++)
-		{
-			cout << Get<int>(i) << ", ";
-		}
-		cout << endl;
-	}
-	else
-	{
-		for(int i = 0; i < m_nNumElements; i++)
-		{
-			cout << "(";
-			for(int j = 0; j < m_nNumElementsDimB-1; j++)
-			{
-				cout << Get2D<int>(i, j) << ", ";
-			}
-			cout << Get2D<int>(i, m_nNumElementsDimB-1);
-			cout << "), ";
-		}
-		cout << endl;
-	}
-}
-
-
-BOOL CBitVector::IsEqual(CBitVector& vec)
-{
-	if(vec.GetSize() != m_nSize)
-		return false;
-
-	BYTE* ptr = vec.GetArr();
-	for(int i = 0; i < m_nSize; i++)
-	{
-		if(ptr[i] != m_pBits[i])
-			return false;
-	}
-	return true;
-}
-
-void CBitVector::XOR_no_mask(int p, int bitPos, int bitLen)
-{
-	if(!bitLen)
-		return;
-
-	int i = bitPos>>3, j = 8-(bitPos&0x7), k;
-
-	m_pBits[i++] ^= (GetIntBitsFromLen(p, 0, min(j, bitLen))<<(8-j)) & 0xFF;
-
-	for (k=bitLen-j; k > 0; k-=8, i++, j+=8)
-	{
-		m_pBits[i] ^= GetIntBitsFromLen(p, j, min(8, k));
-	}
-}
-
-
-unsigned int CBitVector::GetInt(int bitPos, int bitLen)
-{
-	int ret = 0, i = bitPos>>3, j = (bitPos&0x7), k;
-	ret = (m_pBits[i++] >> (j)) & (GetMask(min(8, bitLen)));
-	if (bitLen == 1)
-		return ret;
-	//cout << "MpBits: " << (unsigned int) m_pBits[i-1] << ", ret: " << ret << endl;
-	j = 8-j;
-	for(k = bitLen - j; i<(bitPos + bitLen+7)/8-1; i++, j+=8, k-=8)
-	{
-		//ret |= REVERSE_BYTE_ORDER[m_pBits[i+pos]] << (i*8);
-		ret |= m_pBits[i] << j;
-		//cout << "MpBits: " <<(unsigned int) m_pBits[i] << ", ret: " << ret << ", j: " << j << endl;
-		//m_pBits[i+pos] = ( ((REVERSE_NIBBLE_ORDER[(p>>((2*i)*4))&0xF] << 4) | REVERSE_NIBBLE_ORDER[(p>>((2*i+1)*4))&0xF])  & 0xFF);//((p>>((2*i+1)*4))&0xF) | ((p>>((2*i)*4))&0xF) & 0xFF;
-	}
-	ret |= (m_pBits[i] & SELECT_BIT_POSITIONS[k]) << j; //for the last execution 0<=k<=8
-	//cout << "MpBits: " <<(unsigned int) m_pBits[i] << ", ret: " << ret << ", k = " << k <<  ", selects: " << (unsigned int) SELECT_BIT_POSITIONS[k] << ", j: " << j << endl;
-	return ret;
-}
-
-void CBitVector::SimpleTranspose(int rows, int columns)
-{
-	CBitVector temp(rows * columns);
-	temp.Copy(m_pBits, 0, rows * columns / 8);
-	for(int i = 0; i < rows; i++)
-	{
-		for(int j = 0; j < columns; j++)
-		{
-			SetBit(j * rows + i, temp.GetBit(i * columns + j));
-		}
-	}
-}
-
-
-//A transposition algorithm for bit-matrices of size 2^i x 2^i
-void CBitVector::EklundhBitTranspose(int rows, int columns)
-{
-	REGISTER_SIZE* rowaptr;//ptr;
-	REGISTER_SIZE* rowbptr;
-	REGISTER_SIZE temp_row;
-	REGISTER_SIZE mask;
-	REGISTER_SIZE invmask;
-	REGISTER_SIZE* lim;
-
-	lim = (REGISTER_SIZE*) m_pBits + CEIL_DIVIDE(rows * columns, 8);
-
-	int offset = (columns >> 3) / sizeof(REGISTER_SIZE);
-	int numiters = CEIL_LOG2(rows);
-	int srcidx = 1, destidx;
-	int rounds;
-	int p;
-
-	//If swapping is performed on bit-level
-	for(int i = 0, j; i < LOG2_REGISTER_SIZE; i++, srcidx*=2)
-	{
-		destidx = offset*srcidx;
-		rowaptr = (REGISTER_SIZE*) m_pBits;
-		rowbptr = rowaptr + destidx;//ptr = temp_mat;
-
-		//cout << "numrounds = " << numrounds << " iterations: " << LOG2_REGISTER_SIZE << ", offset = " << offset << ", srcidx = " << srcidx << ", destidx = " << destidx << endl;
-		//Preset the masks that are required for bit-level swapping operations
-
-		mask = TRANSPOSITION_MASKS[i];
-		invmask = ~mask;
-
-		/*if(i < 3)
-			numrounds = NUM_EXECS_NAOR_PINKAS*offset;
-		else
-			numrounds = rows*offset;*/
-		//If swapping is performed on byte-level reverse operations due to little-endian format.
-		rounds = rows / (srcidx * 2);
-		if(i > 2)
-		{
-			for(int j = 0; j < rounds; j++)
-			{
-				for(lim = rowbptr+destidx;rowbptr < lim; rowaptr++, rowbptr++)
-				{
-					temp_row = *rowaptr;
-					*rowaptr = ((*rowaptr & mask) ^ ((*rowbptr & mask)<<srcidx));
-					*rowbptr = ((*rowbptr & invmask) ^ ((temp_row & invmask)>>srcidx));
-				}
-				rowaptr+=destidx;
-				rowbptr+=destidx;
-			}
-		}
-		else
-		{
-			for(int j = 0; j < rounds; j++)
-			{
-				for(lim = rowbptr+destidx;rowbptr < lim; rowaptr++, rowbptr++)
-				{
-					temp_row = *rowaptr;
-					*rowaptr = ((*rowaptr & invmask) ^ ((*rowbptr & invmask)>>srcidx));
-					*rowbptr = ((*rowbptr & mask) ^ ((temp_row & mask)<<srcidx));
-				}
-				rowaptr+=destidx;
-				rowbptr+=destidx;
-			}
-		}
-	}
-
-
-	for(int i = LOG2_REGISTER_SIZE, j, swapoffset=1, dswapoffset; i < numiters; i++, srcidx*=2, swapoffset=swapoffset<<1)
-	{
-		destidx = offset*srcidx;
-		dswapoffset = swapoffset << 1;
-		rowaptr = (REGISTER_SIZE*) m_pBits;
-		rowbptr = rowaptr + destidx-swapoffset;//ptr = temp_mat;
-
-		rounds = rows / (srcidx * 2);
-		for(int j = 0; j < rows / (srcidx * 2); j++)
-		{
-			for(p = 0, lim = rowbptr+destidx; p < destidx && rowbptr < lim; p++, rowaptr++, rowbptr++)
-			{
-				if((p%dswapoffset >= swapoffset))
-				{
-					temp_row = *rowaptr;
-					*rowaptr = *rowbptr;
-					*rowbptr = temp_row;
-				}
-			}
-			rowaptr+=destidx;
-			rowbptr+=destidx;
-		}
-	}
-
-	if(columns > rows)
-	{
-		BYTE* tempvec = (BYTE*) malloc((rows*columns)/8);
-		memcpy(tempvec, m_pBits, ((rows/8)*columns));
-
-		rowaptr = (REGISTER_SIZE*) m_pBits;
-		int rowbytesize = rows/8;
-		int rowregsize = rows/(sizeof(REGISTER_SIZE) * 8);
-		for(int i = 0; i <columns/rows; i++)
-		{
-			rowbptr = (REGISTER_SIZE*) tempvec;
-			rowbptr +=  (i * rowregsize);
-			for(int j = 0; j < rows; j++, rowaptr+=rowregsize, rowbptr+=offset)
-			{
-				memcpy(rowaptr, rowbptr, rowbytesize);
-			}
-		}
-		free(tempvec);
-	}
-}
-
-
diff --git a/Porthos/util/cbitvector.h b/Porthos/util/cbitvector.h
deleted file mode 100644
index 5582405..0000000
--- a/Porthos/util/cbitvector.h
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * BitVector.h
- *
- *  Created on: May 6, 2013
- *      Author: mzohner
- */
-
-#ifndef CBITVECTOR_H_
-#define CBITVECTOR_H_
-
-#ifdef OTEXT_USE_OPENSSL
-#include <openssl/sha.h>
-#else
-#include "../util/sha1.h"
-#endif
-#include "../util/aes.h"
-#include "../util/typedefs.h"
-#include <math.h>
-#include <iostream>
-#include <iomanip>
-#include "TedKrovetzAesNiWrapperC.h"//suspicious
-
-struct SHA_BUFFER
-{
-	BYTE* data;
-	operator BYTE* (){ return data; }
-};
-
-typedef SHA_BUFFER sha1_reg_context;
-
-static const BYTE REVERSE_NIBBLE_ORDER[16] =
-	{0x0, 0x8, 0x4, 0xC, 0x2, 0xA, 0x6, 0xE, 0x1, 0x9, 0x5, 0xD, 0x3, 0xB, 0x7, 0xF};
-
-static const BYTE REVERSE_BYTE_ORDER[256] =
-	{0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0, 0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0, \
-	0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8, 0x18, 0x98, 0x58, 0xD8, 0x38, 0xB8, 0x78, 0xF8, \
-	0x04, 0x84, 0x44, 0xC4, 0x24, 0xA4, 0x64, 0xE4, 0x14, 0x94, 0x54, 0xD4, 0x34, 0xB4, 0x74, 0xF4, \
-	0x0C, 0x8C, 0x4C, 0xCC, 0x2C, 0xAC, 0x6C, 0xEC, 0x1C, 0x9C, 0x5C, 0xDC, 0x3C, 0xBC, 0x7C, 0xFC, \
-	0x02, 0x82, 0x42, 0xC2, 0x22, 0xA2, 0x62, 0xE2, 0x12, 0x92, 0x52, 0xD2, 0x32, 0xB2, 0x72, 0xF2, \
-	0x0A, 0x8A, 0x4A, 0xCA, 0x2A, 0xAA, 0x6A, 0xEA, 0x1A, 0x9A, 0x5A, 0xDA, 0x3A, 0xBA, 0x7A, 0xFA, \
-	0x06, 0x86, 0x46, 0xC6, 0x26, 0xA6, 0x66, 0xE6, 0x16, 0x96, 0x56, 0xD6, 0x36, 0xB6, 0x76, 0xF6, \
-	0x0E, 0x8E, 0x4E, 0xCE, 0x2E, 0xAE, 0x6E, 0xEE, 0x1E, 0x9E, 0x5E, 0xDE, 0x3E, 0xBE, 0x7E, 0xFE, \
-	0x01, 0x81, 0x41, 0xC1, 0x21, 0xA1, 0x61, 0xE1, 0x11, 0x91, 0x51, 0xD1, 0x31, 0xB1, 0x71, 0xF1, \
-	0x09, 0x89, 0x49, 0xC9, 0x29, 0xA9, 0x69, 0xE9, 0x19, 0x99, 0x59, 0xD9, 0x39, 0xB9, 0x79, 0xF9, \
-	0x05, 0x85, 0x45, 0xC5, 0x25, 0xA5, 0x65, 0xE5, 0x15, 0x95, 0x55, 0xD5, 0x35, 0xB5, 0x75, 0xF5, \
-	0x0D, 0x8D, 0x4D, 0xCD, 0x2D, 0xAD, 0x6D, 0xED, 0x1D, 0x9D, 0x5D, 0xDD, 0x3D, 0xBD, 0x7D, 0xFD, \
-	0x03, 0x83, 0x43, 0xC3, 0x23, 0xA3, 0x63, 0xE3, 0x13, 0x93, 0x53, 0xD3, 0x33, 0xB3, 0x73, 0xF3, \
-	0x0B, 0x8B, 0x4B, 0xCB, 0x2B, 0xAB, 0x6B, 0xEB, 0x1B, 0x9B, 0x5B, 0xDB, 0x3B, 0xBB, 0x7B, 0xFB, \
-	0x07, 0x87, 0x47, 0xC7, 0x27, 0xA7, 0x67, 0xE7, 0x17, 0x97, 0x57, 0xD7, 0x37, 0xB7, 0x77, 0xF7, \
-	0x0F, 0x8F, 0x4F, 0xCF, 0x2F, 0xAF, 0x6F, 0xEF, 0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF
-	};
-
-static const BYTE RESET_BIT_POSITIONS[9] =
-	{0x00, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3F, 0x7F, 0xFF};
-
-static const BYTE RESET_BIT_POSITIONS_INV[9] =
-	{0x00, 0x80, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC, 0xFE, 0xFF};
-
-static const BYTE GET_BIT_POSITIONS[9] =
-	{0xFF, 0xFE, 0xFC, 0xF8, 0xF0, 0xE0, 0xC0, 0x80, 0x00};
-
-static const BYTE GET_BIT_POSITIONS_INV[9] =
-	{0xFF, 0x7F, 0x3F, 0x1F, 0x0F, 0x07, 0x03, 0x01, 0x00};
-
-static const int INT_MASK[8] =
-	{0xFF, 0x7F, 0x3F, 0x1F, 0x0F, 0x07, 0x03, 0x01};
-
-static const int FIRST_MASK_SHIFT[8] =
-	{0xFF00, 0x7F80, 0x3FC0, 0x1FE0, 0x0FF0, 0x07F8, 0x03FC, 0x01FE};
-
-static const BYTE MASK_BIT[8] =
-	{0x80, 0x40, 0x20, 0x10, 0x8, 0x4, 0x2, 0x1};
-
-static const BYTE BIT[8] =
-	{0x1, 0x2, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80};
-
-static const BYTE CMASK_BIT[8] =
-	{0x7f, 0xbf, 0xdf, 0xef, 0xf7, 0xfb, 0xfd, 0xfe};
-
-static const BYTE C_BIT[8] =
-	{0xFE, 0xFD, 0xFB, 0xF7, 0xEF, 0xDF, 0xBF, 0x7F};
-
-static const BYTE MASK_SET_BIT[2][8] =
-	{{0,0,0,0,0,0,0,0},{0x80, 0x40, 0x20, 0x10, 0x8, 0x4, 0x2, 0x1}};
-
-static const BYTE MASK_SET_BIT_C[2][8] =
-	{{0x80, 0x40, 0x20, 0x10, 0x8, 0x4, 0x2, 0x1},{0,0,0,0,0,0,0,0}};
-
-static const BYTE SET_BIT_C[2][8] =
-	{{0x1, 0x2, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80},{0,0,0,0,0,0,0,0}};
-
-const BYTE SELECT_BIT_POSITIONS[9] = {0x00, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3F, 0x7F, 0xFF};
-
-
-#ifdef MACHINE_SIZE_32
-static const REGISTER_SIZE TRANSPOSITION_MASKS[6] =
-	{0x55555555, 0x33333333, 0x0F0F0F0F, 0x00FF00FF, 0x0000FFFF};
-static const REGISTER_SIZE TRANSPOSITION_MASKS_INV[6] =
-	{0xAAAAAAAA, 0xCCCCCCCC, 0xF0F0F0F0, 0xFF00FF00, 0xFFFF0000};
-#else
-	#ifdef MACHINE_SIZE_64
-static const REGISTER_SIZE TRANSPOSITION_MASKS[6] =
-	{0x5555555555555555, 0x3333333333333333, 0x0F0F0F0F0F0F0F0F, 0x00FF00FF00FF00FF, 0x0000FFFF0000FFFF, 0x00000000FFFFFFFF};
-static const REGISTER_SIZE TRANSPOSITION_MASKS_INV[6] =
-	{0xAAAAAAAAAAAAAAAA, 0xCCCCCCCCCCCCCCCC, 0xF0F0F0F0F0F0F0F0, 0xFF00FF00FF00FF00, 0xFFFF0000FFFF0000, 0xFFFFFFFF00000000};
-	#else
-	#endif
-#endif
-
-static const size_t SHIFTVAL = 3;//sizeof(REGSIZE);
-
-class CBitVector
-{
-public:
-	CBitVector(){ m_pBits =  NULL; m_nSize = 0; m_nKey.rounds = 0;}
-	CBitVector(int bits){ m_pBits =  NULL; m_nSize = 0; m_nKey.rounds = 0; Create(bits);}
-	CBitVector(int bits, BYTE* seed, int& cnt){ m_pBits =  NULL;
-	m_nSize = 0; m_nKey.rounds = 0; Create(bits, seed, cnt);}
-
-	//~CBitVector(){ if(m_pBits) free(m_pBits); }
-	void delCBitVector(){ if(m_pBits) free(m_pBits); }
-
-	//TODO: change to use AES-NI
-	/* Use this function to initialize the AES round key which can then be used to generate further random bits */
-	void InitRand(BYTE* seed) { OTEXT_AES_KEY_INIT(&m_nKey,seed); }//private_AES_set_encrypt_key(seed, AES_KEY_BITS, &m_nKey);}
-
-	/* Fill the bitvector with random values and pre-initialize the key to the seed-key*/
-	void FillRand(int bits, BYTE* seed, int& cnt);
-
-	/* Fill random values using the pre-defined AES key */
-	void FillRand(int bits, int& cnt);
-
-	/**
-	 *  Create Operations
-	 */
-
-	//Create in bits and bytes
-	void Create(int bits);
-	void CreateBytes(int bytes) {	Create(bytes<<3); }
-	void CreateZeros(int bits) { Create(bits);		memset(m_pBits, 0, m_nSize); }
-	//Create and fill with random values
-	void Create(int bits, BYTE* seed, int& cnt);
-	//Create an abstract array of values
-	void Create(int numelements, int elementlength);
-	void Create(int numelements, int elementlength, BYTE* seed, int& cnt);
-	//Create an abstract two-dimensional array of values
-	void Create(int numelementsDimA, int numelementsDimB, int elementlength);
-	void Create(int numelementsDimA, int numelementsDimB, int elementlength, BYTE* seed, int& cnt);
-
-
-	/*
-	 * Management operations
-	 */
-	void ResizeinBytes(int newSizeBytes);
-	void Reset() { memset(m_pBits, 0, m_nSize);	}
-	void SetToOne() { memset(m_pBits, 0xFF, m_nSize);	}
-	int GetSize(){ return m_nSize; }
-	BOOL IsEqual(CBitVector& vec);
-	void SetElementLength(int elelen) {	m_nElementLength = elelen; }
-
-
-	/*
-	 * Copy operations
-	 */
-
-	void Copy(CBitVector& vec) { Copy(vec.GetArr(), 0, vec.GetSize());	}
-	void Copy(CBitVector& vec, int pos, int len) { Copy(vec.GetArr(), pos, len); }
-	void Copy(BYTE* p, int pos, int len);
-
-
-
-	void XOR_no_mask(int p, int bitPos, int bitLen);
-	unsigned int GetInt(int bitPos, int bitLen);
-	#define GetIntBitsFromLen(x, from, len) 	( ( (x & ( ( (2<<(len))-1) << from )) >> from) & 0xFF)
-	#define GetMask(len) 				(( (1<<(len))-1))
-
-	void ORByte(int pos, BYTE p);
-
-
-	/*
-	 * Bitwise operations
-	 */
-	BYTE GetBit(int idx) { return !!(m_pBits[idx>>3] & MASK_BIT[idx & 0x7]); }
-	void SetBit(int idx, BYTE b) {	m_pBits[idx>>3] = (m_pBits[idx>>3] & CMASK_BIT[idx & 0x7]) | MASK_SET_BIT_C[!b][idx & 0x7];	}
-	void XORBit(int idx, BYTE b) {	m_pBits[idx>>3] ^= MASK_SET_BIT_C[!b][idx & 0x7]; }
-	void ANDBit(int idx, BYTE b) {	if(!b) m_pBits[idx>>3] &= CMASK_BIT[idx & 0x7]; }
-
-	//used to access bits in the regular order
-	BYTE GetBitNoMask(int idx) { return !!(m_pBits[idx>>3] & BIT[idx & 0x7]); }
-	void SetBitNoMask(int idx, BYTE b) {	m_pBits[idx>>3] = (m_pBits[idx>>3] & C_BIT[idx & 0x7]) | SET_BIT_C[!b][idx & 0x7];	}
-	void XORBitNoMask(int idx, BYTE b) {	m_pBits[idx>>3] ^= SET_BIT_C[!b][idx & 0x7]; }
-	void ANDBitNoMask(int idx, BYTE b) {	if(!b) m_pBits[idx>>3] &= C_BIT[idx & 0x7]; }
-
-
-	/*
-	 * Single byte operations
-	 */
-	void SetByte(int idx, BYTE p) {	m_pBits[idx] = p;}
-	BYTE GetByte(int idx) {	return m_pBits[idx]; }
-	void XORByte(int idx, BYTE b) {	m_pBits[idx] ^= b; }
-	void ANDByte(int idx, BYTE b) {	m_pBits[idx] &= b; }
-
-	/*
-	 * Get Operations
-	 */
-	void GetBits(BYTE* p, int pos, int len);
-	void GetBytes(BYTE* p, int pos, int len);
-	template <class T> void GetBytes(T* dst, T* src, T* lim);
-	template <class T> T Get(int pos, int len)
-	{
-		T val = 0;
-		GetBits((BYTE*) &val, pos, len);
-		return val;
-	}
-	//NEW
-	__m128i GetBlock(int pos){return _mm_set_epi32(GetInt(pos * 128 + 96, 32), GetInt(pos * 128 + 64, 32), GetInt(pos * 128 + 32, 32), GetInt(pos * 128, 32));}
-
-
-	/*
-	 * Set Operations
-	 */
-	void SetBits(BYTE* p, int pos, int len);
-	void SetBytes(BYTE* p, int pos, int len);
-	template <class T> void SetBytes(T* dst, T* src, T* lim);
-	template <class T> void Set(T val, int pos, int len) { SetBits((BYTE*) &val, pos, len); }
-	void SetBitsToZero(int bitpos, int bitlen);
-
-
-	/*
-	 * XOR Operations
-	 */
-	void XORBytes(BYTE* p, int pos, int len);
-	void XORBytes(BYTE* p, int len) { XORBytes(p, 0, len); }
-	void XORVector(CBitVector &vec, int pos, int len) { XORBytes(vec.GetArr(), pos, len); }
-	template <class T> void XOR(T val, int pos, int len) { XORBits((BYTE*) &val, pos, len); }
-	void XORBits(BYTE* p, int pos, int len);
-	void XORBitsPosOffset(BYTE* p, int ppos, int pos, int len);
-	template <class T> void XORBytes(T* dst, T* src, T* lim);
-	void XORRepeat(BYTE* p, int pos, int len, int num);
-	void XORBytesReverse(BYTE* p, int pos, int len);
-
-
-
-	/*
-	 * AND Operations
-	 */
-	void ANDBytes(BYTE* p, int pos, int len);
-	template <class T> void ANDBytes(T* dst, T* src, T* lim);
-
-
-	/*
-	 * Set operations
-	 */
-	void SetXOR(BYTE* p, BYTE* q, int pos, int len);
-	void SetAND(BYTE* p, BYTE* q, int pos, int len);
-
-	/*
-	 * Buffer access operations
-	 */
-	BYTE* GetArr(){ return m_pBits;}
-	void AttachBuf(BYTE* p, int size=-1){ m_pBits = p; m_nSize = size;}
-	void DetachBuf(){ m_pBits = NULL; m_nSize = 0;}
-
-
-	/*
-	 * Print Operations
-	 */
-	void Print(int fromBit, int toBit);
-	void PrintHex();
-	void PrintBinary() { Print(0, m_nSize<<3); }
-	void PrintContent();
-
-
-	/*
-	 * If the cbitvector is abstracted to an array of elements with m_nElementLength bits size, these methods can be used for easier access
-	 */
-	template <class T> T Get(int i){ return Get<T>(i*m_nElementLength, m_nElementLength);}
-	template <class T> void Set(int i, T val){ return Set<T>(val, i*m_nElementLength, m_nElementLength);}
-	/*
-	 * The same as the above methods only for two-dimensional access
-	 */
-	template <class T> T Get2D(int i, int j){ return Get<T>((i * m_nNumElementsDimB + j) * m_nElementLength, m_nElementLength);}
-	template <class T> void Set2D(int i, int j, T val){ return Set<T>(val, (i * m_nNumElementsDimB + j) * m_nElementLength, m_nElementLength);}
-	//useful when accessing elements using an index
-
-
-	//View the cbitvector as a rows x columns matrix and transpose
-	void EklundhBitTranspose(int rows, int columns);
-	void SimpleTranspose(int rows, int columns);
-
-
-
-private:
-	BYTE*		m_pBits;
-	int			m_nSize;
-	AES_KEY_CTX 	m_nKey;
-	int 		m_nBits; //The exact number of bits
-	int			m_nElementLength;
-	int 		m_nNumElements;
-	int			m_nNumElementsDimB;
-};
-
-
-
-
-#endif /* BITVECTOR_H_ */
diff --git a/Porthos/util/main_gf_funcs.cpp b/Porthos/util/main_gf_funcs.cpp
deleted file mode 100644
index c82b672..0000000
--- a/Porthos/util/main_gf_funcs.cpp
+++ /dev/null
@@ -1,530 +0,0 @@
-/********************************************************************/
-/* Copyright(c) 2015.                                               */
-/* Shay Gueron (1) (2)                                              */
-/* (1) University of Haifa, Israel                                  */
-/* (2) Intel, Israel                                                */
-/*                                                                  */
-/* This code is part of the SCAPI project. It was taken from code   */
-/* written by Shay Gueron.                                          */
-/*                                                                  */
-/********************************************************************/
-/*NOTE: several changes have been made to the original code by Shay Gueron*/
-
-#include "main_gf_funcs.h"
-
-using namespace std;
-
-void THREE_GFMUL_naive(__m128i &A, __m128i &B, __m128i &C, __m128i &D, __m128i &E, __m128i &F, __m128i *HIGH, __m128i *LOW)
-{
-	__m128i tmp1_1, tmp1_2, tmp1_3, tmp1_4;
-	__m128i tmp2_1, tmp2_2, tmp2_3, tmp2_4;
-	__m128i tmp3_1, tmp3_2, tmp3_3, tmp3_4;
-	__m128i acc1, acc2, acc3, acc4;
-	
-	tmp1_1 = _mm_clmulepi64_si128(A, B, 0x00); 
-    tmp1_3 = _mm_clmulepi64_si128(A, B, 0x10);
-    tmp1_2 = _mm_clmulepi64_si128(A, B, 0x01);
-    tmp1_4 = _mm_clmulepi64_si128(A, B, 0x11);
-	
-	tmp2_1 = _mm_clmulepi64_si128(C, D, 0x00); 
-    tmp2_3 = _mm_clmulepi64_si128(C, D, 0x10);
-    tmp2_2 = _mm_clmulepi64_si128(C, D, 0x01);
-    tmp2_4 = _mm_clmulepi64_si128(C, D, 0x11);
-	
-	tmp3_1 = _mm_clmulepi64_si128(E, F, 0x00); 
-    tmp3_3 = _mm_clmulepi64_si128(E, F, 0x10);
-    tmp3_2 = _mm_clmulepi64_si128(E, F, 0x01);
-    tmp3_4 = _mm_clmulepi64_si128(E, F, 0x11);
-		
-	acc1 = _mm_xor_si128(tmp1_1, tmp2_1);
-	acc2 = _mm_xor_si128(tmp1_2, tmp2_2);
-	acc3 = _mm_xor_si128(tmp1_3, tmp2_3);
-	acc4 = _mm_xor_si128(tmp1_4, tmp2_4);
-	
-	acc1 = _mm_xor_si128(acc1, tmp3_1);
-	acc2 = _mm_xor_si128(acc2, tmp3_2);
-	acc3 = _mm_xor_si128(acc3, tmp3_3);
-	acc4 = _mm_xor_si128(acc4, tmp3_4);
-	
-	acc2 = _mm_xor_si128(acc2, acc3);
-	acc3 = _mm_slli_si128(acc2, 8);
-    acc2 = _mm_srli_si128(acc2, 8);
-	
-	*LOW = _mm_xor_si128(acc1, acc3);
-	*HIGH = _mm_xor_si128(acc2, acc4);
-}
-
-void THREE_GFMUL_accumulated(__m128i &A, __m128i &B, __m128i &C, __m128i &D, __m128i &E, __m128i &F, __m128i *HIGH, __m128i *LOW)
-{
-	__m128i tmp1, tmp2, tmp3, tmp4;
-	__m128i acc1, acc2, acc3, acc4;
-	
-	acc1 = _mm_clmulepi64_si128(A, B, 0x00); 
-    acc2 = _mm_clmulepi64_si128(A, B, 0x10);
-    acc3 = _mm_clmulepi64_si128(A, B, 0x01);
-    acc4 = _mm_clmulepi64_si128(A, B, 0x11);
-	
-	tmp1 = _mm_clmulepi64_si128(C, D, 0x00); 
-    tmp2 = _mm_clmulepi64_si128(C, D, 0x10);
-    tmp3 = _mm_clmulepi64_si128(C, D, 0x01);
-    tmp4 = _mm_clmulepi64_si128(C, D, 0x11);
-	
-	acc1 = _mm_xor_si128(acc1, tmp1);
-	acc2 = _mm_xor_si128(acc2, tmp2);
-	acc3 = _mm_xor_si128(acc3, tmp3);
-	acc4 = _mm_xor_si128(acc4, tmp4);
-	
-	tmp1 = _mm_clmulepi64_si128(E, F, 0x00); 
-    tmp2 = _mm_clmulepi64_si128(E, F, 0x10);
-    tmp3 = _mm_clmulepi64_si128(E, F, 0x01);
-    tmp4 = _mm_clmulepi64_si128(E, F, 0x11);
-		
-	acc1 = _mm_xor_si128(acc1, tmp1);
-	acc2 = _mm_xor_si128(acc2, tmp2);
-	acc3 = _mm_xor_si128(acc3, tmp3);
-	acc4 = _mm_xor_si128(acc4, tmp4);
-		
-	acc2 = _mm_xor_si128(acc2, acc3);
-	acc3 = _mm_slli_si128(acc2, 8);
-    acc2 = _mm_srli_si128(acc2, 8);
-	
-	*LOW = _mm_xor_si128(acc1, acc3);
-	*HIGH = _mm_xor_si128(acc2, acc4);
-}
-
-void gfmul3(__m128i A, __m128i B, __m128i *RES) {
-
-	__m128i POLY = _mm_setr_epi32(0x87, 0, 0, 0);
-	__m128i tmp1, tmp2, tmp3, tmp4;
-	__m128i acc1, acc2, acc3, acc4;
-
-	acc1 = _mm_clmulepi64_si128(A, B, 0x00);
-	acc2 = _mm_clmulepi64_si128(A, B, 0x10);
-	acc3 = _mm_clmulepi64_si128(A, B, 0x01);
-	acc4 = _mm_clmulepi64_si128(A, B, 0x11);
-
-	acc2 = _mm_xor_si128(acc2, acc3);
-	acc3 = _mm_slli_si128(acc2, 8);
-	acc2 = _mm_srli_si128(acc2, 8);
-
-	acc1 = _mm_xor_si128(acc1, acc3);
-	acc4 = _mm_xor_si128(acc2, acc4);
-
-	//phase 1
-	tmp3 = _mm_clmulepi64_si128(acc4, POLY, 0x01);
-
-	tmp1 = _mm_slli_si128(tmp3, 8);
-	tmp4 = _mm_srli_si128(tmp3, 8);
-
-	tmp2 = _mm_xor_si128(acc4, tmp4);
-	tmp3 = _mm_xor_si128(acc1, tmp1);
-
-	//phase 2
-	acc2 = _mm_clmulepi64_si128(tmp2, POLY, 0x00);
-	*RES = _mm_xor_si128(tmp3, acc2);
-}
-
-void gfmul3HalfZeros(__m128i A, __m128i B, __m128i *RES) {
-
-	__m128i POLY = _mm_setr_epi32(0x87, 0, 0, 0);
-	__m128i tmp1, tmp2, tmp3, tmp4;
-	__m128i acc1, acc2, acc3, acc4;
-
-	acc1 = _mm_clmulepi64_si128(A, B, 0x00);
-	acc2 = _mm_setr_epi32(0, 0, 0, 0);//_mm_clmulepi64_si128(A, B, 0x10);
-	acc3 = _mm_clmulepi64_si128(A, B, 0x01);
-	acc4 = _mm_setr_epi32(0, 0, 0, 0);//_mm_clmulepi64_si128(A, B, 0x11);
-
-	acc2 = _mm_xor_si128(acc2, acc3);
-	acc3 = _mm_slli_si128(acc2, 8);
-	acc2 = _mm_srli_si128(acc2, 8);
-
-	acc1 = _mm_xor_si128(acc1, acc3);
-	acc4 = _mm_xor_si128(acc2, acc4);
-
-	//phase 1
-	tmp3 = _mm_clmulepi64_si128(acc4, POLY, 0x01);
-
-	tmp1 = _mm_slli_si128(tmp3, 8);
-	tmp4 = _mm_srli_si128(tmp3, 8);
-
-	tmp2 = _mm_xor_si128(acc4, tmp4);
-	tmp3 = _mm_xor_si128(acc1, tmp1);
-
-	//phase 2
-	acc2 = _mm_clmulepi64_si128(tmp2, POLY, 0x00);
-	*RES = _mm_xor_si128(tmp3, acc2);
-}
-
-__m128i gfmul3(__m128i A, __m128i B)
-{
-	__m128i ans;
-	gfmul3(A, B, &ans);
-	return ans;
-}
-
-__m128i gfmul3HalfZeros(__m128i A, __m128i B)
-{
-	__m128i ans;
-	gfmul3HalfZeros(A, B, &ans);
-	return ans;
-}
-
-void THREE_GFMUL_accumulated_REDUCED(__m128i &A, __m128i &B, __m128i &C, __m128i &D, __m128i &E, __m128i &F, __m128i *RES){
-	
-	__m128i POLY = _mm_setr_epi32(0x87, 0, 0, 0);
-	__m128i tmp1, tmp2, tmp3, tmp4;
-	__m128i acc1, acc2, acc3, acc4;
-	
-	acc1 = _mm_clmulepi64_si128(A, B, 0x00); 
-    acc2 = _mm_clmulepi64_si128(A, B, 0x10);
-    acc3 = _mm_clmulepi64_si128(A, B, 0x01);
-    acc4 = _mm_clmulepi64_si128(A, B, 0x11);
-	
-	tmp1 = _mm_clmulepi64_si128(C, D, 0x00); 
-    tmp2 = _mm_clmulepi64_si128(C, D, 0x10);
-    tmp3 = _mm_clmulepi64_si128(C, D, 0x01);
-    tmp4 = _mm_clmulepi64_si128(C, D, 0x11);
-	
-	acc1 = _mm_xor_si128(acc1, tmp1);
-	acc2 = _mm_xor_si128(acc2, tmp2);
-	acc3 = _mm_xor_si128(acc3, tmp3);
-	acc4 = _mm_xor_si128(acc4, tmp4);
-	
-	tmp1 = _mm_clmulepi64_si128(E, F, 0x00); 
-    tmp2 = _mm_clmulepi64_si128(E, F, 0x10);
-    tmp3 = _mm_clmulepi64_si128(E, F, 0x01);
-    tmp4 = _mm_clmulepi64_si128(E, F, 0x11);
-		
-	acc1 = _mm_xor_si128(acc1, tmp1);
-	acc2 = _mm_xor_si128(acc2, tmp2);
-	acc3 = _mm_xor_si128(acc3, tmp3);
-	acc4 = _mm_xor_si128(acc4, tmp4);
-		
-	acc2 = _mm_xor_si128(acc2, acc3);
-	acc3 = _mm_slli_si128(acc2, 8);
-    acc2 = _mm_srli_si128(acc2, 8);
-	
-	acc1 = _mm_xor_si128(acc1, acc3);
-	acc4 = _mm_xor_si128(acc2, acc4);
-	
-	//phase 1
-	tmp3 = _mm_clmulepi64_si128(acc4, POLY, 0x01);			
-	
-	tmp1  = _mm_slli_si128(tmp3, 8);					
-	tmp4 = _mm_srli_si128(tmp3, 8);						
-	
-	tmp2 = _mm_xor_si128(acc4, tmp4);						
-	tmp3 = _mm_xor_si128(acc1, tmp1);						
-
-	//phase 2
-	acc2 = _mm_clmulepi64_si128(tmp2, POLY, 0x00);			
-	*RES = _mm_xor_si128(tmp3, acc2);		
-}		
-
-void REDUCE(__m128i high, __m128i low, __m128i *RES){
-	
-	__m128i POLY = _mm_setr_epi32(0x87, 0, 0, 0);			
-	__m128i xmm4, xmm3, xmm2;
-	__m128i left, right;
-		
-	//phase 1
-	xmm3 = _mm_clmulepi64_si128(high, POLY, 0x01);			
-	
-	left  = _mm_slli_si128(xmm3, 8);					
-	right = _mm_srli_si128(xmm3, 8);						
-	
-	xmm2 = _mm_xor_si128(high, right);						
-	xmm3 = _mm_xor_si128(low, left);						
-
-	//phase 2
-	xmm4 = _mm_clmulepi64_si128(xmm2, POLY, 0x00);			
-	*RES = _mm_xor_si128(xmm3, xmm4);						
-}
-
-
-//Dot product
-void gfDotProductPiped(__m128i* vec1, __m128i* vec2, int length, __m128i* ans)
-{
-	__m128i POLY = _mm_setr_epi32(0x87, 0, 0, 0);
-	__m128i tmp1, tmp2, tmp3, tmp4;
-	__m128i acc1, acc2, acc3, acc4;
-
-	acc1 = _mm_clmulepi64_si128(vec1[0], vec2[0], 0x00);
-	acc2 = _mm_clmulepi64_si128(vec1[0], vec2[0], 0x10);
-	acc3 = _mm_clmulepi64_si128(vec1[0], vec2[0], 0x01);
-	acc4 = _mm_clmulepi64_si128(vec1[0], vec2[0], 0x11);
-
-	for (int i = 1; i < length; i++)
-	{
-		tmp1 = _mm_clmulepi64_si128(vec1[i], vec2[i], 0x00);
-		tmp2 = _mm_clmulepi64_si128(vec1[i], vec2[i], 0x10);
-		tmp3 = _mm_clmulepi64_si128(vec1[i], vec2[i], 0x01);
-		tmp4 = _mm_clmulepi64_si128(vec1[i], vec2[i], 0x11);
-
-		acc1 = _mm_xor_si128(acc1, tmp1);
-		acc2 = _mm_xor_si128(acc2, tmp2);
-		acc3 = _mm_xor_si128(acc3, tmp3);
-		acc4 = _mm_xor_si128(acc4, tmp4);
-	}
-
-	acc2 = _mm_xor_si128(acc2, acc3);
-	acc3 = _mm_slli_si128(acc2, 8);
-	acc2 = _mm_srli_si128(acc2, 8);
-
-	acc1 = _mm_xor_si128(acc1, acc3);
-	acc4 = _mm_xor_si128(acc2, acc4);
-
-	//phase 1
-	tmp3 = _mm_clmulepi64_si128(acc4, POLY, 0x01);
-
-	tmp1 = _mm_slli_si128(tmp3, 8);
-	tmp4 = _mm_srli_si128(tmp3, 8);
-
-	tmp2 = _mm_xor_si128(acc4, tmp4);
-	tmp3 = _mm_xor_si128(acc1, tmp1);
-
-	//phase 2
-	acc2 = _mm_clmulepi64_si128(tmp2, POLY, 0x00);
-	ans[0]= _mm_xor_si128(tmp3, acc2);
-}
-
-void gfDotProductPipedHZ(__m128i* vec1, __m128i* vec2, int length, __m128i* ans)
-{
-	__m128i POLY = _mm_setr_epi32(0x87, 0, 0, 0);
-	__m128i tmp1, tmp2, tmp3, tmp4;
-	__m128i acc1, acc2, acc3, acc4;
-
-	acc1 = _mm_clmulepi64_si128(vec1[0], vec2[0], 0x00);
-	acc2 = _mm_setr_epi32(0, 0, 0, 0);
-	acc3 = _mm_clmulepi64_si128(vec1[0], vec2[0], 0x01);
-	acc4 = _mm_setr_epi32(0, 0, 0, 0);
-
-	
-	for (int i = 1; i < length; i++)
-	{
-		tmp1 = _mm_clmulepi64_si128(vec1[i], vec2[i], 0x00);
-		
-		tmp3 = _mm_clmulepi64_si128(vec1[i], vec2[i], 0x01);
-		
-		
-		acc1 = _mm_xor_si128(acc1, tmp1);
-		
-		acc3 = _mm_xor_si128(acc3, tmp3);
-		
-	}
-
-	acc2 = _mm_xor_si128(acc2, acc3);
-	acc3 = _mm_slli_si128(acc2, 8);
-	acc2 = _mm_srli_si128(acc2, 8);
-
-	acc1 = _mm_xor_si128(acc1, acc3);
-	acc4 = _mm_xor_si128(acc2, acc4);
-
-	//phase 1
-	tmp3 = _mm_clmulepi64_si128(acc4, POLY, 0x01);
-	
-	tmp1 = _mm_slli_si128(tmp3, 8);
-	tmp4 = _mm_srli_si128(tmp3, 8);
-
-	tmp2 = _mm_xor_si128(acc4, tmp4);
-	tmp3 = _mm_xor_si128(acc1, tmp1);
-
-	//phase 2
-	acc2 = _mm_clmulepi64_si128(tmp2, POLY, 0x00);
-	ans[0] = _mm_xor_si128(tmp3, acc2);
-}
-
-__m128i gfmulNew(__m128i A, __m128i B)
-{
-	__m128i tmp = { 0 };
-	__m128i res;
-	THREE_GFMUL_accumulated_REDUCED(A, B, tmp, tmp, tmp, tmp, &res);
-	return res;
-}
-
-
-
-void Add_Pointwise_4_Multiplication(__m128i *A, __m128i *B, __m128i *C,
-	__m128i *D, __m128i *E, __m128i *F, __m128i *G, __m128i *H,
-	__m128i *RES0, __m128i *RES1, __m128i *RES2, __m128i *RES3) {
-
-	__m128i POLY = _mm_setr_epi32(0x87, 0, 0, 0);
-	__m128i tmp1, tmp2, tmp3, tmp4;
-	__m128i acc1, acc2, acc3, acc4;
-
-	acc1 = _mm_clmulepi64_si128(*A, *B, 0x00);
-	acc2 = _mm_clmulepi64_si128(*A, *B, 0x10);
-	acc3 = _mm_clmulepi64_si128(*A, *B, 0x01);
-	acc4 = _mm_clmulepi64_si128(*A, *B, 0x11);
-
-	acc2 = _mm_xor_si128(acc2, acc3);
-	acc3 = _mm_slli_si128(acc2, 8);
-	acc2 = _mm_srli_si128(acc2, 8);
-
-	acc1 = _mm_xor_si128(acc1, acc3);
-	acc4 = _mm_xor_si128(acc2, acc4);
-
-
-	tmp3 = _mm_clmulepi64_si128(acc4, POLY, 0x01);
-
-	tmp1 = _mm_slli_si128(tmp3, 8);
-	tmp4 = _mm_srli_si128(tmp3, 8);
-
-	tmp2 = _mm_xor_si128(acc4, tmp4);
-	tmp3 = _mm_xor_si128(acc1, tmp1);
-	*RES0 = _mm_xor_si128(tmp3, *RES0);
-	acc2 = _mm_clmulepi64_si128(tmp2, POLY, 0x00);
-	*RES0 = _mm_xor_si128(*RES0, acc2);
-
-
-	acc1 = _mm_clmulepi64_si128(*C, *D, 0x00);
-	acc2 = _mm_clmulepi64_si128(*C, *D, 0x10);
-	acc3 = _mm_clmulepi64_si128(*C, *D, 0x01);
-	acc4 = _mm_clmulepi64_si128(*C, *D, 0x11);
-
-	acc2 = _mm_xor_si128(acc2, acc3);
-	acc3 = _mm_slli_si128(acc2, 8);
-	acc2 = _mm_srli_si128(acc2, 8);
-
-	acc1 = _mm_xor_si128(acc1, acc3);
-	acc4 = _mm_xor_si128(acc2, acc4);
-
-
-	tmp3 = _mm_clmulepi64_si128(acc4, POLY, 0x01);
-
-	tmp1 = _mm_slli_si128(tmp3, 8);
-	tmp4 = _mm_srli_si128(tmp3, 8);
-
-	tmp2 = _mm_xor_si128(acc4, tmp4);
-	tmp3 = _mm_xor_si128(acc1, tmp1);
-	*RES1 = _mm_xor_si128(tmp3, *RES1);
-	acc2 = _mm_clmulepi64_si128(tmp2, POLY, 0x00);
-	*RES1 = _mm_xor_si128(*RES1, acc2);
-
-
-	acc1 = _mm_clmulepi64_si128(*E, *F, 0x00);
-	acc2 = _mm_clmulepi64_si128(*E, *F, 0x10);
-	acc3 = _mm_clmulepi64_si128(*E, *F, 0x01);
-	acc4 = _mm_clmulepi64_si128(*E, *F, 0x11);
-
-	acc2 = _mm_xor_si128(acc2, acc3);
-	acc3 = _mm_slli_si128(acc2, 8);
-	acc2 = _mm_srli_si128(acc2, 8);
-
-	acc1 = _mm_xor_si128(acc1, acc3);
-	acc4 = _mm_xor_si128(acc2, acc4);
-
-
-	tmp3 = _mm_clmulepi64_si128(acc4, POLY, 0x01);
-
-	tmp1 = _mm_slli_si128(tmp3, 8);
-	tmp4 = _mm_srli_si128(tmp3, 8);
-
-	tmp2 = _mm_xor_si128(acc4, tmp4);
-	tmp3 = _mm_xor_si128(acc1, tmp1);
-	*RES2 = _mm_xor_si128(tmp3, *RES2);
-	acc2 = _mm_clmulepi64_si128(tmp2, POLY, 0x00);
-	*RES2 = _mm_xor_si128(*RES2, acc2);
-
-	acc1 = _mm_clmulepi64_si128(*G, *H, 0x00);
-	acc2 = _mm_clmulepi64_si128(*G, *H, 0x10);
-	acc3 = _mm_clmulepi64_si128(*G, *H, 0x01);
-	acc4 = _mm_clmulepi64_si128(*G, *H, 0x11);
-
-	acc2 = _mm_xor_si128(acc2, acc3);
-	acc3 = _mm_slli_si128(acc2, 8);
-	acc2 = _mm_srli_si128(acc2, 8);
-
-	acc1 = _mm_xor_si128(acc1, acc3);
-	acc4 = _mm_xor_si128(acc2, acc4);
-
-
-	tmp3 = _mm_clmulepi64_si128(acc4, POLY, 0x01);
-
-	tmp1 = _mm_slli_si128(tmp3, 8);
-	tmp4 = _mm_srli_si128(tmp3, 8);
-
-	tmp2 = _mm_xor_si128(acc4, tmp4);
-	tmp3 = _mm_xor_si128(acc1, tmp1);
-	*RES3 = _mm_xor_si128(tmp3, *RES3);
-	acc2 = _mm_clmulepi64_si128(tmp2, POLY, 0x00);
-	*RES3 = _mm_xor_si128(*RES3, acc2);
-}
-
-void Pointwise_vec_Multiplication(__m128i* vec1, __m128i* vec2,
-	int length, __m128i* resVec) {
-
-	__m128i POLY = _mm_setr_epi32(0x87, 0, 0, 0);
-	__m128i tmp1, tmp2, tmp3, tmp4;
-	__m128i acc1, acc2, acc3, acc4;
-	for (int i = 0; i < length; i++)
-	{
-		acc1 = _mm_clmulepi64_si128(vec1[0], vec2[0], 0x00);
-		acc2 = _mm_clmulepi64_si128(vec1[0], vec2[0], 0x10);
-		acc3 = _mm_clmulepi64_si128(vec1[0], vec2[0], 0x01);
-		acc4 = _mm_clmulepi64_si128(vec1[0], vec2[0], 0x11);
-
-		acc2 = _mm_xor_si128(acc2, acc3);
-		acc3 = _mm_slli_si128(acc2, 8);
-		acc2 = _mm_srli_si128(acc2, 8);
-
-		acc1 = _mm_xor_si128(acc1, acc3);
-		acc4 = _mm_xor_si128(acc2, acc4);
-
-
-		tmp3 = _mm_clmulepi64_si128(acc4, POLY, 0x01);
-
-		tmp1 = _mm_slli_si128(tmp3, 8);
-		tmp4 = _mm_srli_si128(tmp3, 8);
-
-		tmp2 = _mm_xor_si128(acc4, tmp4);
-		tmp3 = _mm_xor_si128(acc1, tmp1);
-
-		acc2 = _mm_clmulepi64_si128(tmp2, POLY, 0x00);
-		resVec[i] = _mm_xor_si128(tmp3, acc2);
-	}
-}
-
-//PRINT Variants
-void REDUCE_printable(__m128i high, __m128i low, __m128i *RES){
-	
-	__m128i POLY = _mm_setr_epi32(0x87, 0, 0, 0);			print_m128i_with_string_le("POLY                 =  ", POLY);
-	__m128i xmm5, xmm4, xmm3, xmm2;
-	__m128i left, right;
-		
-	//phase 1
-	xmm3 = _mm_clmulepi64_si128(high, POLY, 0x01);			print_m128i_with_string_le("T = high*poly        =  ", xmm3);
-	
-	left  = _mm_slli_si128(xmm3, 8);						print_m128i_with_string_le("left  = T<<64        =  ", left);
-	right = _mm_srli_si128(xmm3, 8);						print_m128i_with_string_le("right = T>>64        =  ", right);
-	
-	xmm2 = _mm_xor_si128(high, right);						print_m128i_with_string_le("A = high_xor_right   =  ", xmm2);
-	xmm3 = _mm_xor_si128(low, left);						print_m128i_with_string_le("B = low_xor_left     =  ", xmm3);
-
-	//phase 2
-	xmm4 = _mm_clmulepi64_si128(xmm2, POLY, 0x00);			print_m128i_with_string_le("CLMUL = A*poly       =  ", xmm4);
-	xmm5 = _mm_xor_si128(xmm3, xmm4);						print_m128i_with_string_le("REDUCE = CLMUL_xor_B =  ", xmm5);
-	*RES = xmm5;				
-}	
-
-void print_m128i_with_string_le(char* string,__m128i data)
-{
-    unsigned char *pointer = (unsigned char*)&data;
-    int i;
-    printf("%-20s[",string);
-    for (i=0; i<16; i++)
-        printf("%02x",pointer[15-i]);
-    printf("]\n");
-}
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Porthos/util/main_gf_funcs.h b/Porthos/util/main_gf_funcs.h
deleted file mode 100644
index 6c4a785..0000000
--- a/Porthos/util/main_gf_funcs.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#pragma once
-#include <stdio.h> 
-#include <chrono>
-#include <iostream>
-#include <wmmintrin.h>
-#include <emmintrin.h>
-#include <smmintrin.h>
-#include <stdint.h>
-#include <stdio.h>
-
-
-void REDUCE_printable(__m128i high, __m128i low, __m128i *RES);
-void print_m128i_with_string_le(char* string, __m128i data);
-
-void gfmul3(__m128i A, __m128i B, __m128i * RES);
-
-void gfmul3HalfZeros(__m128i A, __m128i B, __m128i * RES);
-
-__m128i gfmul3(__m128i A, __m128i B);
-
-__m128i gfmul3HalfZeros(__m128i A, __m128i B);
-//Dot product
-void gfDotProductPiped(__m128i* Vec1, __m128i* Vec2, int length, __m128i* ans);
-//Should be used if all elements in vec2 are "small", i.e., upper half is zeros
-void gfDotProductPipedHZ(__m128i* vec1, __m128i* vec2, int length, __m128i* ans);
-
-//Add pointwise mutliplications RES1=RES1+(A*B),...,RES3=RES3+G*H
-void Add_Pointwise_4_Multiplication(__m128i *A, __m128i *B, __m128i *C,
-	__m128i *D, __m128i *E, __m128i *F, __m128i *G, __m128i *H,
-	__m128i *RES0, __m128i *RES1, __m128i *RES2, __m128i *RES3);
-void Pointwise_vec_Multiplication(__m128i* vec1, __m128i* vec2,	int length, __m128i* resVec);
-
-
-__m128i gfmulNew(__m128i A, __m128i B);
diff --git a/Porthos/util/sha1.cpp b/Porthos/util/sha1.cpp
deleted file mode 100644
index cda1a07..0000000
--- a/Porthos/util/sha1.cpp
+++ /dev/null
@@ -1,608 +0,0 @@
-/*
- *  FIPS-180-1 compliant SHA-1 implementation
- *
- *  Copyright (C) 2006-2010, Brainspark B.V.
- *
- *  This file is part of PolarSSL (http://www.polarssl.org)
- *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
- *
- *  All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-/*
- *  The SHA-1 standard was published by NIST in 1993.
- *
- *  http://www.itl.nist.gov/fipspubs/fip180-1.htm
- */
-
-#include "sha1.h"
-
-#include <string.h>
-#include <stdio.h>
-
-/*
- * 32-bit integer manipulation macros (big endian)
- */
-#ifndef GET_ULONG_BE
-#define GET_ULONG_BE(n,b,i)                             \
-{                                                       \
-    (n) = ( (unsigned long) (b)[(i)    ] << 24 )        \
-        | ( (unsigned long) (b)[(i) + 1] << 16 )        \
-        | ( (unsigned long) (b)[(i) + 2] <<  8 )        \
-        | ( (unsigned long) (b)[(i) + 3]       );       \
-}
-#endif
-
-#ifndef PUT_ULONG_BE
-#define PUT_ULONG_BE(n,b,i)                             \
-{                                                       \
-    (b)[(i)    ] = (unsigned char) ( (n) >> 24 );       \
-    (b)[(i) + 1] = (unsigned char) ( (n) >> 16 );       \
-    (b)[(i) + 2] = (unsigned char) ( (n) >>  8 );       \
-    (b)[(i) + 3] = (unsigned char) ( (n)       );       \
-}
-#endif
-
-/*
- * SHA-1 context setup
- */
-
-static void sha1_process( sha1_context *ctx, const unsigned char data[64] )
-{
-
-    unsigned long temp, W[16], A, B, C, D, E;
-
-    GET_ULONG_BE( W[ 0], data,  0 );
-    GET_ULONG_BE( W[ 1], data,  4 );
-    GET_ULONG_BE( W[ 2], data,  8 );
-    GET_ULONG_BE( W[ 3], data, 12 );
-    GET_ULONG_BE( W[ 4], data, 16 );
-    GET_ULONG_BE( W[ 5], data, 20 );
-    GET_ULONG_BE( W[ 6], data, 24 );
-    GET_ULONG_BE( W[ 7], data, 28 );
-    GET_ULONG_BE( W[ 8], data, 32 );
-    GET_ULONG_BE( W[ 9], data, 36 );
-    GET_ULONG_BE( W[10], data, 40 );
-    GET_ULONG_BE( W[11], data, 44 );
-    GET_ULONG_BE( W[12], data, 48 );
-    GET_ULONG_BE( W[13], data, 52 );
-    GET_ULONG_BE( W[14], data, 56 );
-    GET_ULONG_BE( W[15], data, 60 );
-
-#define S(x,n) ((x << n) | ((x & 0xFFFFFFFF) >> (32 - n)))
-
-#define R(t)                                            \
-(                                                       \
-    temp = W[(t -  3) & 0x0F] ^ W[(t - 8) & 0x0F] ^     \
-           W[(t - 14) & 0x0F] ^ W[ t      & 0x0F],      \
-    ( W[t & 0x0F] = S(temp,1) )                         \
-)
-
-#define P(a,b,c,d,e,x)                                  \
-{                                                       \
-    e += S(a,5) + F(b,c,d) + K + x; b = S(b,30);        \
-}
-
-    A = ctx->state[0];
-    B = ctx->state[1];
-    C = ctx->state[2];
-    D = ctx->state[3];
-    E = ctx->state[4];
-
-#define F(x,y,z) (z ^ (x & (y ^ z)))
-#define K 0x5A827999
-
-    P( A, B, C, D, E, W[0]  );
-    P( E, A, B, C, D, W[1]  );
-    P( D, E, A, B, C, W[2]  );
-    P( C, D, E, A, B, W[3]  );
-    P( B, C, D, E, A, W[4]  );
-    P( A, B, C, D, E, W[5]  );
-    P( E, A, B, C, D, W[6]  );
-    P( D, E, A, B, C, W[7]  );
-    P( C, D, E, A, B, W[8]  );
-    P( B, C, D, E, A, W[9]  );
-    P( A, B, C, D, E, W[10] );
-    P( E, A, B, C, D, W[11] );
-    P( D, E, A, B, C, W[12] );
-    P( C, D, E, A, B, W[13] );
-    P( B, C, D, E, A, W[14] );
-    P( A, B, C, D, E, W[15] );
-    P( E, A, B, C, D, R(16) );
-    P( D, E, A, B, C, R(17) );
-    P( C, D, E, A, B, R(18) );
-    P( B, C, D, E, A, R(19) );
-
-#undef K
-#undef F
-
-#define F(x,y,z) (x ^ y ^ z)
-#define K 0x6ED9EBA1
-
-    P( A, B, C, D, E, R(20) );
-    P( E, A, B, C, D, R(21) );
-    P( D, E, A, B, C, R(22) );
-    P( C, D, E, A, B, R(23) );
-    P( B, C, D, E, A, R(24) );
-    P( A, B, C, D, E, R(25) );
-    P( E, A, B, C, D, R(26) );
-    P( D, E, A, B, C, R(27) );
-    P( C, D, E, A, B, R(28) );
-    P( B, C, D, E, A, R(29) );
-    P( A, B, C, D, E, R(30) );
-    P( E, A, B, C, D, R(31) );
-    P( D, E, A, B, C, R(32) );
-    P( C, D, E, A, B, R(33) );
-    P( B, C, D, E, A, R(34) );
-    P( A, B, C, D, E, R(35) );
-    P( E, A, B, C, D, R(36) );
-    P( D, E, A, B, C, R(37) );
-    P( C, D, E, A, B, R(38) );
-    P( B, C, D, E, A, R(39) );
-
-#undef K
-#undef F
-
-#define F(x,y,z) ((x & y) | (z & (x | y)))
-#define K 0x8F1BBCDC
-
-    P( A, B, C, D, E, R(40) );
-    P( E, A, B, C, D, R(41) );
-    P( D, E, A, B, C, R(42) );
-    P( C, D, E, A, B, R(43) );
-    P( B, C, D, E, A, R(44) );
-    P( A, B, C, D, E, R(45) );
-    P( E, A, B, C, D, R(46) );
-    P( D, E, A, B, C, R(47) );
-    P( C, D, E, A, B, R(48) );
-    P( B, C, D, E, A, R(49) );
-    P( A, B, C, D, E, R(50) );
-    P( E, A, B, C, D, R(51) );
-    P( D, E, A, B, C, R(52) );
-    P( C, D, E, A, B, R(53) );
-    P( B, C, D, E, A, R(54) );
-    P( A, B, C, D, E, R(55) );
-    P( E, A, B, C, D, R(56) );
-    P( D, E, A, B, C, R(57) );
-    P( C, D, E, A, B, R(58) );
-    P( B, C, D, E, A, R(59) );
-
-#undef K
-#undef F
-
-#define F(x,y,z) (x ^ y ^ z)
-#define K 0xCA62C1D6
-
-    P( A, B, C, D, E, R(60) );
-    P( E, A, B, C, D, R(61) );
-    P( D, E, A, B, C, R(62) );
-    P( C, D, E, A, B, R(63) );
-    P( B, C, D, E, A, R(64) );
-    P( A, B, C, D, E, R(65) );
-    P( E, A, B, C, D, R(66) );
-    P( D, E, A, B, C, R(67) );
-    P( C, D, E, A, B, R(68) );
-    P( B, C, D, E, A, R(69) );
-    P( A, B, C, D, E, R(70) );
-    P( E, A, B, C, D, R(71) );
-    P( D, E, A, B, C, R(72) );
-    P( C, D, E, A, B, R(73) );
-    P( B, C, D, E, A, R(74) );
-    P( A, B, C, D, E, R(75) );
-    P( E, A, B, C, D, R(76) );
-    P( D, E, A, B, C, R(77) );
-    P( C, D, E, A, B, R(78) );
-    P( B, C, D, E, A, R(79) );
-
-#undef K
-#undef F
-
-    ctx->state[0] += A;
-    ctx->state[1] += B;
-    ctx->state[2] += C;
-    ctx->state[3] += D;
-    ctx->state[4] += E;
-}
-
-/*
- * SHA-1 process buffer
- */
-void sha1_update( sha1_context *ctx, const unsigned char *input, int ilen )
-{
-    int fill;
-    unsigned long left;
-
-    if( ilen <= 0 )
-        return;
-
-
-
-    left = ctx->total[0] & 0x3F;
-    fill = 64 - left;
-
-    ctx->total[0] += ilen;
-    ctx->total[0] &= 0xFFFFFFFF;
-
-    if( ctx->total[0] < (unsigned long) ilen )
-        ctx->total[1]++;
-
-    if( left && ilen >= fill )
-    {
-        memcpy( (void *) (ctx->buffer + left),
-                (void *) input, fill );
-        sha1_process( ctx, ctx->buffer );
-        input += fill;
-        ilen  -= fill;
-        left = 0;
-    }
-
-    while( ilen >= 64 )
-    {
-        sha1_process( ctx, input );
-        input += 64;
-        ilen  -= 64;
-    }
-
-    if( ilen > 0 )
-    {
-        memcpy( (void *) (ctx->buffer + left),
-                (void *) input, ilen );
-    }
-}
-
-static const unsigned char sha1_padding[64] =
-{
- 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-/*
- * SHA-1 final digest
- */
-void sha1_finish( sha1_context *ctx, unsigned char output[20] )
-{
-    unsigned long last, padn;
-    unsigned long high, low;
-    unsigned char msglen[8];
-
-
-
-    high = ( ctx->total[0] >> 29 )
-         | ( ctx->total[1] <<  3 );
-    low  = ( ctx->total[0] <<  3 );
-
-    PUT_ULONG_BE( high, msglen, 0 );
-    PUT_ULONG_BE( low,  msglen, 4 );
-
-    last = ctx->total[0] & 0x3F;
-    padn = ( last < 56 ) ? ( 56 - last ) : ( 120 - last );
-
-    sha1_update( ctx, (unsigned char *) sha1_padding, padn );
-    sha1_update( ctx, msglen, 8 );
-
-    PUT_ULONG_BE( ctx->state[0], output,  0 );
-    PUT_ULONG_BE( ctx->state[1], output,  4 );
-    PUT_ULONG_BE( ctx->state[2], output,  8 );
-    PUT_ULONG_BE( ctx->state[3], output, 12 );
-    PUT_ULONG_BE( ctx->state[4], output, 16 );
-}
-
-/*
- * output = SHA-1( input buffer )
- */
-void sha1( const unsigned char *input, int ilen, unsigned char output[20] )
-{
-    sha1_context ctx;
-
-    sha1_starts( &ctx );
-    sha1_update( &ctx, input, ilen );
-    sha1_finish( &ctx, output );
-
-    memset( &ctx, 0, sizeof( sha1_context ) );
-}
-
-/*
- * output = SHA-1( file contents )
- */
-int sha1_file( const char *path, unsigned char output[20] )
-{
-    FILE *f;
-    size_t n;
-    sha1_context ctx;
-    unsigned char buf[1024];
-
-    if( ( f = fopen( path, "rb" ) ) == NULL )
-        return( 1 );
-
-    sha1_starts( &ctx );
-
-    while( ( n = fread( buf, 1, sizeof( buf ), f ) ) > 0 )
-        sha1_update( &ctx, buf, (int) n );
-
-    sha1_finish( &ctx, output );
-
-    memset( &ctx, 0, sizeof( sha1_context ) );
-
-    if( ferror( f ) != 0 )
-    {
-        fclose( f );
-        return( 2 );
-    }
-
-    fclose( f );
-    return( 0 );
-}
-
-/*
- * SHA-1 HMAC context setup
- */
-void sha1_hmac_starts( sha1_context *ctx, const unsigned char *key, int keylen )
-{
-    int i;
-    unsigned char sum[20];
-
-    if( keylen > 64 )
-    {
-        sha1( key, keylen, sum );
-        keylen = 20;
-        key = sum;
-    }
-
-    memset( ctx->ipad, 0x36, 64 );
-    memset( ctx->opad, 0x5C, 64 );
-
-    for( i = 0; i < keylen; i++ )
-    {
-        ctx->ipad[i] = (unsigned char)( ctx->ipad[i] ^ key[i] );
-        ctx->opad[i] = (unsigned char)( ctx->opad[i] ^ key[i] );
-    }
-
-    sha1_starts( ctx );
-    sha1_update( ctx, ctx->ipad, 64 );
-
-    memset( sum, 0, sizeof( sum ) );
-}
-
-/*
- * SHA-1 HMAC process buffer
- */
-void sha1_hmac_update( sha1_context *ctx, const unsigned char *input, int ilen )
-{
-    sha1_update( ctx, input, ilen );
-}
-
-/*
- * SHA-1 HMAC final digest
- */
-void sha1_hmac_finish( sha1_context *ctx, unsigned char output[20] )
-{
-    unsigned char tmpbuf[20];
-
-    sha1_finish( ctx, tmpbuf );
-    sha1_starts( ctx );
-    sha1_update( ctx, ctx->opad, 64 );
-    sha1_update( ctx, tmpbuf, 20 );
-    sha1_finish( ctx, output );
-
-    memset( tmpbuf, 0, sizeof( tmpbuf ) );
-}
-
-/*
- * SHA1 HMAC context reset
- */
-void sha1_hmac_reset( sha1_context *ctx )
-{
-    sha1_starts( ctx );
-    sha1_update( ctx, ctx->ipad, 64 );
-}
-
-/*
- * output = HMAC-SHA-1( hmac key, input buffer )
- */
-void sha1_hmac( const unsigned char *key, int keylen,
-                const unsigned char *input, int ilen,
-                unsigned char output[20] )
-{
-    sha1_context ctx;
-
-    sha1_hmac_starts( &ctx, key, keylen );
-    sha1_hmac_update( &ctx, input, ilen );
-    sha1_hmac_finish( &ctx, output );
-
-    memset( &ctx, 0, sizeof( sha1_context ) );
-}
- 
-/*
- * FIPS-180-1 test vectors
- */
-static unsigned char sha1_test_buf[3][57] = 
-{
-    { "abc" },
-    { "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" },
-    { "" }
-};
-
-static const int sha1_test_buflen[3] =
-{
-    3, 56, 1000
-};
-
-static const unsigned char sha1_test_sum[3][20] =
-{
-    { 0xA9, 0x99, 0x3E, 0x36, 0x47, 0x06, 0x81, 0x6A, 0xBA, 0x3E,
-      0x25, 0x71, 0x78, 0x50, 0xC2, 0x6C, 0x9C, 0xD0, 0xD8, 0x9D },
-    { 0x84, 0x98, 0x3E, 0x44, 0x1C, 0x3B, 0xD2, 0x6E, 0xBA, 0xAE,
-      0x4A, 0xA1, 0xF9, 0x51, 0x29, 0xE5, 0xE5, 0x46, 0x70, 0xF1 },
-    { 0x34, 0xAA, 0x97, 0x3C, 0xD4, 0xC4, 0xDA, 0xA4, 0xF6, 0x1E,
-      0xEB, 0x2B, 0xDB, 0xAD, 0x27, 0x31, 0x65, 0x34, 0x01, 0x6F }
-};
-
-/*
- * RFC 2202 test vectors
- */
-static unsigned char sha1_hmac_test_key[7][26] =
-{
-    { "\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B"
-      "\x0B\x0B\x0B\x0B" },
-    { "Jefe" },
-    { "\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA"
-      "\xAA\xAA\xAA\xAA" },
-    { "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10"
-      "\x11\x12\x13\x14\x15\x16\x17\x18\x19" },
-    { "\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C\x0C"
-      "\x0C\x0C\x0C\x0C" },
-    { "" }, /* 0xAA 80 times */
-    { "" }
-};
-
-static const int sha1_hmac_test_keylen[7] =
-{
-    20, 4, 20, 25, 20, 80, 80
-};
-
-static unsigned char sha1_hmac_test_buf[7][74] =
-{
-    { "Hi There" },
-    { "what do ya want for nothing?" },
-    { "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
-      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
-      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
-      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
-      "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD" },
-    { "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
-      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
-      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
-      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
-      "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD" },
-    { "Test With Truncation" },
-    { "Test Using Larger Than Block-Size Key - Hash Key First" },
-    { "Test Using Larger Than Block-Size Key and Larger"
-      " Than One Block-Size Data" }
-};
-
-static const int sha1_hmac_test_buflen[7] =
-{
-    8, 28, 50, 50, 20, 54, 73
-};
-
-static const unsigned char sha1_hmac_test_sum[7][20] =
-{
-    { 0xB6, 0x17, 0x31, 0x86, 0x55, 0x05, 0x72, 0x64, 0xE2, 0x8B,
-      0xC0, 0xB6, 0xFB, 0x37, 0x8C, 0x8E, 0xF1, 0x46, 0xBE, 0x00 },
-    { 0xEF, 0xFC, 0xDF, 0x6A, 0xE5, 0xEB, 0x2F, 0xA2, 0xD2, 0x74,
-      0x16, 0xD5, 0xF1, 0x84, 0xDF, 0x9C, 0x25, 0x9A, 0x7C, 0x79 },
-    { 0x12, 0x5D, 0x73, 0x42, 0xB9, 0xAC, 0x11, 0xCD, 0x91, 0xA3,
-      0x9A, 0xF4, 0x8A, 0xA1, 0x7B, 0x4F, 0x63, 0xF1, 0x75, 0xD3 },
-    { 0x4C, 0x90, 0x07, 0xF4, 0x02, 0x62, 0x50, 0xC6, 0xBC, 0x84,
-      0x14, 0xF9, 0xBF, 0x50, 0xC8, 0x6C, 0x2D, 0x72, 0x35, 0xDA },
-    { 0x4C, 0x1A, 0x03, 0x42, 0x4B, 0x55, 0xE0, 0x7F, 0xE7, 0xF2,
-      0x7B, 0xE1 },
-    { 0xAA, 0x4A, 0xE5, 0xE1, 0x52, 0x72, 0xD0, 0x0E, 0x95, 0x70,
-      0x56, 0x37, 0xCE, 0x8A, 0x3B, 0x55, 0xED, 0x40, 0x21, 0x12 },
-    { 0xE8, 0xE9, 0x9D, 0x0F, 0x45, 0x23, 0x7D, 0x78, 0x6D, 0x6B,
-      0xBA, 0xA7, 0x96, 0x5C, 0x78, 0x08, 0xBB, 0xFF, 0x1A, 0x91 }
-};
-
-/*
- * Checkup routine
- */
-int sha1_self_test( int verbose )
-{
-    int i, j, buflen;
-    unsigned char buf[1024];
-    unsigned char sha1sum[20];
-    sha1_context ctx;
-
-    /*
-     * SHA-1
-     */
-    for( i = 0; i < 3; i++ )
-    {
-        if( verbose != 0 )
-            printf( "  SHA-1 test #%d: ", i + 1 );
-
-        sha1_starts( &ctx );
-
-        if( i == 2 )
-        {
-            memset( buf, 'a', buflen = 1000 );
-
-            for( j = 0; j < 1000; j++ )
-                sha1_update( &ctx, buf, buflen );
-        }
-        else
-            sha1_update( &ctx, sha1_test_buf[i],
-                               sha1_test_buflen[i] );
-
-        sha1_finish( &ctx, sha1sum );
-
-        if( memcmp( sha1sum, sha1_test_sum[i], 20 ) != 0 )
-        {
-            if( verbose != 0 )
-                printf( "failed\n" );
-
-            return( 1 );
-        }
-
-        if( verbose != 0 )
-            printf( "passed\n" );
-    }
-
-    if( verbose != 0 )
-        printf( "\n" );
-
-    for( i = 0; i < 7; i++ )
-    {
-        if( verbose != 0 )
-            printf( "  HMAC-SHA-1 test #%d: ", i + 1 );
-
-        if( i == 5 || i == 6 )
-        {
-            memset( buf, '\xAA', buflen = 80 );
-            sha1_hmac_starts( &ctx, buf, buflen );
-        }
-        else
-            sha1_hmac_starts( &ctx, sha1_hmac_test_key[i],
-                                    sha1_hmac_test_keylen[i] );
-
-        sha1_hmac_update( &ctx, sha1_hmac_test_buf[i],
-                                sha1_hmac_test_buflen[i] );
-
-        sha1_hmac_finish( &ctx, sha1sum );
-
-        buflen = ( i == 4 ) ? 12 : 20;
-
-        if( memcmp( sha1sum, sha1_hmac_test_sum[i], buflen ) != 0 )
-        {
-            if( verbose != 0 )
-                printf( "failed\n" );
-
-            return( 1 );
-        }
-
-        if( verbose != 0 )
-            printf( "passed\n" );
-    }
-
-    if( verbose != 0 )
-        printf( "\n" );
-
-    return( 0 );
-}
-
-
diff --git a/Porthos/util/sha1.h b/Porthos/util/sha1.h
deleted file mode 100644
index b60bd40..0000000
--- a/Porthos/util/sha1.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * \file sha1.h
- *
- *  Copyright (C) 2006-2010, Brainspark B.V.
- *
- *  This file is part of PolarSSL (http://www.polarssl.org)
- *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
- *
- *  All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-
-#ifndef POLARSSL_SHA1_H
-#define POLARSSL_SHA1_H
-
-/**
- * \brief          SHA-1 context structure
- */
-struct sha1_context
-{
-    unsigned long total[2];     /*!< number of bytes processed  */
-    unsigned long state[5];     /*!< intermediate digest state  */
-    unsigned char buffer[64];   /*!< data block being processed */
-
-    unsigned char ipad[64];     /*!< HMAC: inner padding        */
-    unsigned char opad[64];     /*!< HMAC: outer padding        */
-};
- 
-typedef sha1_context SHA_CTX;
- 
-/**
- * \brief          SHA-1 context setup
- *
- * \param ctx      context to be initialized
- */
-inline void sha1_starts( sha1_context *ctx )
-{
-    ctx->total[0] = 0;
-    ctx->total[1] = 0;
-
-    ctx->state[0] = 0x67452301;
-    ctx->state[1] = 0xEFCDAB89;
-    ctx->state[2] = 0x98BADCFE;
-    ctx->state[3] = 0x10325476;
-    ctx->state[4] = 0xC3D2E1F0;
-}
-
-
-/**
- * \brief          SHA-1 process buffer
- *
- * \param ctx      SHA-1 context
- * \param input    buffer holding the  data
- * \param ilen     length of the input data
- */
-void sha1_update( sha1_context *ctx, const unsigned char *input, int ilen );
-
-/**
- * \brief          SHA-1 final digest
- *
- * \param ctx      SHA-1 context
- * \param output   SHA-1 checksum result
- */
-void sha1_finish( sha1_context *ctx, unsigned char output[20] );
-
-/**
- * \brief          Output = SHA-1( input buffer )
- *
- * \param input    buffer holding the  data
- * \param ilen     length of the input data
- * \param output   SHA-1 checksum result
- */
-void sha1( const unsigned char *input, int ilen, unsigned char output[20] );
-
-/**
- * \brief          Output = SHA-1( file contents )
- *
- * \param path     input file name
- * \param output   SHA-1 checksum result
- *
- * \return         0 if successful, 1 if fopen failed,
- *                 or 2 if fread failed
- */
-int sha1_file( const char *path, unsigned char output[20] );
-
-/**
- * \brief          SHA-1 HMAC context setup
- *
- * \param ctx      HMAC context to be initialized
- * \param key      HMAC secret key
- * \param keylen   length of the HMAC key
- */
-void sha1_hmac_starts( sha1_context *ctx, const unsigned char *key, int keylen );
-
-/**
- * \brief          SHA-1 HMAC process buffer
- *
- * \param ctx      HMAC context
- * \param input    buffer holding the  data
- * \param ilen     length of the input data
- */
-void sha1_hmac_update( sha1_context *ctx, const unsigned char *input, int ilen );
-
-/**
- * \brief          SHA-1 HMAC final digest
- *
- * \param ctx      HMAC context
- * \param output   SHA-1 HMAC checksum result
- */
-void sha1_hmac_finish( sha1_context *ctx, unsigned char output[20] );
-
-/**
- * \brief          SHA-1 HMAC context reset
- *
- * \param ctx      HMAC context to be reset
- */
-void sha1_hmac_reset( sha1_context *ctx );
-
-/**
- * \brief          Output = HMAC-SHA-1( hmac key, input buffer )
- *
- * \param key      HMAC secret key
- * \param keylen   length of the HMAC key
- * \param input    buffer holding the  data
- * \param ilen     length of the input data
- * \param output   HMAC-SHA-1 result
- */
-void sha1_hmac( const unsigned char *key, int keylen,
-                const unsigned char *input, int ilen,
-                unsigned char output[20] );
-
-/**
- * \brief          Checkup routine
- *
- * \return         0 if successful, or 1 if the test failed
- */
-int sha1_self_test( int verbose );
- 
-#endif /* sha1.h */
diff --git a/Porthos/util/sha256.cpp b/Porthos/util/sha256.cpp
deleted file mode 100644
index c5fa8ac..0000000
--- a/Porthos/util/sha256.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Updated to C++, zedwood.com 2012
- * Based on Olivier Gay's version
- * See Modified BSD License below: 
- *
- * FIPS 180-2 SHA-224/256/384/512 implementation
- * Issue date:  04/30/2005
- * http://www.ouah.org/ogay/sha2/
- *
- * Copyright (C) 2005, 2007 Olivier Gay <olivier.gay@a3.epfl.ch>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <cstring>
-#include <fstream>
-#include "sha256.h"
- 
-const unsigned int SHA256::sha256_k[64] = //UL = uint32
-            {0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5,
-             0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
-             0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3,
-             0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
-             0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc,
-             0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
-             0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7,
-             0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
-             0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13,
-             0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
-             0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3,
-             0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
-             0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5,
-             0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
-             0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208,
-             0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2};
- 
-void SHA256::transform(const unsigned char *message, unsigned int block_nb)
-{
-    uint32 w[64];
-    uint32 wv[8];
-    uint32 t1, t2;
-    const unsigned char *sub_block;
-    int i;
-    int j;
-    for (i = 0; i < (int) block_nb; i++) {
-        sub_block = message + (i << 6);
-        for (j = 0; j < 16; j++) {
-            SHA2_PACK32(&sub_block[j << 2], &w[j]);
-        }
-        for (j = 16; j < 64; j++) {
-            w[j] =  SHA256_F4(w[j -  2]) + w[j -  7] + SHA256_F3(w[j - 15]) + w[j - 16];
-        }
-        for (j = 0; j < 8; j++) {
-            wv[j] = m_h[j];
-        }
-        for (j = 0; j < 64; j++) {
-            t1 = wv[7] + SHA256_F2(wv[4]) + SHA2_CH(wv[4], wv[5], wv[6])
-                + sha256_k[j] + w[j];
-            t2 = SHA256_F1(wv[0]) + SHA2_MAJ(wv[0], wv[1], wv[2]);
-            wv[7] = wv[6];
-            wv[6] = wv[5];
-            wv[5] = wv[4];
-            wv[4] = wv[3] + t1;
-            wv[3] = wv[2];
-            wv[2] = wv[1];
-            wv[1] = wv[0];
-            wv[0] = t1 + t2;
-        }
-        for (j = 0; j < 8; j++) {
-            m_h[j] += wv[j];
-        }
-    }
-}
- 
-void SHA256::init()
-{
-    m_h[0] = 0x6a09e667;
-    m_h[1] = 0xbb67ae85;
-    m_h[2] = 0x3c6ef372;
-    m_h[3] = 0xa54ff53a;
-    m_h[4] = 0x510e527f;
-    m_h[5] = 0x9b05688c;
-    m_h[6] = 0x1f83d9ab;
-    m_h[7] = 0x5be0cd19;
-    m_len = 0;
-    m_tot_len = 0;
-}
- 
-void SHA256::update(const unsigned char *message, unsigned int len)
-{
-    unsigned int block_nb;
-    unsigned int new_len, rem_len, tmp_len;
-    const unsigned char *shifted_message;
-    tmp_len = SHA224_256_BLOCK_SIZE - m_len;
-    rem_len = len < tmp_len ? len : tmp_len;
-    memcpy(&m_block[m_len], message, rem_len);
-    if (m_len + len < SHA224_256_BLOCK_SIZE) {
-        m_len += len;
-        return;
-    }
-    new_len = len - rem_len;
-    block_nb = new_len / SHA224_256_BLOCK_SIZE;
-    shifted_message = message + rem_len;
-    transform(m_block, 1);
-    transform(shifted_message, block_nb);
-    rem_len = new_len % SHA224_256_BLOCK_SIZE;
-    memcpy(m_block, &shifted_message[block_nb << 6], rem_len);
-    m_len = rem_len;
-    m_tot_len += (block_nb + 1) << 6;
-}
- 
-void SHA256::final(unsigned char *digest)
-{
-    unsigned int block_nb;
-    unsigned int pm_len;
-    unsigned int len_b;
-    int i;
-    block_nb = (1 + ((SHA224_256_BLOCK_SIZE - 9)
-                     < (m_len % SHA224_256_BLOCK_SIZE)));
-    len_b = (m_tot_len + m_len) << 3;
-    pm_len = block_nb << 6;
-    memset(m_block + m_len, 0, pm_len - m_len);
-    m_block[m_len] = 0x80;
-    SHA2_UNPACK32(len_b, m_block + pm_len - 4);
-    transform(m_block, block_nb);
-    for (i = 0 ; i < 8; i++) {
-        SHA2_UNPACK32(m_h[i], &digest[i << 2]);
-    }
-}
- 
-std::string sha256hash(std::string input)
-{
-    unsigned char digest[SHA256::DIGEST_SIZE];
-    memset(digest,0,SHA256::DIGEST_SIZE);
- 
-    SHA256 ctx = SHA256();
-    ctx.init();
-    ctx.update( (unsigned char*)input.c_str(), input.length());
-    ctx.final(digest);
- 
-    char buf[2*SHA256::DIGEST_SIZE+1];
-    buf[2*SHA256::DIGEST_SIZE] = 0;
-    for (int i = 0; i < SHA256::DIGEST_SIZE; i++)
-        sprintf(buf+i*2, "%02x", digest[i]);
-    return std::string(buf);
-}
\ No newline at end of file
diff --git a/Porthos/util/sha256.h b/Porthos/util/sha256.h
deleted file mode 100644
index d41c423..0000000
--- a/Porthos/util/sha256.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Updated to C++, zedwood.com 2012
- * Based on Olivier Gay's version
- * See Modified BSD License below: 
- *
- * FIPS 180-2 SHA-224/256/384/512 implementation
- * Issue date:  04/30/2005
- * http://www.ouah.org/ogay/sha2/
- *
- * Copyright (C) 2005, 2007 Olivier Gay <olivier.gay@a3.epfl.ch>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef SHA256_H
-#define SHA256_H
-#include <string>
- 
-class SHA256
-{
-protected:
-    typedef unsigned char uint8;
-    typedef unsigned int uint32;
-    typedef unsigned long long uint64;
- 
-    const static uint32 sha256_k[];
-    static const unsigned int SHA224_256_BLOCK_SIZE = (512/8);
-public:
-    void init();
-    void update(const unsigned char *message, unsigned int len);
-    void final(unsigned char *digest);
-    static const unsigned int DIGEST_SIZE = ( 256 / 8);
- 
-protected:
-    void transform(const unsigned char *message, unsigned int block_nb);
-    unsigned int m_tot_len;
-    unsigned int m_len;
-    unsigned char m_block[2*SHA224_256_BLOCK_SIZE];
-    uint32 m_h[8];
-};
- 
-std::string sha256hash(std::string input);
- 
-#define SHA2_SHFR(x, n)    (x >> n)
-#define SHA2_ROTR(x, n)   ((x >> n) | (x << ((sizeof(x) << 3) - n)))
-#define SHA2_ROTL(x, n)   ((x << n) | (x >> ((sizeof(x) << 3) - n)))
-#define SHA2_CH(x, y, z)  ((x & y) ^ (~x & z))
-#define SHA2_MAJ(x, y, z) ((x & y) ^ (x & z) ^ (y & z))
-#define SHA256_F1(x) (SHA2_ROTR(x,  2) ^ SHA2_ROTR(x, 13) ^ SHA2_ROTR(x, 22))
-#define SHA256_F2(x) (SHA2_ROTR(x,  6) ^ SHA2_ROTR(x, 11) ^ SHA2_ROTR(x, 25))
-#define SHA256_F3(x) (SHA2_ROTR(x,  7) ^ SHA2_ROTR(x, 18) ^ SHA2_SHFR(x,  3))
-#define SHA256_F4(x) (SHA2_ROTR(x, 17) ^ SHA2_ROTR(x, 19) ^ SHA2_SHFR(x, 10))
-#define SHA2_UNPACK32(x, str)                 \
-{                                             \
-    *((str) + 3) = (uint8) ((x)      );       \
-    *((str) + 2) = (uint8) ((x) >>  8);       \
-    *((str) + 1) = (uint8) ((x) >> 16);       \
-    *((str) + 0) = (uint8) ((x) >> 24);       \
-}
-#define SHA2_PACK32(str, x)                   \
-{                                             \
-    *(x) =   ((uint32) *((str) + 3)      )    \
-           | ((uint32) *((str) + 2) <<  8)    \
-           | ((uint32) *((str) + 1) << 16)    \
-           | ((uint32) *((str) + 0) << 24);   \
-}
-#endif
\ No newline at end of file
diff --git a/Porthos/util/socket.h b/Porthos/util/socket.h
deleted file mode 100644
index 3786e39..0000000
--- a/Porthos/util/socket.h
+++ /dev/null
@@ -1,278 +0,0 @@
-//socket.h
-
-#ifndef __SOCKET_H__BY_SGCHOI 
-#define __SOCKET_H__BY_SGCHOI 
-
-#include "typedefs.h"
-//using boost::asio::ip::tcp;
-
-class CSocket 
-{
-public:
-	CSocket(){ m_hSock = INVALID_SOCKET; }
-	~CSocket(){ }
-	//~CSocket(){ cout << "Closing Socket!" << endl; Close(); }
-	
-public:
-	BOOL Socket()
-	{
-		BOOL success = false;
-		BOOL bOptVal = true;
-		int bOptLen = sizeof(BOOL);
-
-		#ifdef WIN32
-		static BOOL s_bInit = FALSE;
-
-		if (!s_bInit) {
-		  WORD wVersionRequested;
-		  WSADATA wsaData;
-
-		  wVersionRequested = MAKEWORD(2, 0);     
-		  WSAStartup(wVersionRequested, &wsaData);
-		  s_bInit = TRUE; 
-		}
-		#endif
-		
-		Close();
-
-
-		success =  (m_hSock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP)) != INVALID_SOCKET; 
-
-		// set the socket to non-blocking mode:
-		//ioctlsocket(m_hSock, FIONBIO, 1);
-
-		// disable nagle: using TCP_NODELAY = 1 (true)
-		//setsockopt(m_hSock, IPPROTO_TCP, TCP_NODELAY, (char*)&bOptVal, bOptLen);
-		//setsockopt(m_hSock, IPPROTO_TCP, TCP_QUICKACK, (char*)&bOptVal, bOptLen);
-
-		//setsockopt(m_hSock, IPPROTO_TCP, TCP_MAXSEG , (char*)&OptSegSizeLen, OptSegSize);
-		// disable tcp slow start - (false)
-		//setsockopt(m_hSock, IPPROTO_TCP, TM_TCP_SLOW_START , (char*)&bOptVal, bOptLen);
-		//cout << "TCP_MAXSEG: " << TCP_MAXSEG << endl;
-		return success;
-	
-	}
-
-	void Close()
-	{
-		if( m_hSock == INVALID_SOCKET ) return;
-		
-		#ifdef WIN32
-		shutdown(m_hSock, SD_SEND);
-		closesocket(m_hSock);
-		#else
-		shutdown(m_hSock, SHUT_WR);
-		close(m_hSock);
-		#endif
-  
-		m_hSock = INVALID_SOCKET; 
-	} 
-
-	void AttachFrom(CSocket& s)
-	{
-		m_hSock = s.m_hSock;
-	}
-
-	void Detach()
-	{
-		m_hSock = INVALID_SOCKET;
-	}
-
-public:
-	string GetIP()
-	{
-		sockaddr_in addr;
-		UINT addr_len = sizeof(addr);
-
-		if (getsockname(m_hSock, (sockaddr *) &addr, (socklen_t *) &addr_len) < 0) return "";
-		return inet_ntoa(addr.sin_addr);
-	}
-
-
-	USHORT GetPort()
-	{
-		sockaddr_in addr;
-		UINT addr_len = sizeof(addr);
-
-		if (getsockname(m_hSock, (sockaddr *) &addr, (socklen_t *) &addr_len) < 0) return 0;
-		return ntohs(addr.sin_port);
-	}
-	
-	BOOL Bind(USHORT nPort=0, string ip = "")
-	{
-		// Bind the socket to its port
-		sockaddr_in sockAddr;
-		memset(&sockAddr,0,sizeof(sockAddr));
-		sockAddr.sin_family = AF_INET;
-
-		if( ip != "" )
-		{
-			int on = 1;
-			setsockopt(m_hSock, SOL_SOCKET, SO_REUSEADDR, (const char*) &on, sizeof(on));
-
-			sockAddr.sin_addr.s_addr = inet_addr(ip.c_str());
-
-			if (sockAddr.sin_addr.s_addr == INADDR_NONE)
-			{
-				hostent* phost;
-				phost = gethostbyname(ip.c_str());
-				if (phost != NULL)
-					sockAddr.sin_addr.s_addr = ((in_addr*)phost->h_addr)->s_addr;
-				else
-					return FALSE;
-			}
-		}
-		else
-		{
-			sockAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-		}
-		
-		sockAddr.sin_port = htons(nPort);
-		/*cout << "PORT TEST:" << nPort;
-		cout <<"PORT TEST:"<< sockAddr.sin_port;*/
-		return bind(m_hSock, (sockaddr *) &sockAddr, sizeof(sockaddr_in)) >= 0; 
-		/*if (bind(m_hSock, (sockaddr *)&sockAddr, sizeof(sockaddr_in)) == SOCKET_ERROR)
-		{
-			int nError = WSAGetLastError();
-			cout << "Unable to bind socket: " << nError << endl;
-			WSACleanup();
-			system("PAUSE");
-			return 0;
-		}
-		return true;*/
-	}
-
-	BOOL Listen(int nQLen = 5)
-	{
-		return listen(m_hSock, nQLen) >= 0;
-	} 
-
-	BOOL Accept(CSocket& sock)
-	{
-		sock.m_hSock = accept(m_hSock, NULL, 0);
-		if( sock.m_hSock == INVALID_SOCKET ) return FALSE;
- 
-		return TRUE;
-	}
-	 
-	BOOL Connect(string ip, USHORT port, LONG lTOSMilisec = -1)
-	{
-		sockaddr_in sockAddr;
-		memset(&sockAddr,0,sizeof(sockAddr));
-		sockAddr.sin_family = AF_INET;
-		sockAddr.sin_addr.s_addr = inet_addr(ip.c_str());
-
-		if (sockAddr.sin_addr.s_addr == INADDR_NONE)
-		{
-			hostent* lphost;
-			lphost = gethostbyname(ip.c_str());
-			if (lphost != NULL)
-				sockAddr.sin_addr.s_addr = ((in_addr*)lphost->h_addr)->s_addr;
-			else
-				return FALSE;
-		}
-
-		sockAddr.sin_port = htons(port);
-
-#ifdef WIN32
-
-		DWORD dw = 100000;
-
-		if( lTOSMilisec > 0 )
-		{
-			setsockopt(m_hSock, SOL_SOCKET, SO_RCVTIMEO, (char*) &lTOSMilisec, sizeof(lTOSMilisec));
-		}
-
-		int ret = connect(m_hSock, (sockaddr*)&sockAddr, sizeof(sockAddr));
-		
-		if( ret >= 0 && lTOSMilisec > 0 )
-			setsockopt(m_hSock, SOL_SOCKET, SO_RCVTIMEO, (char*) &dw, sizeof(dw));
-	
-#else
-	
-		timeval	tv;
-		socklen_t len;
-		
-		if( lTOSMilisec > 0 )
-		{
-			tv.tv_sec = lTOSMilisec/1000;
-			tv.tv_usec = (lTOSMilisec%1000)*1000;
-	
-			setsockopt(m_hSock, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
-		}
-
-		int ret = connect(m_hSock, (sockaddr*)&sockAddr, sizeof(sockAddr));
-		
-		if( ret >= 0 && lTOSMilisec > 0 )
-		{
-			tv.tv_sec = 100000; 
-			tv.tv_usec = 0;
-
-			setsockopt(m_hSock, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
-		}
-
-#endif
-		return ret >= 0;
-	}
-
-	int Receive(void* pBuf, int nLen, int nFlags = 0)
-	{
-/* Note to Michael: count number of received Bytes and messages here */
-		//cout << "rcv = " << nLen << endl;
-		char* p = (char*) pBuf;
-		int n = nLen;
-		int ret = 0;
-		while( n > 0 )
-        {
-			ret = recv(m_hSock, p, n, 0);
-#ifdef WIN32
-			if( ret <= 0 )
-			{
-				return ret;
-			}
-#else
-            if( ret < 0 )
-            {
-				if( errno == EAGAIN )
-				{
-					cout << "socket recv eror: EAGAIN" << endl;
-					SleepMiliSec(200);
-					continue;
-				} 
-				else
-				{
-					cout << "socket recv error: " << errno << endl;
-					return ret;
-				}
-            }
-			else if (ret == 0)
-			{
-				return ret;
-			} 
-#endif
-      
-            p += ret;
-            n -= ret;
-        }
-		return nLen;
- 	}
- 
-	int Send(const void* pBuf, int nLen, int nFlags = 0)
-	{
-/* Note to Michael: count number of sent Bytes and messages here */
-		//cout << "snd = " << nLen << endl;
-		//statistics.bytes_sent += (UINT) nLen;
-		//statistics.messages_sent++;
-		return send(m_hSock, (char*)pBuf, nLen, nFlags);
-	}	
-	  
-private:
-	SOCKET	m_hSock;
-#ifdef Z_USE_BOOST_ASIO
-	//acceptor acc;
-#endif
-};
-
-
-#endif //SOCKET_H__BY_SGCHOI
-
diff --git a/Porthos/util/thread.h b/Porthos/util/thread.h
deleted file mode 100644
index d230394..0000000
--- a/Porthos/util/thread.h
+++ /dev/null
@@ -1,253 +0,0 @@
-// thread.h by sgchoi@cs.umd.edu
-
-#ifndef __THREAD_H__BY_SGCHOI  
-#define __THREAD_H__BY_SGCHOI 
-
-#include "typedefs.h"
-
-#ifdef WIN32 
- 
-#include <process.h>
-
-class CEvent  
-{
-// Constructor
-public:
-	CEvent(BOOL bManualReset = FALSE, BOOL bInitialSet = FALSE)
-	{
-		m_hHandle = ::CreateEvent(0, bManualReset, bInitialSet, 0);
-	}
-
-	~CEvent()
-	{ 
-		CloseHandle(m_hHandle);	
-	}
-
-// Operations
-public:
-	BOOL Set(){ return SetEvent(m_hHandle); }
-	BOOL Reset(){ return ResetEvent(m_hHandle); }
-	BOOL Wait(){ return WaitForSingleObject(m_hHandle, INFINITE) == WAIT_OBJECT_0; }
-
-private:
-	HANDLE	m_hHandle;
-};
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CLock
-
-	
-// Operations
-class CLock
-{
-// Constructor
-public:
-	CLock(){ InitializeCriticalSection(&m_cs); }
-	~CLock(){ DeleteCriticalSection(&m_cs); }
-
-public:
-	void Lock(){  EnterCriticalSection(&m_cs);  }
-	void Unlock(){ LeaveCriticalSection(&m_cs); }
-	 
-private:
-	CRITICAL_SECTION m_cs;  
-};
-
-class CThread
-{
-public:
-	CThread(){m_bRunning = FALSE; m_hHandle = NULL;}
-	virtual ~CThread(){ if(m_hHandle != NULL) CloseHandle(m_hHandle);}
-
-public:
-    BOOL Start()
-	{
-		m_bRunning = TRUE;
-		m_hHandle = CreateThread(0, 0, ThreadMainHandler, this,0,0);
-		if( m_hHandle == NULL )
-			m_bRunning = FALSE;
-	
-		return m_bRunning;
-	}
-
-    BOOL Wait()
-    {
-		if( !m_bRunning ) return TRUE;
-		return WaitForSingleObject(m_hHandle, INFINITE) == WAIT_OBJECT_0;
-    }
-
-	BOOL Kill()
-	{
-		if( !m_bRunning) return TRUE;
-
-		m_bRunning = !(TerminateThread(m_hHandle, 0));
-		return !m_bRunning;
-	}
-
-	BOOL IsRunning()
-	{
-		return m_bRunning;
-	}
-
-
-protected:
-	virtual void ThreadMain() = 0;
-
-    static DWORD __stdcall ThreadMainHandler( void* p )
-    {
-		CThread* pThis = (CThread*) p;
-		pThis->ThreadMain();
-		pThis->m_bRunning = FALSE;
-		return 0;
-	    }
-
-protected:
- 	BOOL	m_bRunning;
-	HANDLE	m_hHandle;
-};
- 
-
-#else // NOT WIN32 
-#include <pthread.h>
-class CThread
-{
-public:
-	CThread(){m_bRunning = FALSE; }
-	virtual ~CThread(){}
-
-public:
-    BOOL Start()
-	{
-		m_bRunning = !pthread_create(&m_pThread, NULL, 
-						ThreadMainHandler, (void*) this);
-		return m_bRunning;
-	}
-
-    BOOL Wait()
-    {
-		if( !m_bRunning ) return TRUE;
-		return pthread_join(m_pThread, NULL)==0;
-    }
-
-	BOOL Kill()
-	{
-		if( !m_bRunning) return TRUE;
-		pthread_exit(NULL);
-		return TRUE;
-	}
-
-	BOOL IsRunning()
-	{
-		return m_bRunning;
-	}
-
-protected:
-	virtual void ThreadMain() = 0;
-	static void* ThreadMainHandler( void* p )
-    {
-		CThread* pThis = (CThread*) p;
-		pThis->ThreadMain();
-		pThis->m_bRunning = FALSE;
-		return 0;
-    }
-
-protected:
- 	BOOL		m_bRunning;
-	pthread_t	m_pThread;
-};
-
-
-class CLock
-{
-// Constructor
-public:
-	CLock(){ pthread_mutex_init(&m_mtx, NULL); }
-	~CLock(){ pthread_mutex_destroy(&m_mtx); }
-
-public:
-	void Lock(){ pthread_mutex_lock(&m_mtx);}
-	void Unlock(){ pthread_mutex_unlock(&m_mtx); } 
-	 
-private:
-	pthread_mutex_t m_mtx;
-};
-
-
-
-class CEvent  
-{
-// Constructor
-public:
-	CEvent(BOOL bManualReset = FALSE, BOOL bInitialSet = FALSE)
-	{
-		pthread_mutex_init(&m_mtx, NULL);
-		pthread_cond_init(&m_cnd, NULL);
-		m_bManual = bManualReset;
-		m_bSet = bInitialSet;
- 	}
-
-	~CEvent()
-	{ 
-		pthread_mutex_destroy(&m_mtx);
-		pthread_cond_destroy(&m_cnd);
-	}
-
-// Operations
-public:
-	BOOL Set()
-	{   
-		pthread_mutex_lock(&m_mtx);
-        if(!m_bSet)  
-        {
-			m_bSet = TRUE;
-			pthread_cond_signal(&m_cnd);
-        }
-        pthread_mutex_unlock(&m_mtx);
-		return TRUE;
-	} 
-
-	BOOL Wait()
-	{ 
-		pthread_mutex_lock( &m_mtx );
-
-        while(!m_bSet) 
-        {
-            pthread_cond_wait( &m_cnd, &m_mtx );
-        }
-
-        if ( !m_bManual ) m_bSet = FALSE; 
-        pthread_mutex_unlock( &m_mtx );
-		return TRUE;
-	}
-
-	BOOL Reset()
-	{
-		pthread_mutex_lock( &m_mtx );
-		m_bSet = FALSE; 
-        pthread_mutex_unlock( &m_mtx );
-		return TRUE;
-	}
-private:
-	pthread_cond_t  m_cnd;
-	pthread_mutex_t m_mtx;
-	BOOL			m_bManual;
-	BOOL			m_bSet;
- };
-
-#endif //WIN32
-
-
-
-class CGrabLock
-{
-public:
-	CGrabLock(CLock& l):lock(l){ lock.Lock(); }
-	~CGrabLock(){ lock.Unlock(); }
-public:
-	CLock& lock;
-};
-
-#endif //__THREAD_H__BY_SGCHOI
-
-
diff --git a/Porthos/util/typedefs.h b/Porthos/util/typedefs.h
deleted file mode 100644
index b9204db..0000000
--- a/Porthos/util/typedefs.h
+++ /dev/null
@@ -1,213 +0,0 @@
-#ifndef __TYPEDEFS_H__BY_SGCHOI
-#define __TYPEDEFS_H__BY_SGCHOI
-
-#include <time.h>
-
-
-
-
-//#define OTTiming
-//#define OTEXT_USE_GMP
-#define OTEXT_USE_ECC
-//#define VERIFY_OT
-//#define OTEXT_USE_OPENSSL
-#define NUMOTBLOCKS 32
-
-
-static int CEIL_LOG2(int bits)
-{
-	int targetlevel = 0, bitstemp = bits;
-	while (bitstemp >>= 1) ++targetlevel;
-	return targetlevel + ((1<<targetlevel) > bits);
-}
-
-static int FLOOR_LOG2(int bits)
-{
-	int targetlevel = 0;
-	while (bits >>= 1) ++targetlevel;
-	return targetlevel;
-}
-
-/*static double getMillies(timeval timestart, timeval timeend)
-{
-	long time1 = (timestart.tv_sec * 1000000) + (timestart.tv_usec );
-	long time2 = (timeend.tv_sec * 1000000) + (timeend.tv_usec );
-
-	return (double)(time2-time1)/1000000;
-}*/
-
-
-
-typedef int			BOOL;
-typedef long			LONG;
-
-typedef unsigned char	BYTE;
-typedef unsigned short	USHORT;
-typedef unsigned int	UINT;
-typedef unsigned long 	ULONG;
-typedef unsigned long long UINT_64T;
-
-typedef ULONG	DWORD;
-typedef UINT_64T REGISTER_SIZE;
-
-typedef REGISTER_SIZE REGSIZE;
-#define LOG2_REGISTER_SIZE		CEIL_LOG2(sizeof(REGISTER_SIZE) << 3)
-
-#define SHA1_BYTES				20
-#define SHA1_BITS				160
-
-#define AES_KEY_BITS			128
-#define AES_KEY_BYTES			16
-#define AES_BITS				128
-#define AES_BYTES				16
-#define LOG2_AES_BITS			CEIL_LOG2(AES_BITS)
-
-#define FILL_BYTES				AES_BYTES
-#define FILL_BITS				AES_BITS
-
-#define OT_WINDOW_SIZE		(AES_BITS*4)
-#define OT_WINDOW_SIZE_BYTES	(AES_BYTES*4)
-//*******************CHECK THIS - maybe should be enlarged
-#define MAX_REPLY_BITS			65536 //at most 2^16 bits may be sent in one go
-
-#define RETRY_CONNECT		1000
-#define CONNECT_TIMEO_MILISEC	10000
-
-#define SYMMETRIC_SECURITY_PARAMETER 80 //security parameter for Yao's garbled circuits
-#define SSP SYMMETRIC_SECURITY_PARAMETER
-#define BYTES_SSP SSP/8
-
-#define NUM_EXECS_NAOR_PINKAS	SSP
-#define NUM_EXECS_NAOR_PINKAS_BYTES NUM_EXECS_NAOR_PINKAS/8
-
-#define OTEXT_BLOCK_SIZE_BITS	AES_BITS
-#define OTEXT_BLOCK_SIZE_BYTES	AES_BYTES
-
-#define VECTOR_INTERNAL_SIZE 8
-
-#ifdef OTEXT_USE_OPENSSL
-
-#include <openssl/evp.h>
-#define AES_KEY_CTX EVP_CIPHER_CTX
-#define OTEXT_HASH_INIT(sha) SHA_Init(sha)
-#define OTEXT_HASH_UPDATE(sha, buf, bufsize) SHA_Update(sha, buf, bufsize)
-#define OTEXT_HASH_FINAL(sha, sha_buf) SHA_Final(sha_buf, sha)
-
-const BYTE ZERO_IV[AES_BYTES] = { 0 };
-static int otextaesencdummy;
-
-#define OTEXT_AES_KEY_INIT(ctx, buf) { \
-	EVP_CIPHER_CTX_init(ctx); \
-	EVP_EncryptInit_ex(ctx, EVP_aes_128_ecb(), NULL, buf, ZERO_IV); \
-	}
-#define OTEXT_AES_ENCRYPT(keyctx, outbuf, inbuf) EVP_EncryptUpdate(keyctx, outbuf, &otextaesencdummy, inbuf, AES_BYTES)
-
-#else
-//TODO:change to functions using AES-NI
-//#define AESNI
-//#ifndef AESNI
-#define AES_KEY_CTX AES_KEY
-#define OTEXT_HASH_INIT(sha) sha1_starts(sha)
-#define OTEXT_HASH_UPDATE(sha, buf, bufsize) sha1_update(sha, buf, bufsize)
-#define OTEXT_HASH_FINAL(sha, sha_buf) sha1_finish(sha, sha_buf)
-
-#define OTEXT_AES_KEY_INIT(ctx, buf) private_AES_set_encrypt_key(buf, AES_KEY_BITS, ctx)
-#define OTEXT_AES_ENCRYPT(keyctx, outbuf, inbuf) AES_encrypt(inbuf, outbuf, keyctx)
-//#else
-//#define AES_KEY_CTX AES_KEY_TED
-//#define OTEXT_HASH_INIT(sha) sha1_starts(sha)
-//#define OTEXT_HASH_UPDATE(sha, buf, bufsize) sha1_update(sha, buf, bufsize)
-//#define OTEXT_HASH_FINAL(sha, sha_buf) sha1_finish(sha, sha_buf)
-//
-//#define OTEXT_AES_KEY_INIT(ctx, buf) {cout<<"set key"<<endl;\
-//	system("PAUSE");\
-//AES_set_encrypt_key(buf, AES_KEY_BITS, ctx);}//{system("PAUSE");AES_set_encrypt_key(buf, AES_KEY_BITS, ctx);system("PAUSE");}
-//#define OTEXT_AES_ENCRYPT(keyctx, outbuf, inbuf) \
-//{	\
-//	__m128i in=_mm_loadu_si128((const __m128i*)inbuf);	\
-//	__m128i out;	\
-//	cout<<"encrypt"<<endl;\
-//	system("PAUSE");\
-//	AES_encryptC(&in,&out, keyctx);\
-//	memcpy(outbuf,&out,sizeof(__m128));\
-//}//{system("PAUSE");AES_encryptC((__m128i*)inbuf,(__m128i*) outbuf, keyctx);system("PAUSE");}//outbuf=	(BYTE*)&out;
-//#endif
-
-
-#endif
-
-
-
-#define			SERVER_ID	0
-#define			CLIENT_ID	1
-
-
-
-#define MAX_INT (~0)
-#if (MAX_INT == 0xFFFFFFFF)
-#define MACHINE_SIZE_32
-#elif (MAX_INT == 0xFFFFFFFFFFFFFFFF)
-#define MACHINE_SIZE_64
-#else
-#define MACHINE_SIZE_16
-#endif
-
-template<class T>
-T rem(T a, T b) { return ((a)>0) ? (a)%(b) : (a)%(b)+abs(b); }
-
-#define FALSE			0
-#define TRUE			1
-#define ZERO_BYTE		0
-#define MAX_BYTE		0xFF
-#define MAX_UINT		0xFFFFFFFF
-
-#ifdef WIN32
-#include <WinSock2.h>
-#include <windows.h>
-
-typedef unsigned short	USHORT;
-typedef int socklen_t;
-#pragma comment(lib, "wsock32.lib")
-
-#define SleepMiliSec(x)			Sleep(x)
-
-#else //WIN32
-
-
-
-#include <sys/types.h>       
-#include <sys/socket.h>      
-#include <netdb.h>           
-#include <arpa/inet.h>       
-#include <unistd.h>          
-#include <netinet/in.h>   
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <netinet/tcp.h>
-
-typedef int SOCKET;
-#define INVALID_SOCKET -1
- 
-#define SleepMiliSec(x)			usleep((x)<<10)
-#endif// WIN32
-
-#define CEIL_DIVIDE(x, y)			(( ((x) + (y)-1)/(y)))
-
-#define PadToRegisterSize(x) 		(PadToMultiple(x, OTEXT_BLOCK_SIZE_BITS))
-#define PadToMultiple(x, y) 		(( ((x) + (y)-1)/(y)) * (y))
-
-#include <cstring>
-#include <string>  
-#include <vector> 
-#include <iostream>
-
-using namespace std;
-
-
-
-#endif //__TYPEDEFS_H__BY_SGCHOI
-
-
-
-
diff --git a/Porthos/util/utils.hpp b/Porthos/util/utils.hpp
deleted file mode 100644
index 22191f2..0000000
--- a/Porthos/util/utils.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef HEADER_UTILS_H_
-#define HEADER_UTILS_H_
-
-#include <math.h>
-#include <string>
-#include <iostream>
-#include <vector>
-
-using namespace std;
-
-#define LOG_DEBUG_UTILS 0
-
-
-
-
-double calculateSD(vector<double> data);
-int printingFunction();
-
-
-
-/**************************************************************************/
-double calculateSD(vector<double> data)
-{
-	double sum = 0, mean, standardDeviation = 0;
-    for(int i = 0; i < data.size(); ++i)
-        sum += data[i];
-    mean = sum/data.size();
-
-    for(int i = 0; i < data.size(); ++i)
-        standardDeviation += (data[i] - mean)*(data[i] - mean);
-
-    return sqrt(standardDeviation / 10);
-}
-
-
-int printingFunction()
-{
-
-#if LOG_DEBUG_UTILS
-	cout << "Hello" << endl;
-#endif
-	return 0;
-}
-
-
-
-#endif /* HEADER_UTILS_H_ */
-- 
GitLab