diff --git a/Makefile.am.in b/Makefile.am.in
index 774ef7b4fe0303068aaff95da9140cee18f6a490..2ddc8327499bdf3c7a58c9de5c1d44c62f125733 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -6,7 +6,7 @@ BODY:
 AUTOMAKE_OPTIONS = foreign
 
 noinst_LIBRARIES = libsymmetric.a
-noinst_PROGRAMS = desTest desdata bf_test twofish_test generate_q
+noinst_PROGRAMS = desTest desdata bf_test twofish_test generate_q rijndael_test
 
 Makefile.am: Makefile.am.in
 	(cd $(top_srcdir) && $(MAKE) src/symmetric/Makefile.am)
@@ -22,7 +22,8 @@ BUILT_SOURCES =	desSmallFips.c desSmallCore.c desQuickFips.c desQuickCore.c
 
 libsymmetric_a_SOURCES = desCode.h desKerb.c desUtil.c desQuick.c \
       $(BUILT_SOURCES) \
-      sha.c md5.c idea.c arcfour.c cast.c blowfish.c twofish.c
+      sha.c md5.c idea.c arcfour.c cast.c blowfish.c twofish.c rijndael.c \
+      serpent.c
 
 # Generate DES headers.
 $(des_headers): desdata
diff --git a/include/rijndael.h b/include/rijndael.h
new file mode 100644
index 0000000000000000000000000000000000000000..b4c7a13ab69ed8a8350cca276eaef661275c051c
--- /dev/null
+++ b/include/rijndael.h
@@ -0,0 +1,76 @@
+/*
+ *
+ * Rijndael is a 128/192/256-bit block cipher that accepts key sizes of
+ * 128, 192, or 256 bits, designed by Joan Daemen and Vincent Rijmen.  See
+ * http://www.esat.kuleuven.ac.be/~rijmen/rijndael/ for details.
+ */
+
+#if !defined(RIJNDAEL_H)
+#define RIJNDAEL_H
+
+#include <stdlib.h>
+
+#include "crypto_types.h"
+
+/* Other block sizes and key lengths are possible, but in the context of
+ * the ssh protocols, 256 bits is the default. */
+#define RIJNDAEL_BLOCKSIZE 16
+#define RIJNDAEL_KEYSIZE 32
+
+/* Allow keys of size 128 <= bits <= 256 */
+
+#define RIJNDAEL_MIN_KEYSIZE 16
+#define RIJNDAEL_MAX_KEYSIZE 32
+
+typedef struct {
+  UINT32 keys[60];		/* maximum size of key schedule */
+  UINT32 ikeys[60];		/* inverse key schedule */
+  int nrounds;			/* number of rounds to use for our key size */
+} RIJNDAEL_context;
+
+/* This basically performs Rijndael's key scheduling algorithm, as it's the
+ * only initialization required anyhow.   The key size is specified in bytes,
+ * but the only valid values are 16 (128 bits), 24 (192 bits), and 32 (256
+ * bits).  If a value other than these three is specified, the key will be
+ * truncated to the closest value less than the key size specified, e.g.
+ * specifying 7 will use only the first 6 bytes of the key given.  DO NOT
+ * PASS A VALUE LESS THAN 16 TO KEYSIZE! */
+void
+rijndael_setup(RIJNDAEL_context *ctx, size_t keysize, const UINT8 *key);
+
+/*
+ * rijndael_encrypt()
+ *
+ * Encrypt 16 bytes of data with the Rijndael algorithm.  Before this
+ * function can be used, rijndael_setup must be used in order to initialize
+ * Rijndael's key schedule.
+ *
+ * This function always encrypts 16 bytes of plaintext to 16 bytes of
+ * ciphertext.  The memory areas of the plaintext and the ciphertext can
+ * overlap.
+ */
+
+void
+rijndael_encrypt(RIJNDAEL_context *context,
+		 const UINT8 *plaintext,
+		 UINT8 *ciphertext);
+
+/*
+ * rijndael_decrypt()
+ *
+ * Decrypt 16 bytes of data with the Rijndael algorithm.
+ *
+ * Before this function can be used, rijndael_setup() must be used in order
+ * to set up the key schedule required for the decryption algorithm.
+ * 
+ * This function always decrypts 16 bytes of ciphertext to 16 bytes of
+ * plaintext.  The memory areas of the plaintext and the ciphertext can
+ * overlap.
+ */
+
+void
+rijndael_decrypt(RIJNDAEL_context *context,
+		 const UINT8 *ciphertext,
+		 UINT8 *plaintext);
+
+#endif /* RIJNDAEL_H */
diff --git a/include/serpent.h b/include/serpent.h
new file mode 100644
index 0000000000000000000000000000000000000000..31dfacf0d56da8caa075bedfa9f8aa2d024f0592
--- /dev/null
+++ b/include/serpent.h
@@ -0,0 +1,66 @@
+
+/*
+ *
+ * Serpent is a 128-bit block cipher that accepts a key size of 256 bits,
+ * designed by Ross Anderson, Eli Biham, and Lars Knudsen.  See
+ * http://www.cl.cam.ac.uk/~rja14/serpent.html for details.
+ */
+
+#if !defined(SERPENT_H)
+#define SERPENT_H
+
+#include <stdlib.h>
+#include "crypto_types.h"
+
+#define SERPENT_BLOCKSIZE 16
+
+/* Other key lengths are possible, but we only use 256 bits.  Besides, the
+   design of Serpent makes other key lengths useless; they cheated with the
+   AES requirements, using a 256-bit key length exclusively and just padding
+   it out if the desired key length was less, so there really is no advantage
+   to using key lengths less than 256 bits. */
+#define SERPENT_KEYSIZE 32
+
+typedef struct {
+  UINT32 keys[33][4];		/* key schedule */
+} SERPENT_context;
+
+/* This performs Serpent's key scheduling algorithm. */
+void
+serpent_setup(SERPENT_context *ctx, const UINT8 key[32]);
+
+/*
+ * serpent_encrypt()
+ *
+ * Encrypt 16 bytes of data with the Serpent algorithm.  Before this
+ * function can be used, serpent_setup must be used in order to initialize
+ * Serpent's key schedule.
+ *
+ * This function always encrypts 16 bytes of plaintext to 16 bytes of
+ * ciphertext.  The memory areas of the plaintext and the ciphertext can
+ * overlap.
+ */
+void
+serpent_encrypt(SERPENT_context *context,
+		const UINT8 *plaintext,
+		UINT8 *ciphertext);
+
+/*
+ * serpent_decrypt()
+ *
+ * Decrypt 16 bytes of data with the Serpent algorithm.
+ *
+ * Before this function can be used, serpent_setup() must be used in order
+ * to set up the key schedule required for the decryption algorithm.
+ * 
+ * This function always decrypts 16 bytes of ciphertext to 16 bytes of
+ * plaintext.  The memory areas of the plaintext and the ciphertext can
+ * overlap.
+ */
+
+void
+serpent_decrypt(SERPENT_context *context,
+		const UINT8 *ciphertext,
+		UINT8 *plaintext);
+
+#endif /* SERPENT_H */
diff --git a/rijndael.c b/rijndael.c
new file mode 100644
index 0000000000000000000000000000000000000000..3562471c4ee547eaa0f61c8478a237ae449f9760
--- /dev/null
+++ b/rijndael.c
@@ -0,0 +1,455 @@
+/* rijndael - An implementation of the Rijndael cipher.
+ * Copyright (C) 2000 Rafael R. Sevilla <dido@pacific.net.ph>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "rijndael.h"
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+/* These tables combine both the S-boxes and the mixcolumn transformation, so
+   that we can perform a round's encryption or by means of four table lookups
+   and four XOR's per column of state.  They were generated by the
+   makertbls.pl script. */
+UINT32 dtbl[] = {
+  0xa56363c6, 0x847c7cf8, 0x997777ee, 0x8d7b7bf6, 
+  0x0df2f2ff, 0xbd6b6bd6, 0xb16f6fde, 0x54c5c591, 
+  0x50303060, 0x03010102, 0xa96767ce, 0x7d2b2b56, 
+  0x19fefee7, 0x62d7d7b5, 0xe6abab4d, 0x9a7676ec, 
+  0x45caca8f, 0x9d82821f, 0x40c9c989, 0x877d7dfa, 
+  0x15fafaef, 0xeb5959b2, 0xc947478e, 0x0bf0f0fb, 
+  0xecadad41, 0x67d4d4b3, 0xfda2a25f, 0xeaafaf45, 
+  0xbf9c9c23, 0xf7a4a453, 0x967272e4, 0x5bc0c09b, 
+  0xc2b7b775, 0x1cfdfde1, 0xae93933d, 0x6a26264c, 
+  0x5a36366c, 0x413f3f7e, 0x02f7f7f5, 0x4fcccc83, 
+  0x5c343468, 0xf4a5a551, 0x34e5e5d1, 0x08f1f1f9, 
+  0x937171e2, 0x73d8d8ab, 0x53313162, 0x3f15152a, 
+  0x0c040408, 0x52c7c795, 0x65232346, 0x5ec3c39d, 
+  0x28181830, 0xa1969637, 0x0f05050a, 0xb59a9a2f, 
+  0x0907070e, 0x36121224, 0x9b80801b, 0x3de2e2df, 
+  0x26ebebcd, 0x6927274e, 0xcdb2b27f, 0x9f7575ea, 
+  0x1b090912, 0x9e83831d, 0x742c2c58, 0x2e1a1a34, 
+  0x2d1b1b36, 0xb26e6edc, 0xee5a5ab4, 0xfba0a05b, 
+  0xf65252a4, 0x4d3b3b76, 0x61d6d6b7, 0xceb3b37d, 
+  0x7b292952, 0x3ee3e3dd, 0x712f2f5e, 0x97848413, 
+  0xf55353a6, 0x68d1d1b9, 0x00000000, 0x2cededc1, 
+  0x60202040, 0x1ffcfce3, 0xc8b1b179, 0xed5b5bb6, 
+  0xbe6a6ad4, 0x46cbcb8d, 0xd9bebe67, 0x4b393972, 
+  0xde4a4a94, 0xd44c4c98, 0xe85858b0, 0x4acfcf85, 
+  0x6bd0d0bb, 0x2aefefc5, 0xe5aaaa4f, 0x16fbfbed, 
+  0xc5434386, 0xd74d4d9a, 0x55333366, 0x94858511, 
+  0xcf45458a, 0x10f9f9e9, 0x06020204, 0x817f7ffe, 
+  0xf05050a0, 0x443c3c78, 0xba9f9f25, 0xe3a8a84b, 
+  0xf35151a2, 0xfea3a35d, 0xc0404080, 0x8a8f8f05, 
+  0xad92923f, 0xbc9d9d21, 0x48383870, 0x04f5f5f1, 
+  0xdfbcbc63, 0xc1b6b677, 0x75dadaaf, 0x63212142, 
+  0x30101020, 0x1affffe5, 0x0ef3f3fd, 0x6dd2d2bf, 
+  0x4ccdcd81, 0x140c0c18, 0x35131326, 0x2fececc3, 
+  0xe15f5fbe, 0xa2979735, 0xcc444488, 0x3917172e, 
+  0x57c4c493, 0xf2a7a755, 0x827e7efc, 0x473d3d7a, 
+  0xac6464c8, 0xe75d5dba, 0x2b191932, 0x957373e6, 
+  0xa06060c0, 0x98818119, 0xd14f4f9e, 0x7fdcdca3, 
+  0x66222244, 0x7e2a2a54, 0xab90903b, 0x8388880b, 
+  0xca46468c, 0x29eeeec7, 0xd3b8b86b, 0x3c141428, 
+  0x79dedea7, 0xe25e5ebc, 0x1d0b0b16, 0x76dbdbad, 
+  0x3be0e0db, 0x56323264, 0x4e3a3a74, 0x1e0a0a14, 
+  0xdb494992, 0x0a06060c, 0x6c242448, 0xe45c5cb8, 
+  0x5dc2c29f, 0x6ed3d3bd, 0xefacac43, 0xa66262c4, 
+  0xa8919139, 0xa4959531, 0x37e4e4d3, 0x8b7979f2, 
+  0x32e7e7d5, 0x43c8c88b, 0x5937376e, 0xb76d6dda, 
+  0x8c8d8d01, 0x64d5d5b1, 0xd24e4e9c, 0xe0a9a949, 
+  0xb46c6cd8, 0xfa5656ac, 0x07f4f4f3, 0x25eaeacf, 
+  0xaf6565ca, 0x8e7a7af4, 0xe9aeae47, 0x18080810, 
+  0xd5baba6f, 0x887878f0, 0x6f25254a, 0x722e2e5c, 
+  0x241c1c38, 0xf1a6a657, 0xc7b4b473, 0x51c6c697, 
+  0x23e8e8cb, 0x7cdddda1, 0x9c7474e8, 0x211f1f3e, 
+  0xdd4b4b96, 0xdcbdbd61, 0x868b8b0d, 0x858a8a0f, 
+  0x907070e0, 0x423e3e7c, 0xc4b5b571, 0xaa6666cc, 
+  0xd8484890, 0x05030306, 0x01f6f6f7, 0x120e0e1c, 
+  0xa36161c2, 0x5f35356a, 0xf95757ae, 0xd0b9b969, 
+  0x91868617, 0x58c1c199, 0x271d1d3a, 0xb99e9e27, 
+  0x38e1e1d9, 0x13f8f8eb, 0xb398982b, 0x33111122, 
+  0xbb6969d2, 0x70d9d9a9, 0x898e8e07, 0xa7949433, 
+  0xb69b9b2d, 0x221e1e3c, 0x92878715, 0x20e9e9c9, 
+  0x49cece87, 0xff5555aa, 0x78282850, 0x7adfdfa5, 
+  0x8f8c8c03, 0xf8a1a159, 0x80898909, 0x170d0d1a, 
+  0xdabfbf65, 0x31e6e6d7, 0xc6424284, 0xb86868d0, 
+  0xc3414182, 0xb0999929, 0x772d2d5a, 0x110f0f1e, 
+  0xcbb0b07b, 0xfc5454a8, 0xd6bbbb6d, 0x3a16162c, 
+};
+
+UINT32 itbl[] = {
+  0x50a7f451, 0x5365417e, 0xc3a4171a, 0x965e273a, 
+  0xcb6bab3b, 0xf1459d1f, 0xab58faac, 0x9303e34b, 
+  0x55fa3020, 0xf66d76ad, 0x9176cc88, 0x254c02f5, 
+  0xfcd7e54f, 0xd7cb2ac5, 0x80443526, 0x8fa362b5, 
+  0x495ab1de, 0x671bba25, 0x980eea45, 0xe1c0fe5d, 
+  0x02752fc3, 0x12f04c81, 0xa397468d, 0xc6f9d36b, 
+  0xe75f8f03, 0x959c9215, 0xeb7a6dbf, 0xda595295, 
+  0x2d83bed4, 0xd3217458, 0x2969e049, 0x44c8c98e, 
+  0x6a89c275, 0x78798ef4, 0x6b3e5899, 0xdd71b927, 
+  0xb64fe1be, 0x17ad88f0, 0x66ac20c9, 0xb43ace7d, 
+  0x184adf63, 0x82311ae5, 0x60335197, 0x457f5362, 
+  0xe07764b1, 0x84ae6bbb, 0x1ca081fe, 0x942b08f9, 
+  0x58684870, 0x19fd458f, 0x876cde94, 0xb7f87b52, 
+  0x23d373ab, 0xe2024b72, 0x578f1fe3, 0x2aab5566, 
+  0x0728ebb2, 0x03c2b52f, 0x9a7bc586, 0xa50837d3, 
+  0xf2872830, 0xb2a5bf23, 0xba6a0302, 0x5c8216ed, 
+  0x2b1ccf8a, 0x92b479a7, 0xf0f207f3, 0xa1e2694e, 
+  0xcdf4da65, 0xd5be0506, 0x1f6234d1, 0x8afea6c4, 
+  0x9d532e34, 0xa055f3a2, 0x32e18a05, 0x75ebf6a4, 
+  0x39ec830b, 0xaaef6040, 0x069f715e, 0x51106ebd, 
+  0xf98a213e, 0x3d06dd96, 0xae053edd, 0x46bde64d, 
+  0xb58d5491, 0x055dc471, 0x6fd40604, 0xff155060, 
+  0x24fb9819, 0x97e9bdd6, 0xcc434089, 0x779ed967, 
+  0xbd42e8b0, 0x888b8907, 0x385b19e7, 0xdbeec879, 
+  0x470a7ca1, 0xe90f427c, 0xc91e84f8, 0x00000000, 
+  0x83868009, 0x48ed2b32, 0xac70111e, 0x4e725a6c, 
+  0xfbff0efd, 0x5638850f, 0x1ed5ae3d, 0x27392d36, 
+  0x64d90f0a, 0x21a65c68, 0xd1545b9b, 0x3a2e3624, 
+  0xb1670a0c, 0x0fe75793, 0xd296eeb4, 0x9e919b1b, 
+  0x4fc5c080, 0xa220dc61, 0x694b775a, 0x161a121c, 
+  0x0aba93e2, 0xe52aa0c0, 0x43e0223c, 0x1d171b12, 
+  0x0b0d090e, 0xadc78bf2, 0xb9a8b62d, 0xc8a91e14, 
+  0x8519f157, 0x4c0775af, 0xbbdd99ee, 0xfd607fa3, 
+  0x9f2601f7, 0xbcf5725c, 0xc53b6644, 0x347efb5b, 
+  0x7629438b, 0xdcc623cb, 0x68fcedb6, 0x63f1e4b8, 
+  0xcadc31d7, 0x10856342, 0x40229713, 0x2011c684, 
+  0x7d244a85, 0xf83dbbd2, 0x1132f9ae, 0x6da129c7, 
+  0x4b2f9e1d, 0xf330b2dc, 0xec52860d, 0xd0e3c177, 
+  0x6c16b32b, 0x99b970a9, 0xfa489411, 0x2264e947, 
+  0xc48cfca8, 0x1a3ff0a0, 0xd82c7d56, 0xef903322, 
+  0xc74e4987, 0xc1d138d9, 0xfea2ca8c, 0x360bd498, 
+  0xcf81f5a6, 0x28de7aa5, 0x268eb7da, 0xa4bfad3f, 
+  0xe49d3a2c, 0x0d927850, 0x9bcc5f6a, 0x62467e54, 
+  0xc2138df6, 0xe8b8d890, 0x5ef7392e, 0xf5afc382, 
+  0xbe805d9f, 0x7c93d069, 0xa92dd56f, 0xb31225cf, 
+  0x3b99acc8, 0xa77d1810, 0x6e639ce8, 0x7bbb3bdb, 
+  0x097826cd, 0xf418596e, 0x01b79aec, 0xa89a4f83, 
+  0x656e95e6, 0x7ee6ffaa, 0x08cfbc21, 0xe6e815ef, 
+  0xd99be7ba, 0xce366f4a, 0xd4099fea, 0xd67cb029, 
+  0xafb2a431, 0x31233f2a, 0x3094a5c6, 0xc066a235, 
+  0x37bc4e74, 0xa6ca82fc, 0xb0d090e0, 0x15d8a733, 
+  0x4a9804f1, 0xf7daec41, 0x0e50cd7f, 0x2ff69117, 
+  0x8dd64d76, 0x4db0ef43, 0x544daacc, 0xdf0496e4, 
+  0xe3b5d19e, 0x1b886a4c, 0xb81f2cc1, 0x7f516546, 
+  0x04ea5e9d, 0x5d358c01, 0x737487fa, 0x2e410bfb, 
+  0x5a1d67b3, 0x52d2db92, 0x335610e9, 0x1347d66d, 
+  0x8c61d79a, 0x7a0ca137, 0x8e14f859, 0x893c13eb, 
+  0xee27a9ce, 0x35c961b7, 0xede51ce1, 0x3cb1477a, 
+  0x59dfd29c, 0x3f73f255, 0x79ce1418, 0xbf37c773, 
+  0xeacdf753, 0x5baafd5f, 0x146f3ddf, 0x86db4478, 
+  0x81f3afca, 0x3ec468b9, 0x2c342438, 0x5f40a3c2, 
+  0x72c31d16, 0x0c25e2bc, 0x8b493c28, 0x41950dff, 
+  0x7101a839, 0xdeb30c08, 0x9ce4b4d8, 0x90c15664, 
+  0x6184cb7b, 0x70b632d5, 0x745c6c48, 0x4257b8d0, 
+};
+
+
+/* Needed only for the key schedule and for final rounds */
+UINT8 sbox[256] = {
+  99, 124, 119, 123, 242, 107, 111, 197,  48,   1, 103,  43, 254, 215, 171,
+  118, 202, 130, 201, 125, 250,  89,  71, 240, 173, 212, 162, 175, 156, 164,
+  114, 192, 183, 253, 147,  38,  54,  63, 247, 204,  52, 165, 229, 241, 113,
+  216,  49,  21,  4, 199,  35, 195,  24, 150,   5, 154,   7,  18, 128, 226,
+  235,  39, 178, 117,  9, 131,  44,  26,  27, 110,  90, 160,  82,  59, 214,
+  179,  41, 227,  47, 132, 83, 209,   0, 237,  32, 252, 177,  91, 106, 203,
+  190,  57,  74,  76,  88, 207, 208, 239, 170, 251,  67,  77,  51, 133,  69,
+  249,   2, 127,  80,  60, 159, 168, 81, 163,  64, 143, 146, 157,  56, 245,
+  188, 182, 218,  33,  16, 255, 243, 210, 205,  12,  19, 236,  95, 151,  68,
+  23, 196, 167, 126,  61, 100,  93,  25, 115, 96, 129,  79, 220,  34,  42,
+  144, 136,  70, 238, 184,  20, 222,  94,  11, 219, 224,  50,  58,  10,  73,
+  6,  36,  92, 194, 211, 172,  98, 145, 149, 228, 121, 231, 200,  55, 109, 
+  141, 213,  78, 169, 108,  86, 244, 234, 101, 122, 174,   8, 186, 120,  37,
+  46,  28, 166, 180, 198, 232, 221, 116,  31,  75, 189, 139, 138, 112,  62,
+  181, 102,  72,   3, 246,  14,  97,  53,  87, 185, 134, 193,  29, 158, 225,
+  248, 152,  17, 105, 217, 142, 148, 155,  30, 135, 233, 206,  85,  40, 223, 
+  140, 161, 137,  13, 191, 230,  66, 104,  65, 153,  45,  15, 176,  84, 187,
+  22, 
+};
+
+UINT8 isbox[256] = {
+  82,   9, 106, 213,  48,  54, 165,  56, 191,  64, 163, 158, 129, 243, 215,
+  251, 124, 227,  57, 130, 155,  47, 255, 135,  52, 142,  67,  68, 196, 222,
+  233, 203, 84, 123, 148,  50, 166, 194,  35,  61, 238,  76, 149,  11,  66,
+  250, 195,  78,  8,  46, 161, 102,  40, 217,  36, 178, 118,  91, 162,  73,
+  109, 139, 209,  37, 114, 248, 246, 100, 134, 104, 152,  22, 212, 164,  92,
+  204,  93, 101, 182, 146, 108, 112,  72,  80, 253, 237, 185, 218,  94,  21,
+  70,  87, 167, 141, 157, 132, 144, 216, 171,   0, 140, 188, 211,  10, 247,
+  228,  88,   5, 184, 179,  69,   6, 208,  44,  30, 143, 202,  63,  15,   2,
+  193, 175, 189,   3,   1,  19, 138, 107,  58, 145,  17,  65,  79, 103, 220,
+  234, 151, 242, 207, 206, 240, 180, 230, 115, 150, 172, 116,  34, 231, 173,
+  53, 133, 226, 249,  55, 232,  28, 117, 223, 110,  71, 241,  26, 113,  29,
+  41, 197, 137, 111, 183,  98,  14, 170,  24, 190,  27, 252,  86,  62,  75,
+  198, 210, 121,  32, 154, 219, 192, 254, 120, 205,  90, 244,  31, 221, 168,
+  51, 136,   7, 199,  49, 177,  18,  16,  89,  39, 128, 236,  95,  96,  81,
+  127, 169,  25, 181,  74,  13,  45, 229, 122, 159, 147, 201, 156, 239, 160,
+  224,  59,  77, 174,  42, 245, 176, 200, 235, 187,  60, 131,  83, 153,  97,
+  23,  43,   4, 126, 186, 119, 214,  38, 225, 105,  20,  99,  85,  33,  12,
+  125, 
+};
+
+/* Used only by the key schedule */
+UINT8 Logtable[256] = {
+  0,   0,  25,   1,  50,   2,  26, 198,  75, 199,  27, 104,  51, 238, 223,  3,
+  100,   4, 224,  14,  52, 141, 129, 239,  76, 113,   8, 200, 248, 105,  28,
+  193, 125, 194,  29, 181, 249, 185,  39, 106,  77, 228, 166, 114, 154, 201,
+  9, 120, 101,  47, 138,   5,  33,  15, 225,  36,  18, 240, 130,  69,  53,
+  147, 218, 142, 150, 143, 219, 189,  54, 208, 206, 148,  19,  92, 210, 241,
+  64,  70, 131,  56, 102, 221, 253,  48, 191,   6, 139,  98, 179,  37, 226,
+  152,  34, 136, 145,  16, 126, 110,  72, 195, 163, 182,  30,  66,  58, 107,
+  40,  84, 250, 133,  61, 186, 43, 121,  10,  21, 155, 159,  94, 202,  78,
+  212, 172, 229, 243, 115, 167,  87, 175,  88, 168,  80, 244, 234, 214, 116,
+  79, 174, 233, 213, 231, 230, 173, 232, 44, 215, 117, 122, 235,  22,  11,
+  245,  89, 203,  95, 176, 156, 169,  81, 160, 127,  12, 246, 111,  23, 196,
+  73, 236, 216,  67,  31,  45, 164, 118, 123, 183, 204, 187,  62,  90, 251,
+  96, 177, 134,  59,  82, 161, 108, 170,  85,  41, 157, 151, 178, 135, 144,
+  97, 190, 220, 252, 188, 149, 207, 205,  55,  63,  91, 209, 83,  57, 132,
+  60,  65, 162, 109,  71,  20,  42, 158,  93,  86, 242, 211, 171, 68,  17,
+  146, 217,  35,  32,  46, 137, 180, 124, 184,  38, 119, 153, 227, 165, 103,  
+  74, 237, 222, 197,  49, 254,  24,  13,  99, 140, 128, 192, 247, 112,   7, 
+};
+
+UINT8 Alogtable[256] = {
+  1,   3,   5,  15,  17,  51,  85, 255,  26,  46, 114, 150, 161, 248,  19, 
+  53, 95, 225,  56,  72, 216, 115, 149, 164, 247,   2,   6,  10,  30,  34,
+  102, 170, 229,  52,  92, 228,  55,  89, 235,  38, 106, 190, 217, 112, 144,
+  171, 230,  49,  83, 245,   4,  12,  20,  60,  68, 204,  79, 209, 104, 184,
+  211, 110, 178, 205,  76, 212, 103, 169, 224,  59,  77, 215,  98, 166, 241,
+  8,  24,  40, 120, 136, 131, 158, 185, 208, 107, 189, 220, 127, 129, 152,
+  179, 206,  73, 219, 118, 154, 181, 196,  87, 249,  16,  48,  80, 240,  11,
+  29,  39, 105, 187, 214,  97, 163, 254,  25,  43, 125, 135, 146, 173, 236,
+  47, 113, 147, 174, 233,  32,  96, 160, 251,  22,  58,  78, 210, 109, 183,
+  194,  93, 231,  50,  86, 250,  21,  63,  65, 195,  94, 226,  61,  71, 201,
+  64, 192,  91, 237,  44, 116, 156, 191, 218, 117, 159, 186, 213, 100, 172,
+  239,  42, 126, 130, 157, 188, 223, 122, 142, 137, 128, 155, 182, 193,  88,
+  232,  35, 101, 175, 234,  37, 111, 177, 200,  67, 197,  84, 252,  31,  33,
+  99, 165, 244,   7,   9,  27,  45, 119, 153, 176, 203,  70, 202,  69, 207,
+  74, 222, 121, 139, 134, 145, 168, 227,  62,  66, 198,  81, 243,  14,  18,
+  54,  90, 238,  41, 123, 141, 140, 143, 138, 133, 148, 167, 242,  13,  23,
+  57,  75, 221, 124, 132, 151, 162, 253,  28,  36, 108, 180, 199,  82, 246, 1, 
+};
+
+#define ROTBYTE(x) (((x) >> 8) | (((x) & 0xff) << 24))
+#define ROTRBYTE(x) (((x) << 8) | (((x) >> 24) & 0xff))
+#define SUBBYTE(x, box) (((box)[((x) & 0xff)]) | \
+                        ((box)[(((x) >> 8) & 0xff)] << 8) | \
+                        ((box)[(((x) >> 16) & 0xff)] << 16) | \
+                        ((box)[(((x) >> 24) & 0xff)] << 24))
+
+static UINT8
+xtime(UINT8 a)
+{
+  UINT8 b;
+
+  b = (a & 0x80) ? 0x1b : 0;
+  a<<=1;
+  a^=b;
+  return(a);
+}
+
+static UINT8
+mul(UINT8 a, UINT8 b)
+{
+  if (a && b) return Alogtable[(Logtable[a] + Logtable[b])%255];
+  else return 0;
+}
+
+static void
+inv_mix_column(UINT32 *a, UINT32 *b)
+{
+  UINT8 c[4][4];
+  int i, j;
+	
+  for(j = 0; j < 4; j++) {
+    for(i = 0; i < 4; i++) {
+      c[j][i] = mul(0xe, (a[j] >> i*8) & 0xff)
+	^ mul(0xb, (a[j] >> ((i+1)%4)*8) & 0xff)
+	^ mul(0xd, (a[j] >> ((i+2)%4)*8) & 0xff)
+	^ mul(0x9, (a[j] >> ((i+3)%4)*8) & 0xff);
+    }
+  }
+  for(i = 0; i < 4; i++) {
+    b[i] = 0;
+    for(j = 0; j < 4; j++)
+      b[i] |= c[i][j] << (j*8);
+  }
+}
+
+void
+rijndael_setup(RIJNDAEL_context *ctx, size_t keysize, const UINT8 *key)
+{
+  int nk, nr, i, lastkey;
+  UINT32 temp, rcon;
+
+  /* Truncate keysizes to the valid key sizes provided by Rijndael */
+  if (keysize >= 32) {
+    nk = 8;
+    nr = 14;
+  } else if (keysize >= 24) {
+    nk = 6;
+    nr = 12;
+  } else {			/* must be 16 or more */
+    nk = 4;
+    nr = 10;
+  }
+
+  lastkey = (RIJNDAEL_BLOCKSIZE/4) * (nr + 1);
+  ctx->nrounds = nr;
+  rcon = 1;
+  for (i=0; i<nk; i++) {
+    ctx->keys[i] = key[i*4] + (key[i*4+1]<<8) + (key[i*4+2]<<16) +
+      (key[i*4+3]<<24);
+  }
+
+  for (i=nk; i<lastkey; i++) {
+    temp = ctx->keys[i-1];
+    if (i % nk == 0) {
+      temp = SUBBYTE(ROTBYTE(temp), sbox) ^ rcon;
+      rcon = (UINT32)xtime((UINT8)rcon&0xff);
+    } else if (nk > 6 && (i%nk) == 4) {
+      temp = SUBBYTE(temp, sbox);
+    }
+    ctx->keys[i] = ctx->keys[i-nk] ^ temp;
+  }
+  /* Generate the inverse keys */
+  for (i=0; i<4; i++) {
+    ctx->ikeys[i] = ctx->keys[i];
+    ctx->ikeys[lastkey-4 + i] = ctx->keys[lastkey-4 + i];
+  }
+  for (i=4; i<lastkey-4; i+=4)
+    inv_mix_column(&(ctx->keys[i]), &(ctx->ikeys[i]));
+}
+
+/* Key addition that also packs every byte in the key to a word rep. */
+static void
+key_addition_8to32(const UINT8 *txt, UINT32 *keys, UINT32 *out)
+{
+  const UINT8 *ptr;
+  int i, j;
+  UINT32 val;
+
+  ptr = txt;
+  for (i=0; i<4; i++) {
+    val = 0;
+    for (j=0; j<4; j++)
+      val |= (*ptr++ << 8*j);
+    out[i] = keys[i]^val;
+  }
+}
+
+static void
+key_addition32(const UINT32 *txt, UINT32 *keys, UINT32 *out)
+{
+  int i;
+
+  for (i=0; i<4; i++)
+    out[i] = keys[i] ^ txt[i];
+}
+
+static void
+key_addition32to8(const UINT32 *txt, UINT32 *keys, UINT8 *out)
+{
+  UINT8 *ptr;
+  int i, j;
+  UINT32 val;
+
+  ptr = out;
+  for (i=0; i<4; i++) {
+    val = txt[i] ^ keys[i];
+    for (j=0; j<4; j++)
+      *ptr++ = (val >> 8*j) & 0xff;
+  }
+}
+
+static int idx[4][4] = {
+  { 0, 1, 2, 3 },
+  { 1, 2, 3, 0 },
+  { 2, 3, 0, 1 },
+  { 3, 0, 1, 2 } };
+
+void
+rijndael_encrypt(RIJNDAEL_context *ctx,
+		 const UINT8 *plaintext,
+		 UINT8 *ciphertext)
+{
+  int r, j;
+  UINT32 wtxt[4], t[4];		/* working ciphertext */
+  UINT32 e;
+
+  key_addition_8to32(plaintext, &(ctx->keys[0]), wtxt);
+  for (r=1; r<ctx->nrounds; r++) {
+    for (j=0; j<4; j++) {
+      t[j] = dtbl[wtxt[j] & 0xff] ^
+	ROTRBYTE(dtbl[(wtxt[idx[1][j]] >> 8) & 0xff]^
+		 ROTRBYTE(dtbl[(wtxt[idx[2][j]] >> 16) & 0xff] ^
+			  ROTRBYTE(dtbl[(wtxt[idx[3][j]] >> 24) & 0xff])));
+    }
+    key_addition32(t, &(ctx->keys[r*4]), wtxt);
+  }
+  /* last round is special: there is no mixcolumn, so we can't use the big
+     tables. */
+  for (j=0; j<4; j++) {
+    e = wtxt[j] & 0xff;
+    e |= (wtxt[idx[1][j]]) & (0xff << 8);
+    e |= (wtxt[idx[2][j]]) & (0xff << 16);
+    e |= (wtxt[idx[3][j]]) & (0xff << 24);
+    t[j] = e;
+  }
+  for (j=0; j<4; j++)
+    t[j] = SUBBYTE(t[j], sbox);
+  key_addition32to8(t, &(ctx->keys[4*ctx->nrounds]), ciphertext);
+}
+
+static int iidx[4][4] = {
+  { 0, 1, 2, 3 },
+  { 3, 0, 1, 2 },
+  { 2, 3, 0, 1 },
+  { 1, 2, 3, 0 } };
+
+void
+rijndael_decrypt(RIJNDAEL_context *ctx,
+		 const UINT8 *ciphertext,
+		 UINT8 *plaintext)
+{
+  int r, j;
+  UINT32 wtxt[4], t[4];		/* working ciphertext */
+  UINT32 e;
+
+  key_addition_8to32(ciphertext, &(ctx->ikeys[4*ctx->nrounds]), wtxt);
+  for (r=ctx->nrounds-1; r> 0;  r--) {
+    for (j=0; j<4; j++) {
+      t[j] = itbl[wtxt[j] & 0xff] ^
+	ROTRBYTE(itbl[(wtxt[iidx[1][j]] >> 8) & 0xff]^
+		 ROTRBYTE(itbl[(wtxt[iidx[2][j]] >> 16) & 0xff] ^
+			  ROTRBYTE(itbl[(wtxt[iidx[3][j]] >> 24) & 0xff])));
+    }
+    key_addition32(t, &(ctx->ikeys[r*4]), wtxt);
+  }
+  /* last round is special: there is no mixcolumn, so we can't use the big
+     tables. */
+  for (j=0; j<4; j++) {
+    e = wtxt[j] & 0xff;
+    e |= (wtxt[iidx[1][j]]) & (0xff << 8);
+    e |= (wtxt[iidx[2][j]]) & (0xff << 16);
+    e |= (wtxt[iidx[3][j]]) & (0xff << 24);
+    t[j] = e;
+  }
+  for (j=0; j<4; j++)
+    t[j] = SUBBYTE(t[j], isbox);
+  key_addition32to8(t, &(ctx->ikeys[0]), plaintext);
+}
diff --git a/rijndael_test.c b/rijndael_test.c
new file mode 100644
index 0000000000000000000000000000000000000000..8bb4fe670acf0b2a024f6c4c8aa855c53afa81b1
--- /dev/null
+++ b/rijndael_test.c
@@ -0,0 +1,37 @@
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "rijndael.h"
+
+int main(void)
+{
+  RIJNDAEL_context ctx;
+  UINT8 key[32];
+  UINT8 text[16];
+  int i, j;
+
+  for (i=0; i<16; i++)
+    text[i] = i;
+  for (i=0; i<32; i++)
+    key[i] = 0;
+  key[0] = 1;
+
+  for (j=16; j<=32; j+=8) {
+    rijndael_setup(&ctx, j, key);
+    printf("\nBlock Size = 128 bits, Key Size = %d bits\n", j*8);
+    printf("\nPlain=   ");
+    for (i=0; i<16; i++)
+      printf("%2x", text[i]);
+    printf("\n");
+    rijndael_encrypt(&ctx, text, text);
+    printf("Encrypt= ");
+    for (i=0; i<16; i++)
+      printf("%02x", text[i]);
+    printf("\nDecrypt= ");
+    rijndael_decrypt(&ctx, text, text);
+    for (i=0; i<16; i++)
+      printf("%2x", text[i]);
+    printf("\n");
+  }
+  return(0);
+}
diff --git a/serpent.c b/serpent.c
new file mode 100644
index 0000000000000000000000000000000000000000..d5bdbb99d40fe1696e9071e928ad986736c058c7
--- /dev/null
+++ b/serpent.c
@@ -0,0 +1,369 @@
+/* Copyright (C) 1998 Ross Anderson, Eli Biham, Lars Knudsen
+ * All rights reserved.
+ *
+ * This code is freely distributed for AES selection process.
+ * No other use is allowed.
+ * 
+ * Copyright remains of the copyright holders, and as such any Copyright
+ * notices in the code are not to be removed.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only for the AES selection process, provided
+ * that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the 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.
+ * 
+ * THIS SOFTWARE IS PROVIDED ``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.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed without the authors permission.
+ *  i.e. this code cannot simply be copied and put under another distribution
+ * licence [including the GNU Public Licence.]
+ *
+ * Contrary to these statements, all Serpent code available from the authors is
+ * now covered under LGPL, including this source file, according to the
+ * Serpent website.  For more details on this algorithm, see the Serpent
+ * website at http://www.cl.cam.ac.uk/~rja14/serpent.html
+ *
+ * I've modified this code a bit so that it interoperates with lsh properly.
+ * 2000-9-5, Rafael R. Sevilla <dido@pacific.net.ph>
+ */
+
+#include "serpent.h"
+#include "serpentsboxes.h"
+
+/*  The functions  */
+void
+serpent_setup(SERPENT_context *ctx, const UINT8 key[32])
+{
+  UINT32 i, j;
+  UINT32 w[132], k[132];
+  UINT32 kd[8];
+  const UINT8 *kptr;
+
+  kptr = key;
+  for (i=0; i<8; i++) {
+    kd[i] = 0;
+    for (j=0; j<4; j++)
+      kd[i] |= (*kptr++) << j*8;
+  }
+
+  for(i=0; i<8; i++)
+    w[i]=kd[i];
+
+  for(i++; i<8; i++)
+    w[i]=0;
+  for(i=8; i<16; i++)
+    w[i]=ROL(w[i-8]^w[i-5]^w[i-3]^w[i-1]^PHI^(i-8),11);
+  for(i=0; i<8; i++)
+    w[i]=w[i+8];
+  for(i=8; i<132; i++)
+    w[i]=ROL(w[i-8]^w[i-5]^w[i-3]^w[i-1]^PHI^i,11);
+
+  RND03(w[  0], w[  1], w[  2], w[  3], k[  0], k[  1], k[  2], k[  3]);
+  RND02(w[  4], w[  5], w[  6], w[  7], k[  4], k[  5], k[  6], k[  7]);
+  RND01(w[  8], w[  9], w[ 10], w[ 11], k[  8], k[  9], k[ 10], k[ 11]);
+  RND00(w[ 12], w[ 13], w[ 14], w[ 15], k[ 12], k[ 13], k[ 14], k[ 15]);
+  RND31(w[ 16], w[ 17], w[ 18], w[ 19], k[ 16], k[ 17], k[ 18], k[ 19]);
+  RND30(w[ 20], w[ 21], w[ 22], w[ 23], k[ 20], k[ 21], k[ 22], k[ 23]);
+  RND29(w[ 24], w[ 25], w[ 26], w[ 27], k[ 24], k[ 25], k[ 26], k[ 27]);
+  RND28(w[ 28], w[ 29], w[ 30], w[ 31], k[ 28], k[ 29], k[ 30], k[ 31]);
+  RND27(w[ 32], w[ 33], w[ 34], w[ 35], k[ 32], k[ 33], k[ 34], k[ 35]);
+  RND26(w[ 36], w[ 37], w[ 38], w[ 39], k[ 36], k[ 37], k[ 38], k[ 39]);
+  RND25(w[ 40], w[ 41], w[ 42], w[ 43], k[ 40], k[ 41], k[ 42], k[ 43]);
+  RND24(w[ 44], w[ 45], w[ 46], w[ 47], k[ 44], k[ 45], k[ 46], k[ 47]);
+  RND23(w[ 48], w[ 49], w[ 50], w[ 51], k[ 48], k[ 49], k[ 50], k[ 51]);
+  RND22(w[ 52], w[ 53], w[ 54], w[ 55], k[ 52], k[ 53], k[ 54], k[ 55]);
+  RND21(w[ 56], w[ 57], w[ 58], w[ 59], k[ 56], k[ 57], k[ 58], k[ 59]);
+  RND20(w[ 60], w[ 61], w[ 62], w[ 63], k[ 60], k[ 61], k[ 62], k[ 63]);
+  RND19(w[ 64], w[ 65], w[ 66], w[ 67], k[ 64], k[ 65], k[ 66], k[ 67]);
+  RND18(w[ 68], w[ 69], w[ 70], w[ 71], k[ 68], k[ 69], k[ 70], k[ 71]);
+  RND17(w[ 72], w[ 73], w[ 74], w[ 75], k[ 72], k[ 73], k[ 74], k[ 75]);
+  RND16(w[ 76], w[ 77], w[ 78], w[ 79], k[ 76], k[ 77], k[ 78], k[ 79]);
+  RND15(w[ 80], w[ 81], w[ 82], w[ 83], k[ 80], k[ 81], k[ 82], k[ 83]);
+  RND14(w[ 84], w[ 85], w[ 86], w[ 87], k[ 84], k[ 85], k[ 86], k[ 87]);
+  RND13(w[ 88], w[ 89], w[ 90], w[ 91], k[ 88], k[ 89], k[ 90], k[ 91]);
+  RND12(w[ 92], w[ 93], w[ 94], w[ 95], k[ 92], k[ 93], k[ 94], k[ 95]);
+  RND11(w[ 96], w[ 97], w[ 98], w[ 99], k[ 96], k[ 97], k[ 98], k[ 99]);
+  RND10(w[100], w[101], w[102], w[103], k[100], k[101], k[102], k[103]);
+  RND09(w[104], w[105], w[106], w[107], k[104], k[105], k[106], k[107]);
+  RND08(w[108], w[109], w[110], w[111], k[108], k[109], k[110], k[111]);
+  RND07(w[112], w[113], w[114], w[115], k[112], k[113], k[114], k[115]);
+  RND06(w[116], w[117], w[118], w[119], k[116], k[117], k[118], k[119]);
+  RND05(w[120], w[121], w[122], w[123], k[120], k[121], k[122], k[123]);
+  RND04(w[124], w[125], w[126], w[127], k[124], k[125], k[126], k[127]);
+  RND03(w[128], w[129], w[130], w[131], k[128], k[129], k[130], k[131]);
+
+  for(i=0; i<=32; i++) {
+    for(j=0; j<4; j++)
+      ctx->keys[i][j] = k[4*i+j];
+  }
+}
+
+void
+serpent_encrypt(SERPENT_context *ctx,
+		const UINT8 *plaintext,
+		UINT8 *ciphertext)
+{
+  register UINT32 x0, x1, x2, x3;
+  register UINT32 y0, y1, y2, y3;
+  int i;
+  UINT8 *cptr;
+
+  x0=plaintext[0]|(plaintext[1]<<8)|(plaintext[2]<<16)|(plaintext[3]<<24);
+  x1=plaintext[4]|(plaintext[5]<<8)|(plaintext[6]<<16)|(plaintext[7]<<24);
+  x2=plaintext[8]|(plaintext[9]<<8)|(plaintext[10]<<16)|(plaintext[11]<<24);
+  x3=plaintext[12]|(plaintext[13]<<8)|(plaintext[14]<<16)|(plaintext[15]<<24);
+
+  /* Start to encrypt the plaintext x */
+  keying(x0, x1, x2, x3, ctx->keys[ 0]);
+  RND00(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[ 1]);
+  RND01(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[ 2]);
+  RND02(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[ 3]);
+  RND03(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[ 4]);
+  RND04(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[ 5]);
+  RND05(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[ 6]);
+  RND06(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[ 7]);
+  RND07(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[ 8]);
+  RND08(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[ 9]);
+  RND09(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[10]);
+  RND10(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[11]);
+  RND11(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[12]);
+  RND12(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[13]);
+  RND13(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[14]);
+  RND14(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[15]);
+  RND15(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[16]);
+  RND16(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[17]);
+  RND17(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[18]);
+  RND18(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[19]);
+  RND19(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[20]);
+  RND20(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[21]);
+  RND21(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[22]);
+  RND22(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[23]);
+  RND23(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[24]);
+  RND24(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[25]);
+  RND25(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[26]);
+  RND26(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[27]);
+  RND27(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[28]);
+  RND28(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[29]);
+  RND29(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[30]);
+  RND30(x0, x1, x2, x3, y0, y1, y2, y3);
+  transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  keying(x0, x1, x2, x3, ctx->keys[31]);
+  RND31(x0, x1, x2, x3, y0, y1, y2, y3);
+  x0 = y0; x1 = y1; x2 = y2; x3 = y3;
+  keying(x0, x1, x2, x3, ctx->keys[32]);
+  /* The ciphertext is now in x */
+
+  cptr = ciphertext;
+
+  for (i=0; i<4; i++)
+    *cptr++ = (x0 >> i*8) & 0xff;
+  for (i=0; i<4; i++)
+    *cptr++ = (x1 >> i*8) & 0xff;
+  for (i=0; i<4; i++)
+    *cptr++ = (x2 >> i*8) & 0xff;
+  for (i=0; i<4; i++)
+    *cptr++ = (x3 >> i*8) & 0xff;
+}
+
+void
+serpent_decrypt(SERPENT_context *ctx,
+		const UINT8 *ciphertext,
+		UINT8 *plaintext)
+{
+  register UINT32 x0, x1, x2, x3;
+  register UINT32 y0, y1, y2, y3;
+  int i;
+  UINT8 *pptr;
+
+  x0=ciphertext[0]|(ciphertext[1]<<8)|(ciphertext[2]<<16)|(ciphertext[3]<<24);
+  x1=ciphertext[4]|(ciphertext[5]<<8)|(ciphertext[6]<<16)|(ciphertext[7]<<24);
+  x2=ciphertext[8]|(ciphertext[9]<<8)|(ciphertext[10]<<16)|(ciphertext[11]<<24);
+  x3=ciphertext[12]|(ciphertext[13]<<8)|(ciphertext[14]<<16)|(ciphertext[15]<<24);
+
+  /* Start to decrypt the ciphertext x */
+  keying(x0, x1, x2, x3, ctx->keys[32]);
+  InvRND31(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[31]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND30(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[30]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND29(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[29]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND28(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[28]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND27(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[27]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND26(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[26]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND25(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[25]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND24(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[24]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND23(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[23]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND22(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[22]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND21(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[21]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND20(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[20]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND19(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[19]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND18(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[18]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND17(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[17]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND16(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[16]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND15(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[15]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND14(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[14]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND13(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[13]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND12(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[12]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND11(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[11]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND10(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[10]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND09(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[ 9]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND08(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[ 8]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND07(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[ 7]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND06(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[ 6]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND05(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[ 5]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND04(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[ 4]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND03(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[ 3]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND02(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[ 2]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND01(x0, x1, x2, x3, y0, y1, y2, y3);
+  keying(y0, y1, y2, y3, ctx->keys[ 1]);
+  inv_transform(y0, y1, y2, y3, x0, x1, x2, x3);
+  InvRND00(x0, x1, x2, x3, y0, y1, y2, y3);
+  x0 = y0; x1 = y1; x2 = y2; x3 = y3;
+  keying(x0, x1, x2, x3, ctx->keys[ 0]);
+  /* The plaintext is now in x */
+
+  pptr = plaintext;
+
+  for (i=0; i<4; i++)
+    *pptr++ = (x0 >> i*8) & 0xff;
+  for (i=0; i<4; i++)
+    *pptr++ = (x1 >> i*8) & 0xff;
+  for (i=0; i<4; i++)
+    *pptr++ = (x2 >> i*8) & 0xff;
+  for (i=0; i<4; i++)
+    *pptr++ = (x3 >> i*8) & 0xff;
+}
diff --git a/serpentsboxes.h b/serpentsboxes.h
new file mode 100644
index 0000000000000000000000000000000000000000..ea3222521cf8f982ef7cff58989e020a5613612e
--- /dev/null
+++ b/serpentsboxes.h
@@ -0,0 +1,520 @@
+/* Copyright (C) 1998 Ross Anderson, Eli Biham, Lars Knudsen
+ * All rights reserved.
+ *
+ * This code is freely distributed for AES selection process.
+ * No other use is allowed.
+ * 
+ * Copyright remains of the copyright holders, and as such any Copyright
+ * notices in the code are not to be removed.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only for the AES selection process, provided
+ * that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the 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.
+ * 
+ * THIS SOFTWARE IS PROVIDED ``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.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed without the authors permission.
+ *  i.e. this code cannot simply be copied and put under another distribution
+ * licence [including the GNU Public Licence.]
+ *
+ * Contrary to these statements, all Serpent code available from the authors
+ * (including this file) is now covered under LGPL, according to the Serpent
+ * website.  For more details  on this algorithm, see the Serpent website at
+ * http://www.cl.cam.ac.uk/~rja14/serpent.html
+ *
+ * I've modified this code a bit so that it interoperates with lsh properly.
+ * 2000-9-5, Rafael R. Sevilla <dido@pacific.net.ph>
+ */
+
+#if !defined(SERPENTSBOXES_H)
+#define SERPENTSBOXES_H
+
+/* S0:   3  8 15  1 10  6  5 11 14 13  4  2  7  0  9 12 */
+
+/* depth = 5,7,4,2, Total gates=18 */
+#define RND00(a,b,c,d,w,x,y,z) \
+	{ register unsigned long t02, t03, t05, t06, t07, t08, t09, t11, t12, t13, t14, t15, t17, t01;\
+	t01 = b   ^ c  ; \
+	t02 = a   | d  ; \
+	t03 = a   ^ b  ; \
+	z   = t02 ^ t01; \
+	t05 = c   | z  ; \
+	t06 = a   ^ d  ; \
+	t07 = b   | c  ; \
+	t08 = d   & t05; \
+	t09 = t03 & t07; \
+	y   = t09 ^ t08; \
+	t11 = t09 & y  ; \
+	t12 = c   ^ d  ; \
+	t13 = t07 ^ t11; \
+	t14 = b   & t06; \
+	t15 = t06 ^ t13; \
+	w   =     ~ t15; \
+	t17 = w   ^ t14; \
+	x   = t12 ^ t17; }
+
+/* InvS0:  13  3 11  0 10  6  5 12  1 14  4  7 15  9  8  2 */
+
+/* depth = 8,4,3,6, Total gates=19 */
+#define InvRND00(a,b,c,d,w,x,y,z) \
+	{ register unsigned long t02, t03, t04, t05, t06, t08, t09, t10, t12, t13, t14, t15, t17, t18, t01;\
+	t01 = c   ^ d  ; \
+	t02 = a   | b  ; \
+	t03 = b   | c  ; \
+	t04 = c   & t01; \
+	t05 = t02 ^ t01; \
+	t06 = a   | t04; \
+	y   =     ~ t05; \
+	t08 = b   ^ d  ; \
+	t09 = t03 & t08; \
+	t10 = d   | y  ; \
+	x   = t09 ^ t06; \
+	t12 = a   | t05; \
+	t13 = x   ^ t12; \
+	t14 = t03 ^ t10; \
+	t15 = a   ^ c  ; \
+	z   = t14 ^ t13; \
+	t17 = t05 & t13; \
+	t18 = t14 | t17; \
+	w   = t15 ^ t18; }
+
+/* S1:  15 12  2  7  9  0  5 10  1 11 14  8  6 13  3  4 */
+
+/* depth = 10,7,3,5, Total gates=18 */
+#define RND01(a,b,c,d,w,x,y,z) \
+	{ register unsigned long t02, t03, t04, t05, t06, t07, t08, t10, t11, t12, t13, t16, t17, t01;\
+	t01 = a   | d  ; \
+	t02 = c   ^ d  ; \
+	t03 =     ~ b  ; \
+	t04 = a   ^ c  ; \
+	t05 = a   | t03; \
+	t06 = d   & t04; \
+	t07 = t01 & t02; \
+	t08 = b   | t06; \
+	y   = t02 ^ t05; \
+	t10 = t07 ^ t08; \
+	t11 = t01 ^ t10; \
+	t12 = y   ^ t11; \
+	t13 = b   & d  ; \
+	z   =     ~ t10; \
+	x   = t13 ^ t12; \
+	t16 = t10 | x  ; \
+	t17 = t05 & t16; \
+	w   = c   ^ t17; }
+
+/* InvS1:   5  8  2 14 15  6 12  3 11  4  7  9  1 13 10  0 */
+
+/* depth = 7,4,5,3, Total gates=18 */
+#define InvRND01(a,b,c,d,w,x,y,z) \
+	{ register unsigned long t02, t03, t04, t05, t06, t07, t08, t09, t10, t11, t14, t15, t17, t01;\
+	t01 = a   ^ b  ; \
+	t02 = b   | d  ; \
+	t03 = a   & c  ; \
+	t04 = c   ^ t02; \
+	t05 = a   | t04; \
+	t06 = t01 & t05; \
+	t07 = d   | t03; \
+	t08 = b   ^ t06; \
+	t09 = t07 ^ t06; \
+	t10 = t04 | t03; \
+	t11 = d   & t08; \
+	y   =     ~ t09; \
+	x   = t10 ^ t11; \
+	t14 = a   | y  ; \
+	t15 = t06 ^ x  ; \
+	z   = t01 ^ t04; \
+	t17 = c   ^ t15; \
+	w   = t14 ^ t17; }
+
+/* S2:   8  6  7  9  3 12 10 15 13  1 14  4  0 11  5  2 */
+
+/* depth = 3,8,11,7, Total gates=16 */
+#define RND02(a,b,c,d,w,x,y,z) \
+	{ register unsigned long t02, t03, t05, t06, t07, t08, t09, t10, t12, t13, t14, t01;\
+	t01 = a   | c  ; \
+	t02 = a   ^ b  ; \
+	t03 = d   ^ t01; \
+	w   = t02 ^ t03; \
+	t05 = c   ^ w  ; \
+	t06 = b   ^ t05; \
+	t07 = b   | t05; \
+	t08 = t01 & t06; \
+	t09 = t03 ^ t07; \
+	t10 = t02 | t09; \
+	x   = t10 ^ t08; \
+	t12 = a   | d  ; \
+	t13 = t09 ^ x  ; \
+	t14 = b   ^ t13; \
+	z   =     ~ t09; \
+	y   = t12 ^ t14; }
+
+/* InvS2:  12  9 15  4 11 14  1  2  0  3  6 13  5  8 10  7 */
+
+/* depth = 3,6,8,3, Total gates=18 */
+#define InvRND02(a,b,c,d,w,x,y,z) \
+	{ register unsigned long t02, t03, t04, t06, t07, t08, t09, t10, t11, t12, t15, t16, t17, t01;\
+	t01 = a   ^ d  ; \
+	t02 = c   ^ d  ; \
+	t03 = a   & c  ; \
+	t04 = b   | t02; \
+	w   = t01 ^ t04; \
+	t06 = a   | c  ; \
+	t07 = d   | w  ; \
+	t08 =     ~ d  ; \
+	t09 = b   & t06; \
+	t10 = t08 | t03; \
+	t11 = b   & t07; \
+	t12 = t06 & t02; \
+	z   = t09 ^ t10; \
+	x   = t12 ^ t11; \
+	t15 = c   & z  ; \
+	t16 = w   ^ x  ; \
+	t17 = t10 ^ t15; \
+	y   = t16 ^ t17; }
+
+/* S3:   0 15 11  8 12  9  6  3 13  1  2  4 10  7  5 14 */
+
+/* depth = 8,3,5,5, Total gates=18 */
+#define RND03(a,b,c,d,w,x,y,z) \
+	{ register unsigned long t02, t03, t04, t05, t06, t07, t08, t09, t10, t11, t13, t14, t15, t01;\
+	t01 = a   ^ c  ; \
+	t02 = a   | d  ; \
+	t03 = a   & d  ; \
+	t04 = t01 & t02; \
+	t05 = b   | t03; \
+	t06 = a   & b  ; \
+	t07 = d   ^ t04; \
+	t08 = c   | t06; \
+	t09 = b   ^ t07; \
+	t10 = d   & t05; \
+	t11 = t02 ^ t10; \
+	z   = t08 ^ t09; \
+	t13 = d   | z  ; \
+	t14 = a   | t07; \
+	t15 = b   & t13; \
+	y   = t08 ^ t11; \
+	w   = t14 ^ t15; \
+	x   = t05 ^ t04; }
+
+/* InvS3:   0  9 10  7 11 14  6 13  3  5 12  2  4  8 15  1 */
+
+/* depth = 3,6,4,4, Total gates=17 */
+#define InvRND03(a,b,c,d,w,x,y,z) \
+	{ register unsigned long t02, t03, t04, t05, t06, t07, t09, t11, t12, t13, t14, t16, t01;\
+	t01 = c   | d  ; \
+	t02 = a   | d  ; \
+	t03 = c   ^ t02; \
+	t04 = b   ^ t02; \
+	t05 = a   ^ d  ; \
+	t06 = t04 & t03; \
+	t07 = b   & t01; \
+	y   = t05 ^ t06; \
+	t09 = a   ^ t03; \
+	w   = t07 ^ t03; \
+	t11 = w   | t05; \
+	t12 = t09 & t11; \
+	t13 = a   & y  ; \
+	t14 = t01 ^ t05; \
+	x   = b   ^ t12; \
+	t16 = b   | t13; \
+	z   = t14 ^ t16; }
+
+/* S4:   1 15  8  3 12  0 11  6  2  5  4 10  9 14  7 13 */
+
+/* depth = 6,7,5,3, Total gates=19 */
+#define RND04(a,b,c,d,w,x,y,z) \
+	{ register unsigned long t02, t03, t04, t05, t06, t08, t09, t10, t11, t12, t13, t14, t15, t16, t01;\
+	t01 = a   | b  ; \
+	t02 = b   | c  ; \
+	t03 = a   ^ t02; \
+	t04 = b   ^ d  ; \
+	t05 = d   | t03; \
+	t06 = d   & t01; \
+	z   = t03 ^ t06; \
+	t08 = z   & t04; \
+	t09 = t04 & t05; \
+	t10 = c   ^ t06; \
+	t11 = b   & c  ; \
+	t12 = t04 ^ t08; \
+	t13 = t11 | t03; \
+	t14 = t10 ^ t09; \
+	t15 = a   & t05; \
+	t16 = t11 | t12; \
+	y   = t13 ^ t08; \
+	x   = t15 ^ t16; \
+	w   =     ~ t14; }
+
+/* InvS4:   5  0  8  3 10  9  7 14  2 12 11  6  4 15 13  1 */
+
+/* depth = 6,4,7,3, Total gates=17 */
+#define InvRND04(a,b,c,d,w,x,y,z) \
+	{ register unsigned long t02, t03, t04, t05, t06, t07, t09, t10, t11, t12, t13, t15, t01;\
+	t01 = b   | d  ; \
+	t02 = c   | d  ; \
+	t03 = a   & t01; \
+	t04 = b   ^ t02; \
+	t05 = c   ^ d  ; \
+	t06 =     ~ t03; \
+	t07 = a   & t04; \
+	x   = t05 ^ t07; \
+	t09 = x   | t06; \
+	t10 = a   ^ t07; \
+	t11 = t01 ^ t09; \
+	t12 = d   ^ t04; \
+	t13 = c   | t10; \
+	z   = t03 ^ t12; \
+	t15 = a   ^ t04; \
+	y   = t11 ^ t13; \
+	w   = t15 ^ t09; }
+
+/* S5:  15  5  2 11  4 10  9 12  0  3 14  8 13  6  7  1 */
+
+/* depth = 4,6,8,6, Total gates=17 */
+#define RND05(a,b,c,d,w,x,y,z) \
+	{ register unsigned long t02, t03, t04, t05, t07, t08, t09, t10, t11, t12, t13, t14, t01;\
+	t01 = b   ^ d  ; \
+	t02 = b   | d  ; \
+	t03 = a   & t01; \
+	t04 = c   ^ t02; \
+	t05 = t03 ^ t04; \
+	w   =     ~ t05; \
+	t07 = a   ^ t01; \
+	t08 = d   | w  ; \
+	t09 = b   | t05; \
+	t10 = d   ^ t08; \
+	t11 = b   | t07; \
+	t12 = t03 | w  ; \
+	t13 = t07 | t10; \
+	t14 = t01 ^ t11; \
+	y   = t09 ^ t13; \
+	x   = t07 ^ t08; \
+	z   = t12 ^ t14; }
+
+/* InvS5:   8 15  2  9  4  1 13 14 11  6  5  3  7 12 10  0 */
+
+/* depth = 4,6,9,7, Total gates=17 */
+#define InvRND05(a,b,c,d,w,x,y,z) \
+	{ register unsigned long t02, t03, t04, t05, t07, t08, t09, t10, t12, t13, t15, t16, t01;\
+	t01 = a   & d  ; \
+	t02 = c   ^ t01; \
+	t03 = a   ^ d  ; \
+	t04 = b   & t02; \
+	t05 = a   & c  ; \
+	w   = t03 ^ t04; \
+	t07 = a   & w  ; \
+	t08 = t01 ^ w  ; \
+	t09 = b   | t05; \
+	t10 =     ~ b  ; \
+	x   = t08 ^ t09; \
+	t12 = t10 | t07; \
+	t13 = w   | x  ; \
+	z   = t02 ^ t12; \
+	t15 = t02 ^ t13; \
+	t16 = b   ^ d  ; \
+	y   = t16 ^ t15; }
+
+/* S6:   7  2 12  5  8  4  6 11 14  9  1 15 13  3 10  0 */
+
+/* depth = 8,3,6,3, Total gates=19 */
+#define RND06(a,b,c,d,w,x,y,z) \
+	{ register unsigned long t02, t03, t04, t05, t07, t08, t09, t10, t11, t12, t13, t15, t17, t18, t01;\
+	t01 = a   & d  ; \
+	t02 = b   ^ c  ; \
+	t03 = a   ^ d  ; \
+	t04 = t01 ^ t02; \
+	t05 = b   | c  ; \
+	x   =     ~ t04; \
+	t07 = t03 & t05; \
+	t08 = b   & x  ; \
+	t09 = a   | c  ; \
+	t10 = t07 ^ t08; \
+	t11 = b   | d  ; \
+	t12 = c   ^ t11; \
+	t13 = t09 ^ t10; \
+	y   =     ~ t13; \
+	t15 = x   & t03; \
+	z   = t12 ^ t07; \
+	t17 = a   ^ b  ; \
+	t18 = y   ^ t15; \
+	w   = t17 ^ t18; }
+
+/* InvS6:  15 10  1 13  5  3  6  0  4  9 14  7  2 12  8 11 */
+
+/* depth = 5,3,8,6, Total gates=19 */
+#define InvRND06(a,b,c,d,w,x,y,z) \
+	{ register unsigned long t02, t03, t04, t05, t06, t07, t08, t09, t12, t13, t14, t15, t16, t17, t01;\
+	t01 = a   ^ c  ; \
+	t02 =     ~ c  ; \
+	t03 = b   & t01; \
+	t04 = b   | t02; \
+	t05 = d   | t03; \
+	t06 = b   ^ d  ; \
+	t07 = a   & t04; \
+	t08 = a   | t02; \
+	t09 = t07 ^ t05; \
+	x   = t06 ^ t08; \
+	w   =     ~ t09; \
+	t12 = b   & w  ; \
+	t13 = t01 & t05; \
+	t14 = t01 ^ t12; \
+	t15 = t07 ^ t13; \
+	t16 = d   | t02; \
+	t17 = a   ^ x  ; \
+	z   = t17 ^ t15; \
+	y   = t16 ^ t14; }
+
+/* S7:   1 13 15  0 14  8  2 11  7  4 12 10  9  3  5  6 */
+
+/* depth = 10,7,10,4, Total gates=19 */
+#define RND07(a,b,c,d,w,x,y,z) \
+	{ register unsigned long t02, t03, t04, t05, t06, t08, t09, t10, t11, t13, t14, t15, t16, t17, t01;\
+	t01 = a   & c  ; \
+	t02 =     ~ d  ; \
+	t03 = a   & t02; \
+	t04 = b   | t01; \
+	t05 = a   & b  ; \
+	t06 = c   ^ t04; \
+	z   = t03 ^ t06; \
+	t08 = c   | z  ; \
+	t09 = d   | t05; \
+	t10 = a   ^ t08; \
+	t11 = t04 & z  ; \
+	x   = t09 ^ t10; \
+	t13 = b   ^ x  ; \
+	t14 = t01 ^ x  ; \
+	t15 = c   ^ t05; \
+	t16 = t11 | t13; \
+	t17 = t02 | t14; \
+	w   = t15 ^ t17; \
+	y   = a   ^ t16; }
+
+/* InvS7:   3  0  6 13  9 14 15  8  5 12 11  7 10  1  4  2 */
+
+/* depth = 9,7,3,3, Total gates=18 */
+#define InvRND07(a,b,c,d,w,x,y,z) \
+	{ register unsigned long t02, t03, t04, t06, t07, t08, t09, t10, t11, t13, t14, t15, t16, t01;\
+	t01 = a   & b  ; \
+	t02 = a   | b  ; \
+	t03 = c   | t01; \
+	t04 = d   & t02; \
+	z   = t03 ^ t04; \
+	t06 = b   ^ t04; \
+	t07 = d   ^ z  ; \
+	t08 =     ~ t07; \
+	t09 = t06 | t08; \
+	t10 = b   ^ d  ; \
+	t11 = a   | d  ; \
+	x   = a   ^ t09; \
+	t13 = c   ^ t06; \
+	t14 = c   & t11; \
+	t15 = d   | x  ; \
+	t16 = t01 | t10; \
+	w   = t13 ^ t15; \
+	y   = t14 ^ t16; }
+
+#define RND08(a,b,c,d,e,f,g,h) RND00(a,b,c,d,e,f,g,h)
+#define RND09(a,b,c,d,e,f,g,h) RND01(a,b,c,d,e,f,g,h)
+#define RND10(a,b,c,d,e,f,g,h) RND02(a,b,c,d,e,f,g,h)
+#define RND11(a,b,c,d,e,f,g,h) RND03(a,b,c,d,e,f,g,h)
+#define RND12(a,b,c,d,e,f,g,h) RND04(a,b,c,d,e,f,g,h)
+#define RND13(a,b,c,d,e,f,g,h) RND05(a,b,c,d,e,f,g,h)
+#define RND14(a,b,c,d,e,f,g,h) RND06(a,b,c,d,e,f,g,h)
+#define RND15(a,b,c,d,e,f,g,h) RND07(a,b,c,d,e,f,g,h)
+#define RND16(a,b,c,d,e,f,g,h) RND00(a,b,c,d,e,f,g,h)
+#define RND17(a,b,c,d,e,f,g,h) RND01(a,b,c,d,e,f,g,h)
+#define RND18(a,b,c,d,e,f,g,h) RND02(a,b,c,d,e,f,g,h)
+#define RND19(a,b,c,d,e,f,g,h) RND03(a,b,c,d,e,f,g,h)
+#define RND20(a,b,c,d,e,f,g,h) RND04(a,b,c,d,e,f,g,h)
+#define RND21(a,b,c,d,e,f,g,h) RND05(a,b,c,d,e,f,g,h)
+#define RND22(a,b,c,d,e,f,g,h) RND06(a,b,c,d,e,f,g,h)
+#define RND23(a,b,c,d,e,f,g,h) RND07(a,b,c,d,e,f,g,h)
+#define RND24(a,b,c,d,e,f,g,h) RND00(a,b,c,d,e,f,g,h)
+#define RND25(a,b,c,d,e,f,g,h) RND01(a,b,c,d,e,f,g,h)
+#define RND26(a,b,c,d,e,f,g,h) RND02(a,b,c,d,e,f,g,h)
+#define RND27(a,b,c,d,e,f,g,h) RND03(a,b,c,d,e,f,g,h)
+#define RND28(a,b,c,d,e,f,g,h) RND04(a,b,c,d,e,f,g,h)
+#define RND29(a,b,c,d,e,f,g,h) RND05(a,b,c,d,e,f,g,h)
+#define RND30(a,b,c,d,e,f,g,h) RND06(a,b,c,d,e,f,g,h)
+#define RND31(a,b,c,d,e,f,g,h) RND07(a,b,c,d,e,f,g,h)
+
+#define InvRND08(a,b,c,d,e,f,g,h) InvRND00(a,b,c,d,e,f,g,h)
+#define InvRND09(a,b,c,d,e,f,g,h) InvRND01(a,b,c,d,e,f,g,h)
+#define InvRND10(a,b,c,d,e,f,g,h) InvRND02(a,b,c,d,e,f,g,h)
+#define InvRND11(a,b,c,d,e,f,g,h) InvRND03(a,b,c,d,e,f,g,h)
+#define InvRND12(a,b,c,d,e,f,g,h) InvRND04(a,b,c,d,e,f,g,h)
+#define InvRND13(a,b,c,d,e,f,g,h) InvRND05(a,b,c,d,e,f,g,h)
+#define InvRND14(a,b,c,d,e,f,g,h) InvRND06(a,b,c,d,e,f,g,h)
+#define InvRND15(a,b,c,d,e,f,g,h) InvRND07(a,b,c,d,e,f,g,h)
+#define InvRND16(a,b,c,d,e,f,g,h) InvRND00(a,b,c,d,e,f,g,h)
+#define InvRND17(a,b,c,d,e,f,g,h) InvRND01(a,b,c,d,e,f,g,h)
+#define InvRND18(a,b,c,d,e,f,g,h) InvRND02(a,b,c,d,e,f,g,h)
+#define InvRND19(a,b,c,d,e,f,g,h) InvRND03(a,b,c,d,e,f,g,h)
+#define InvRND20(a,b,c,d,e,f,g,h) InvRND04(a,b,c,d,e,f,g,h)
+#define InvRND21(a,b,c,d,e,f,g,h) InvRND05(a,b,c,d,e,f,g,h)
+#define InvRND22(a,b,c,d,e,f,g,h) InvRND06(a,b,c,d,e,f,g,h)
+#define InvRND23(a,b,c,d,e,f,g,h) InvRND07(a,b,c,d,e,f,g,h)
+#define InvRND24(a,b,c,d,e,f,g,h) InvRND00(a,b,c,d,e,f,g,h)
+#define InvRND25(a,b,c,d,e,f,g,h) InvRND01(a,b,c,d,e,f,g,h)
+#define InvRND26(a,b,c,d,e,f,g,h) InvRND02(a,b,c,d,e,f,g,h)
+#define InvRND27(a,b,c,d,e,f,g,h) InvRND03(a,b,c,d,e,f,g,h)
+#define InvRND28(a,b,c,d,e,f,g,h) InvRND04(a,b,c,d,e,f,g,h)
+#define InvRND29(a,b,c,d,e,f,g,h) InvRND05(a,b,c,d,e,f,g,h)
+#define InvRND30(a,b,c,d,e,f,g,h) InvRND06(a,b,c,d,e,f,g,h)
+#define InvRND31(a,b,c,d,e,f,g,h) InvRND07(a,b,c,d,e,f,g,h)
+
+/* Linear transformations and key mixing: */
+
+#define ROL(x,n) ((((unsigned long)(x))<<(n))| \
+                  (((unsigned long)(x))>>(32-(n))))
+#define ROR(x,n) ((((unsigned long)(x))<<(32-(n)))| \
+                  (((unsigned long)(x))>>(n)))
+
+#define transform(x0, x1, x2, x3, y0, y1, y2, y3) \
+      y0 = ROL(x0, 13); \
+      y2 = ROL(x2, 3); \
+      y1 = x1 ^ y0 ^ y2; \
+      y3 = x3 ^ y2 ^ ((unsigned long)y0)<<3; \
+      y1 = ROL(y1, 1); \
+      y3 = ROL(y3, 7); \
+      y0 = y0 ^ y1 ^ y3; \
+      y2 = y2 ^ y3 ^ ((unsigned long)y1<<7); \
+      y0 = ROL(y0, 5); \
+      y2 = ROL(y2, 22)
+
+#define inv_transform(x0, x1, x2, x3, y0, y1, y2, y3) \
+      y2 = ROR(x2, 22);\
+      y0 = ROR(x0, 5); \
+      y2 = y2 ^ x3 ^ ((unsigned long)x1<<7); \
+      y0 = y0 ^ x1 ^ x3; \
+      y3 = ROR(x3, 7); \
+      y1 = ROR(x1, 1); \
+      y3 = y3 ^ y2 ^ ((unsigned long)y0)<<3; \
+      y1 = y1 ^ y0 ^ y2; \
+      y2 = ROR(y2, 3); \
+      y0 = ROR(y0, 13)
+
+#define keying(x0, x1, x2, x3, subkey) \
+                         x0^=subkey[0];x1^=subkey[1]; \
+                         x2^=subkey[2];x3^=subkey[3]
+
+/* PHI: Constant used in the key schedule */
+#define PHI 0x9e3779b9L
+
+#endif /* SERPENTSBOXES_H */