added support for 3DES encryption algorithm in IKE
authorMartin Willi <martin@strongswan.org>
Tue, 19 Sep 2006 11:18:35 +0000 (11:18 -0000)
committerMartin Willi <martin@strongswan.org>
Tue, 19 Sep 2006 11:18:35 +0000 (11:18 -0000)
src/charon/config/proposal.c
src/charon/doc/Todo-list.txt
src/libstrongswan/Makefile.am
src/libstrongswan/crypto/crypters/crypter.c
src/libstrongswan/crypto/crypters/crypter.h
src/libstrongswan/crypto/crypters/des_crypter.c [new file with mode: 0644]
src/libstrongswan/crypto/crypters/des_crypter.h [new file with mode: 0644]

index 503b4c1..498a511 100644 (file)
@@ -549,6 +549,7 @@ proposal_t *proposal_create_default(protocol_id_t protocol)
        {
                case PROTO_IKE:
                        add_algorithm(this, ENCRYPTION_ALGORITHM,   ENCR_AES_CBC,    128);
+                       add_algorithm(this, ENCRYPTION_ALGORITHM,   ENCR_3DES,         0);
                        add_algorithm(this, INTEGRITY_ALGORITHM,    AUTH_HMAC_SHA1_96, 0);
                        add_algorithm(this, INTEGRITY_ALGORITHM,    AUTH_HMAC_MD5_96,  0);
                        add_algorithm(this, PSEUDO_RANDOM_FUNCTION, PRF_HMAC_SHA1,     0);
index e5cfd8a..9d9debf 100644 (file)
@@ -60,6 +60,7 @@ Todo-List for charon
 
 + use dpdaction/dpddelay parameters from ipsec.conf
 / add firewall script support
+- do not link unneeded libraries in bins
 - include only a minimum of NATD payloads
 - implement 3DES to load encrypted pem files
 - implement a "event bus" mechanism
index 23ade32..799fb3a 100644 (file)
@@ -16,6 +16,7 @@ crypto/signers/hmac_signer.c crypto/signers/hmac_signer.h \
 crypto/signers/signer.c crypto/signers/signer.h \
 crypto/crypters/crypter.c crypto/crypters/crypter.h \
 crypto/crypters/aes_cbc_crypter.c  crypto/crypters/aes_cbc_crypter.h\
+crypto/crypters/des_crypter.c  crypto/crypters/des_crypter.h\
 crypto/hashers/hasher.h crypto/hashers/hasher.c \
 crypto/hashers/sha1_hasher.c crypto/hashers/sha1_hasher.h \
 crypto/hashers/md5_hasher.c  crypto/hashers/md5_hasher.h \
index 92f50e5..145138d 100644 (file)
@@ -25,6 +25,7 @@
 #include "crypter.h"
 
 #include <crypto/crypters/aes_cbc_crypter.h>
+#include <crypto/crypters/des_crypter.h>
 
 
 /** 
@@ -58,6 +59,11 @@ crypter_t *crypter_create(encryption_algorithm_t encryption_algorithm, size_t ke
                {
                        return (crypter_t*)aes_cbc_crypter_create(key_size);
                }
+               case ENCR_DES:
+               case ENCR_3DES:
+               {
+                       return (crypter_t*)des_crypter_create(encryption_algorithm);
+               }
                default:
                        return NULL;
        }
index 18f5a53..ea14157 100644 (file)
@@ -31,17 +31,19 @@ typedef enum encryption_algorithm_t encryption_algorithm_t;
 /**
  * @brief Encryption algorithm, as in IKEv2 RFC 3.3.2.
  * 
- * Currently only the following algorithms are implemented and therefore supported:
+ * Currently only the following algorithms are implemented:
  * - ENCR_AES_CBC
- * 
- * @todo Implement more enryption algorithms, such as 3DES
+ * - ENCR_DES
+ * - ENCR_3DES
  * 
  * @ingroup crypters
  */
 enum encryption_algorithm_t {
        ENCR_UNDEFINED = 1024,
        ENCR_DES_IV64 = 1,
+       /** Implemented in class des_crypter_t */
        ENCR_DES = 2,
+       /** Implemented in class des_crypter_t */
        ENCR_3DES = 3,
        ENCR_RC5 = 4,
        ENCR_IDEA = 5,
@@ -50,9 +52,7 @@ enum encryption_algorithm_t {
        ENCR_3IDEA = 8,
        ENCR_DES_IV32 = 9,
        ENCR_NULL = 11,
-       /**
-        * Implemented in class aes_cbc_crypter_t.
-        */
+       /** Implemented in class aes_cbc_crypter_t */
        ENCR_AES_CBC = 12,
        ENCR_AES_CTR = 13
 };
@@ -74,9 +74,10 @@ typedef struct crypter_t crypter_t;
  * @ingroup crypters
  */
 struct crypter_t {
+       
        /**
         * @brief Encrypt a chunk of data and allocate space for the encrypted value.
-        * 
+        *
         * @param this                          calling object
         * @param data                          data to encrypt
         * @param iv                            initializing vector
@@ -138,8 +139,10 @@ struct crypter_t {
 /**
  * @brief Generic constructor for crypter_t objects.
  * 
- * Currently only the following algorithms are implemented and therefore supported:
+ * Currently only the following algorithms are implemented:
  * - ENCR_AES_CBC
+ * - ENCR_DES
+ * - ENCR_3DES
  * 
  * The key_size is ignored for algorithms with fixed key size.
  * 
diff --git a/src/libstrongswan/crypto/crypters/des_crypter.c b/src/libstrongswan/crypto/crypters/des_crypter.c
new file mode 100644 (file)
index 0000000..dc5a8ff
--- /dev/null
@@ -0,0 +1,1535 @@
+/**
+ * @file des_crypter.c
+ *
+ * @brief Implementation of des_crypter_t
+ *
+ */
+
+/* Copyright (C) 2006 Martin Willi
+ * Hochschule fuer Technik Rapperswil
+ *
+ * Derived from Plutos DES library by Eric Young.
+ *
+ * Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * 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 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 acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#include "des_crypter.h"
+
+typedef u_char des_cblock[8];
+
+typedef struct des_ks_struct {
+       des_cblock _;
+} des_key_schedule[16];
+
+
+typedef struct private_des_crypter_t private_des_crypter_t;
+
+/**
+ * Private data for des_crypter_t
+ */
+struct private_des_crypter_t {
+       
+       /**
+        * Public part of this class.
+        */
+       des_crypter_t public;
+       
+       /**
+        * Key size, depends on algoritm...
+        */
+       size_t key_size;
+       
+       union {
+               /** key schedule for single des */
+               des_key_schedule ks;
+               /** key schedule for 3des */
+               des_key_schedule ks3[3];
+       };
+};
+
+
+#define DES_ENCRYPT 1
+#define DES_DECRYPT 0
+
+#define DES_LONG u_int32_t
+
+#if defined(WIN32) || defined(WIN16)
+#ifndef MSDOS
+#define MSDOS
+#endif
+#endif
+
+#ifndef DES_DEFAULT_OPTIONS
+/* the following is tweaked from a config script, that is why it is a
+ * protected undef/define */
+#ifndef DES_PTR
+#define DES_PTR
+#endif
+
+/* This helps C compiler generate the correct code for multiple functional
+ * units.  It reduces register dependancies at the expense of 2 more
+ * registers */
+#ifndef DES_RISC1
+#define DES_RISC1
+#endif
+
+#ifndef DES_RISC2
+#undef DES_RISC2
+#endif
+
+#if defined(DES_RISC1) && defined(DES_RISC2)
+YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
+#endif
+
+/* Unroll the inner loop, this sometimes helps, sometimes hinders.
+ * Very mucy CPU dependant */
+#ifndef DES_UNROLL
+#define DES_UNROLL
+#endif
+
+/* These default values were supplied by
+ * Peter Gutman <pgut001@cs.auckland.ac.nz>
+ * They are only used if nothing else has been defined */
+#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
+/* Special defines which change the way the code is built depending on the
+   CPU and OS.  For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
+   even newer MIPS CPU's, but at the moment one size fits all for
+   optimization options.  Older Sparc's work better with only UNROLL, but
+   there's no way to tell at compile time what it is you're running on */
+#if defined( sun )             /* Newer Sparc's */
+#define DES_PTR
+#define DES_RISC1
+#define DES_UNROLL
+#elif defined( __ultrix )      /* Older MIPS */
+#define DES_PTR
+#define DES_RISC2
+#define DES_UNROLL
+#elif defined( __osf1__ )      /* Alpha */
+#define DES_PTR
+#define DES_RISC2
+#elif defined ( _AIX )         /* RS6000 */
+  /* Unknown */
+#elif defined( __hpux )                /* HP-PA */
+  /* Unknown */
+#elif defined( __aux )         /* 68K */
+  /* Unknown */
+#elif defined( __dgux )                /* 88K (but P6 in latest boxes) */
+#define DES_UNROLL
+#elif defined( __sgi )         /* Newer MIPS */
+#define DES_PTR
+#define DES_RISC2
+#define DES_UNROLL
+#elif defined( i386 )          /* x86 boxes, should be gcc */
+#define DES_PTR
+#define DES_RISC1
+#define DES_UNROLL
+#endif /* Systems-specific speed defines */
+#endif
+
+#endif /* DES_DEFAULT_OPTIONS */
+
+#ifdef MSDOS           /* Visual C++ 2.1 (Windows NT/95) */
+#include <stdlib.h>
+#include <errno.h>
+#include <time.h>
+#include <io.h>
+#ifndef RAND
+#define RAND
+#endif
+#undef NOPROTO
+#endif
+
+#if defined(__STDC__) || defined(VMS) || defined(M_XENIX) || defined(MSDOS)
+#ifndef __KERNEL__
+#include <string.h>
+#else
+#include <linux/string.h>
+#endif
+#endif
+
+#ifndef RAND
+#define RAND
+#endif
+
+#ifdef linux
+#undef RAND
+#endif
+
+#ifdef MSDOS
+#define getpid() 2
+#define RAND
+#undef NOPROTO
+#endif
+
+#if defined(NOCONST)
+#define const
+#endif
+
+#ifdef __STDC__
+#undef NOPROTO
+#endif
+
+#ifdef RAND
+#define srandom(s) srand(s)
+#define random rand
+#endif
+
+#define ITERATIONS 16
+#define HALF_ITERATIONS 8
+
+/* used in des_read and des_write */
+#define MAXWRITE       (1024*16)
+#define BSIZE          (MAXWRITE+4)
+
+#define c2l(c,l)       (l =((DES_LONG)(*((c)++)))    , \
+                        l|=((DES_LONG)(*((c)++)))<< 8L, \
+                        l|=((DES_LONG)(*((c)++)))<<16L, \
+                        l|=((DES_LONG)(*((c)++)))<<24L)
+
+/* NOTE - c is not incremented as per c2l */
+#define c2ln(c,l1,l2,n)        { \
+                       c+=n; \
+                       l1=l2=0; \
+                       switch (n) { \
+                       case 8: l2 =((DES_LONG)(*(--(c))))<<24L; \
+                       case 7: l2|=((DES_LONG)(*(--(c))))<<16L; \
+                       case 6: l2|=((DES_LONG)(*(--(c))))<< 8L; \
+                       case 5: l2|=((DES_LONG)(*(--(c))));     \
+                       case 4: l1 =((DES_LONG)(*(--(c))))<<24L; \
+                       case 3: l1|=((DES_LONG)(*(--(c))))<<16L; \
+                       case 2: l1|=((DES_LONG)(*(--(c))))<< 8L; \
+                       case 1: l1|=((DES_LONG)(*(--(c))));     \
+} \
+}
+
+#define l2c(l,c)       (*((c)++)=(unsigned char)(((l)     )&0xff), \
+                        *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
+                        *((c)++)=(unsigned char)(((l)>>16L)&0xff), \
+                        *((c)++)=(unsigned char)(((l)>>24L)&0xff))
+
+/* replacements for htonl and ntohl since I have no idea what to do
+ * when faced with machines with 8 byte longs. */
+#define HDRSIZE 4
+
+#define n2l(c,l)       (l =((DES_LONG)(*((c)++)))<<24L, \
+                        l|=((DES_LONG)(*((c)++)))<<16L, \
+                        l|=((DES_LONG)(*((c)++)))<< 8L, \
+                        l|=((DES_LONG)(*((c)++))))
+
+#define l2n(l,c)       (*((c)++)=(unsigned char)(((l)>>24L)&0xff), \
+                        *((c)++)=(unsigned char)(((l)>>16L)&0xff), \
+                        *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
+                        *((c)++)=(unsigned char)(((l)     )&0xff))
+
+/* NOTE - c is not incremented as per l2c */
+#define l2cn(l1,l2,c,n)        { \
+                       c+=n; \
+                       switch (n) { \
+                       case 8: *(--(c))=(unsigned char)(((l2)>>24L)&0xff); \
+                       case 7: *(--(c))=(unsigned char)(((l2)>>16L)&0xff); \
+                       case 6: *(--(c))=(unsigned char)(((l2)>> 8L)&0xff); \
+                       case 5: *(--(c))=(unsigned char)(((l2)     )&0xff); \
+                       case 4: *(--(c))=(unsigned char)(((l1)>>24L)&0xff); \
+                       case 3: *(--(c))=(unsigned char)(((l1)>>16L)&0xff); \
+                       case 2: *(--(c))=(unsigned char)(((l1)>> 8L)&0xff); \
+                       case 1: *(--(c))=(unsigned char)(((l1)     )&0xff); \
+} \
+}
+
+#if defined(WIN32)
+#define        ROTATE(a,n)     (_lrotr(a,n))
+#else
+#define        ROTATE(a,n)     (((a)>>(n))+((a)<<(32-(n))))
+#endif
+
+/* Don't worry about the LOAD_DATA() stuff, that is used by
+ * fcrypt() to add it's little bit to the front */
+
+#ifdef DES_FCRYPT
+
+#define LOAD_DATA_tmp(R,S,u,t,E0,E1) \
+{ DES_LONG tmp; LOAD_DATA(R,S,u,t,E0,E1,tmp); }
+
+#define LOAD_DATA(R,S,u,t,E0,E1,tmp) \
+       t=R^(R>>16L); \
+       u=t&E0; t&=E1; \
+       tmp=(u<<16); u^=R^s[S  ]; u^=tmp; \
+       tmp=(t<<16); t^=R^s[S+1]; t^=tmp
+#else
+#define LOAD_DATA_tmp(a,b,c,d,e,f) LOAD_DATA(a,b,c,d,e,f,g)
+#define LOAD_DATA(R,S,u,t,E0,E1,tmp) \
+       u=R^s[S  ]; \
+       t=R^s[S+1]
+#endif
+
+/* The changes to this macro may help or hinder, depending on the
+ * compiler and the achitecture.  gcc2 always seems to do well :-).
+ * Inspired by Dana How <how@isl.stanford.edu>
+ * DO NOT use the alternative version on machines with 8 byte longs.
+ * It does not seem to work on the Alpha, even when DES_LONG is 4
+ * bytes, probably an issue of accessing non-word aligned objects :-( */
+#ifdef DES_PTR
+
+/* It recently occured to me that 0^0^0^0^0^0^0 == 0, so there
+ * is no reason to not xor all the sub items together.  This potentially
+ * saves a register since things can be xored directly into L */
+
+#if defined(DES_RISC1) || defined(DES_RISC2)
+#ifdef DES_RISC1
+#define D_ENCRYPT(LL,R,S) { \
+       unsigned int u1,u2,u3; \
+       LOAD_DATA(R,S,u,t,E0,E1,u1); \
+       u2=(int)u>>8L; \
+       u1=(int)u&0xfc; \
+       u2&=0xfc; \
+       t=ROTATE(t,4); \
+       u>>=16L; \
+       LL^= *(DES_LONG *)((unsigned char *)des_SP      +u1); \
+       LL^= *(DES_LONG *)((unsigned char *)des_SP+0x200+u2); \
+       u3=(int)(u>>8L); \
+       u1=(int)u&0xfc; \
+       u3&=0xfc; \
+       LL^= *(DES_LONG *)((unsigned char *)des_SP+0x400+u1); \
+       LL^= *(DES_LONG *)((unsigned char *)des_SP+0x600+u3); \
+       u2=(int)t>>8L; \
+       u1=(int)t&0xfc; \
+       u2&=0xfc; \
+       t>>=16L; \
+       LL^= *(DES_LONG *)((unsigned char *)des_SP+0x100+u1); \
+       LL^= *(DES_LONG *)((unsigned char *)des_SP+0x300+u2); \
+       u3=(int)t>>8L; \
+       u1=(int)t&0xfc; \
+       u3&=0xfc; \
+       LL^= *(DES_LONG *)((unsigned char *)des_SP+0x500+u1); \
+       LL^= *(DES_LONG *)((unsigned char *)des_SP+0x700+u3); }
+#endif
+#ifdef DES_RISC2
+#define D_ENCRYPT(LL,R,S) { \
+       unsigned int u1,u2,s1,s2; \
+       LOAD_DATA(R,S,u,t,E0,E1,u1); \
+       u2=(int)u>>8L; \
+       u1=(int)u&0xfc; \
+       u2&=0xfc; \
+       t=ROTATE(t,4); \
+       LL^= *(DES_LONG *)((unsigned char *)des_SP      +u1); \
+       LL^= *(DES_LONG *)((unsigned char *)des_SP+0x200+u2); \
+       s1=(int)(u>>16L); \
+       s2=(int)(u>>24L); \
+       s1&=0xfc; \
+       s2&=0xfc; \
+       LL^= *(DES_LONG *)((unsigned char *)des_SP+0x400+s1); \
+       LL^= *(DES_LONG *)((unsigned char *)des_SP+0x600+s2); \
+       u2=(int)t>>8L; \
+       u1=(int)t&0xfc; \
+       u2&=0xfc; \
+       LL^= *(DES_LONG *)((unsigned char *)des_SP+0x100+u1); \
+       LL^= *(DES_LONG *)((unsigned char *)des_SP+0x300+u2); \
+       s1=(int)(t>>16L); \
+       s2=(int)(t>>24L); \
+       s1&=0xfc; \
+       s2&=0xfc; \
+       LL^= *(DES_LONG *)((unsigned char *)des_SP+0x500+s1); \
+       LL^= *(DES_LONG *)((unsigned char *)des_SP+0x700+s2); }
+#endif
+#else
+#define D_ENCRYPT(LL,R,S) { \
+       LOAD_DATA_tmp(R,S,u,t,E0,E1); \
+       t=ROTATE(t,4); \
+       LL^= \
+       *(DES_LONG *)((unsigned char *)des_SP      +((u     )&0xfc))^ \
+       *(DES_LONG *)((unsigned char *)des_SP+0x200+((u>> 8L)&0xfc))^ \
+       *(DES_LONG *)((unsigned char *)des_SP+0x400+((u>>16L)&0xfc))^ \
+       *(DES_LONG *)((unsigned char *)des_SP+0x600+((u>>24L)&0xfc))^ \
+       *(DES_LONG *)((unsigned char *)des_SP+0x100+((t     )&0xfc))^ \
+       *(DES_LONG *)((unsigned char *)des_SP+0x300+((t>> 8L)&0xfc))^ \
+       *(DES_LONG *)((unsigned char *)des_SP+0x500+((t>>16L)&0xfc))^ \
+       *(DES_LONG *)((unsigned char *)des_SP+0x700+((t>>24L)&0xfc)); }
+#endif
+
+#else /* original version */
+
+#if defined(DES_RISC1) || defined(DES_RISC2)
+#ifdef DES_RISC1
+#define D_ENCRYPT(LL,R,S) {\
+       unsigned int u1,u2,u3; \
+       LOAD_DATA(R,S,u,t,E0,E1,u1); \
+       u>>=2L; \
+       t=ROTATE(t,6); \
+       u2=(int)u>>8L; \
+       u1=(int)u&0x3f; \
+       u2&=0x3f; \
+       u>>=16L; \
+       LL^=des_SPtrans[0][u1]; \
+       LL^=des_SPtrans[2][u2]; \
+       u3=(int)u>>8L; \
+       u1=(int)u&0x3f; \
+       u3&=0x3f; \
+       LL^=des_SPtrans[4][u1]; \
+       LL^=des_SPtrans[6][u3]; \
+       u2=(int)t>>8L; \
+       u1=(int)t&0x3f; \
+       u2&=0x3f; \
+       t>>=16L; \
+       LL^=des_SPtrans[1][u1]; \
+       LL^=des_SPtrans[3][u2]; \
+       u3=(int)t>>8L; \
+       u1=(int)t&0x3f; \
+       u3&=0x3f; \
+       LL^=des_SPtrans[5][u1]; \
+       LL^=des_SPtrans[7][u3]; }
+#endif
+#ifdef DES_RISC2
+#define D_ENCRYPT(LL,R,S) {\
+       unsigned int u1,u2,s1,s2; \
+       LOAD_DATA(R,S,u,t,E0,E1,u1); \
+       u>>=2L; \
+       t=ROTATE(t,6); \
+       u2=(int)u>>8L; \
+       u1=(int)u&0x3f; \
+       u2&=0x3f; \
+       LL^=des_SPtrans[0][u1]; \
+       LL^=des_SPtrans[2][u2]; \
+       s1=(int)u>>16L; \
+       s2=(int)u>>24L; \
+       s1&=0x3f; \
+       s2&=0x3f; \
+       LL^=des_SPtrans[4][s1]; \
+       LL^=des_SPtrans[6][s2]; \
+       u2=(int)t>>8L; \
+       u1=(int)t&0x3f; \
+       u2&=0x3f; \
+       LL^=des_SPtrans[1][u1]; \
+       LL^=des_SPtrans[3][u2]; \
+       s1=(int)t>>16; \
+       s2=(int)t>>24L; \
+       s1&=0x3f; \
+       s2&=0x3f; \
+       LL^=des_SPtrans[5][s1]; \
+       LL^=des_SPtrans[7][s2]; }
+#endif
+
+#else
+
+#define D_ENCRYPT(LL,R,S) {\
+       LOAD_DATA_tmp(R,S,u,t,E0,E1); \
+       t=ROTATE(t,4); \
+       LL^=\
+               des_SPtrans[0][(u>> 2L)&0x3f]^ \
+               des_SPtrans[2][(u>>10L)&0x3f]^ \
+               des_SPtrans[4][(u>>18L)&0x3f]^ \
+               des_SPtrans[6][(u>>26L)&0x3f]^ \
+               des_SPtrans[1][(t>> 2L)&0x3f]^ \
+               des_SPtrans[3][(t>>10L)&0x3f]^ \
+               des_SPtrans[5][(t>>18L)&0x3f]^ \
+               des_SPtrans[7][(t>>26L)&0x3f]; }
+#endif
+#endif
+
+       /* IP and FP
+        * The problem is more of a geometric problem that random bit fiddling.
+        0  1  2  3  4  5  6  7      62 54 46 38 30 22 14  6
+        8  9 10 11 12 13 14 15      60 52 44 36 28 20 12  4
+       16 17 18 19 20 21 22 23      58 50 42 34 26 18 10  2
+       24 25 26 27 28 29 30 31  to  56 48 40 32 24 16  8  0
+
+       32 33 34 35 36 37 38 39      63 55 47 39 31 23 15  7
+       40 41 42 43 44 45 46 47      61 53 45 37 29 21 13  5
+       48 49 50 51 52 53 54 55      59 51 43 35 27 19 11  3
+       56 57 58 59 60 61 62 63      57 49 41 33 25 17  9  1
+
+       The output has been subject to swaps of the form
+       0 1 -> 3 1 but the odd and even bits have been put into
+       2 3    2 0
+       different words.  The main trick is to remember that
+       t=((l>>size)^r)&(mask);
+       r^=t;
+       l^=(t<<size);
+       can be used to swap and move bits between words.
+
+       So l =  0  1  2  3  r = 16 17 18 19
+               4  5  6  7      20 21 22 23
+               8  9 10 11      24 25 26 27
+              12 13 14 15      28 29 30 31
+       becomes (for size == 2 and mask == 0x3333)
+          t =   2^16  3^17 -- --   l =  0  1 16 17  r =  2  3 18 19
+                6^20  7^21 -- --        4  5 20 21       6  7 22 23
+               10^24 11^25 -- --        8  9 24 25      10 11 24 25
+               14^28 15^29 -- --       12 13 28 29      14 15 28 29
+
+       Thanks for hints from Richard Outerbridge - he told me IP&FP
+       could be done in 15 xor, 10 shifts and 5 ands.
+       When I finally started to think of the problem in 2D
+       I first got ~42 operations without xors.  When I remembered
+       how to use xors :-) I got it to its final state.
+       */
+#define PERM_OP(a,b,t,n,m) ((t)=((((a)>>(n))^(b))&(m)),\
+       (b)^=(t),\
+       (a)^=((t)<<(n)))
+
+#define IP(l,r) \
+{ \
+       register DES_LONG tt; \
+       PERM_OP(r,l,tt, 4,0x0f0f0f0fL); \
+       PERM_OP(l,r,tt,16,0x0000ffffL); \
+       PERM_OP(r,l,tt, 2,0x33333333L); \
+       PERM_OP(l,r,tt, 8,0x00ff00ffL); \
+       PERM_OP(r,l,tt, 1,0x55555555L); \
+}
+
+#define FP(l,r) \
+{ \
+       register DES_LONG tt; \
+       PERM_OP(l,r,tt, 1,0x55555555L); \
+       PERM_OP(r,l,tt, 8,0x00ff00ffL); \
+       PERM_OP(l,r,tt, 2,0x33333333L); \
+       PERM_OP(r,l,tt,16,0x0000ffffL); \
+       PERM_OP(l,r,tt, 4,0x0f0f0f0fL); \
+}
+
+#ifndef NOPROTO
+void fcrypt_body(DES_LONG *out,des_key_schedule ks,
+                                DES_LONG Eswap0, DES_LONG Eswap1);
+#else
+void fcrypt_body();
+#endif
+
+static const DES_LONG des_skb[8][64]={
+       {       /* for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
+               0x00000000L,0x00000010L,0x20000000L,0x20000010L,
+               0x00010000L,0x00010010L,0x20010000L,0x20010010L,
+               0x00000800L,0x00000810L,0x20000800L,0x20000810L,
+               0x00010800L,0x00010810L,0x20010800L,0x20010810L,
+               0x00000020L,0x00000030L,0x20000020L,0x20000030L,
+               0x00010020L,0x00010030L,0x20010020L,0x20010030L,
+               0x00000820L,0x00000830L,0x20000820L,0x20000830L,
+               0x00010820L,0x00010830L,0x20010820L,0x20010830L,
+               0x00080000L,0x00080010L,0x20080000L,0x20080010L,
+               0x00090000L,0x00090010L,0x20090000L,0x20090010L,
+               0x00080800L,0x00080810L,0x20080800L,0x20080810L,
+               0x00090800L,0x00090810L,0x20090800L,0x20090810L,
+               0x00080020L,0x00080030L,0x20080020L,0x20080030L,
+               0x00090020L,0x00090030L,0x20090020L,0x20090030L,
+               0x00080820L,0x00080830L,0x20080820L,0x20080830L,
+               0x00090820L,0x00090830L,0x20090820L,0x20090830L,
+       },
+       {       /* for C bits (numbered as per FIPS 46) 7 8 10 11 12 13 */
+               0x00000000L,0x02000000L,0x00002000L,0x02002000L,
+               0x00200000L,0x02200000L,0x00202000L,0x02202000L,
+               0x00000004L,0x02000004L,0x00002004L,0x02002004L,
+               0x00200004L,0x02200004L,0x00202004L,0x02202004L,
+               0x00000400L,0x02000400L,0x00002400L,0x02002400L,
+               0x00200400L,0x02200400L,0x00202400L,0x02202400L,
+               0x00000404L,0x02000404L,0x00002404L,0x02002404L,
+               0x00200404L,0x02200404L,0x00202404L,0x02202404L,
+               0x10000000L,0x12000000L,0x10002000L,0x12002000L,
+               0x10200000L,0x12200000L,0x10202000L,0x12202000L,
+               0x10000004L,0x12000004L,0x10002004L,0x12002004L,
+               0x10200004L,0x12200004L,0x10202004L,0x12202004L,
+               0x10000400L,0x12000400L,0x10002400L,0x12002400L,
+               0x10200400L,0x12200400L,0x10202400L,0x12202400L,
+               0x10000404L,0x12000404L,0x10002404L,0x12002404L,
+               0x10200404L,0x12200404L,0x10202404L,0x12202404L,
+       },
+       {       /* for C bits (numbered as per FIPS 46) 14 15 16 17 19 20 */
+               0x00000000L,0x00000001L,0x00040000L,0x00040001L,
+               0x01000000L,0x01000001L,0x01040000L,0x01040001L,
+               0x00000002L,0x00000003L,0x00040002L,0x00040003L,
+               0x01000002L,0x01000003L,0x01040002L,0x01040003L,
+               0x00000200L,0x00000201L,0x00040200L,0x00040201L,
+               0x01000200L,0x01000201L,0x01040200L,0x01040201L,
+               0x00000202L,0x00000203L,0x00040202L,0x00040203L,
+               0x01000202L,0x01000203L,0x01040202L,0x01040203L,
+               0x08000000L,0x08000001L,0x08040000L,0x08040001L,
+               0x09000000L,0x09000001L,0x09040000L,0x09040001L,
+               0x08000002L,0x08000003L,0x08040002L,0x08040003L,
+               0x09000002L,0x09000003L,0x09040002L,0x09040003L,
+               0x08000200L,0x08000201L,0x08040200L,0x08040201L,
+               0x09000200L,0x09000201L,0x09040200L,0x09040201L,
+               0x08000202L,0x08000203L,0x08040202L,0x08040203L,
+               0x09000202L,0x09000203L,0x09040202L,0x09040203L,
+       },
+       {       /* for C bits (numbered as per FIPS 46) 21 23 24 26 27 28 */
+               0x00000000L,0x00100000L,0x00000100L,0x00100100L,
+               0x00000008L,0x00100008L,0x00000108L,0x00100108L,
+               0x00001000L,0x00101000L,0x00001100L,0x00101100L,
+               0x00001008L,0x00101008L,0x00001108L,0x00101108L,
+               0x04000000L,0x04100000L,0x04000100L,0x04100100L,
+               0x04000008L,0x04100008L,0x04000108L,0x04100108L,
+               0x04001000L,0x04101000L,0x04001100L,0x04101100L,
+               0x04001008L,0x04101008L,0x04001108L,0x04101108L,
+               0x00020000L,0x00120000L,0x00020100L,0x00120100L,
+               0x00020008L,0x00120008L,0x00020108L,0x00120108L,
+               0x00021000L,0x00121000L,0x00021100L,0x00121100L,
+               0x00021008L,0x00121008L,0x00021108L,0x00121108L,
+               0x04020000L,0x04120000L,0x04020100L,0x04120100L,
+               0x04020008L,0x04120008L,0x04020108L,0x04120108L,
+               0x04021000L,0x04121000L,0x04021100L,0x04121100L,
+               0x04021008L,0x04121008L,0x04021108L,0x04121108L,
+       },
+       {       /* for D bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
+               0x00000000L,0x10000000L,0x00010000L,0x10010000L,
+               0x00000004L,0x10000004L,0x00010004L,0x10010004L,
+               0x20000000L,0x30000000L,0x20010000L,0x30010000L,
+               0x20000004L,0x30000004L,0x20010004L,0x30010004L,
+               0x00100000L,0x10100000L,0x00110000L,0x10110000L,
+               0x00100004L,0x10100004L,0x00110004L,0x10110004L,
+               0x20100000L,0x30100000L,0x20110000L,0x30110000L,
+               0x20100004L,0x30100004L,0x20110004L,0x30110004L,
+               0x00001000L,0x10001000L,0x00011000L,0x10011000L,
+               0x00001004L,0x10001004L,0x00011004L,0x10011004L,
+               0x20001000L,0x30001000L,0x20011000L,0x30011000L,
+               0x20001004L,0x30001004L,0x20011004L,0x30011004L,
+               0x00101000L,0x10101000L,0x00111000L,0x10111000L,
+               0x00101004L,0x10101004L,0x00111004L,0x10111004L,
+               0x20101000L,0x30101000L,0x20111000L,0x30111000L,
+               0x20101004L,0x30101004L,0x20111004L,0x30111004L,
+       },
+       {       /* for D bits (numbered as per FIPS 46) 8 9 11 12 13 14 */
+               0x00000000L,0x08000000L,0x00000008L,0x08000008L,
+               0x00000400L,0x08000400L,0x00000408L,0x08000408L,
+               0x00020000L,0x08020000L,0x00020008L,0x08020008L,
+               0x00020400L,0x08020400L,0x00020408L,0x08020408L,
+               0x00000001L,0x08000001L,0x00000009L,0x08000009L,
+               0x00000401L,0x08000401L,0x00000409L,0x08000409L,
+               0x00020001L,0x08020001L,0x00020009L,0x08020009L,
+               0x00020401L,0x08020401L,0x00020409L,0x08020409L,
+               0x02000000L,0x0A000000L,0x02000008L,0x0A000008L,
+               0x02000400L,0x0A000400L,0x02000408L,0x0A000408L,
+               0x02020000L,0x0A020000L,0x02020008L,0x0A020008L,
+               0x02020400L,0x0A020400L,0x02020408L,0x0A020408L,
+               0x02000001L,0x0A000001L,0x02000009L,0x0A000009L,
+               0x02000401L,0x0A000401L,0x02000409L,0x0A000409L,
+               0x02020001L,0x0A020001L,0x02020009L,0x0A020009L,
+               0x02020401L,0x0A020401L,0x02020409L,0x0A020409L,
+       },
+       {       /* for D bits (numbered as per FIPS 46) 16 17 18 19 20 21 */
+               0x00000000L,0x00000100L,0x00080000L,0x00080100L,
+               0x01000000L,0x01000100L,0x01080000L,0x01080100L,
+               0x00000010L,0x00000110L,0x00080010L,0x00080110L,
+               0x01000010L,0x01000110L,0x01080010L,0x01080110L,
+               0x00200000L,0x00200100L,0x00280000L,0x00280100L,
+               0x01200000L,0x01200100L,0x01280000L,0x01280100L,
+               0x00200010L,0x00200110L,0x00280010L,0x00280110L,
+               0x01200010L,0x01200110L,0x01280010L,0x01280110L,
+               0x00000200L,0x00000300L,0x00080200L,0x00080300L,
+               0x01000200L,0x01000300L,0x01080200L,0x01080300L,
+               0x00000210L,0x00000310L,0x00080210L,0x00080310L,
+               0x01000210L,0x01000310L,0x01080210L,0x01080310L,
+               0x00200200L,0x00200300L,0x00280200L,0x00280300L,
+               0x01200200L,0x01200300L,0x01280200L,0x01280300L,
+               0x00200210L,0x00200310L,0x00280210L,0x00280310L,
+               0x01200210L,0x01200310L,0x01280210L,0x01280310L,
+       },
+       {       /* for D bits (numbered as per FIPS 46) 22 23 24 25 27 28 */
+               0x00000000L,0x04000000L,0x00040000L,0x04040000L,
+               0x00000002L,0x04000002L,0x00040002L,0x04040002L,
+               0x00002000L,0x04002000L,0x00042000L,0x04042000L,
+               0x00002002L,0x04002002L,0x00042002L,0x04042002L,
+               0x00000020L,0x04000020L,0x00040020L,0x04040020L,
+               0x00000022L,0x04000022L,0x00040022L,0x04040022L,
+               0x00002020L,0x04002020L,0x00042020L,0x04042020L,
+               0x00002022L,0x04002022L,0x00042022L,0x04042022L,
+               0x00000800L,0x04000800L,0x00040800L,0x04040800L,
+               0x00000802L,0x04000802L,0x00040802L,0x04040802L,
+               0x00002800L,0x04002800L,0x00042800L,0x04042800L,
+               0x00002802L,0x04002802L,0x00042802L,0x04042802L,
+               0x00000820L,0x04000820L,0x00040820L,0x04040820L,
+               0x00000822L,0x04000822L,0x00040822L,0x04040822L,
+               0x00002820L,0x04002820L,0x00042820L,0x04042820L,
+               0x00002822L,0x04002822L,0x00042822L,0x04042822L,
+       }
+};
+
+const DES_LONG des_SPtrans[8][64]={
+       {
+               /* nibble 0 */
+               0x02080800L, 0x00080000L, 0x02000002L, 0x02080802L,
+               0x02000000L, 0x00080802L, 0x00080002L, 0x02000002L,
+               0x00080802L, 0x02080800L, 0x02080000L, 0x00000802L,
+               0x02000802L, 0x02000000L, 0x00000000L, 0x00080002L,
+               0x00080000L, 0x00000002L, 0x02000800L, 0x00080800L,
+               0x02080802L, 0x02080000L, 0x00000802L, 0x02000800L,
+               0x00000002L, 0x00000800L, 0x00080800L, 0x02080002L,
+               0x00000800L, 0x02000802L, 0x02080002L, 0x00000000L,
+               0x00000000L, 0x02080802L, 0x02000800L, 0x00080002L,
+               0x02080800L, 0x00080000L, 0x00000802L, 0x02000800L,
+               0x02080002L, 0x00000800L, 0x00080800L, 0x02000002L,
+               0x00080802L, 0x00000002L, 0x02000002L, 0x02080000L,
+               0x02080802L, 0x00080800L, 0x02080000L, 0x02000802L,
+               0x02000000L, 0x00000802L, 0x00080002L, 0x00000000L,
+               0x00080000L, 0x02000000L, 0x02000802L, 0x02080800L,
+               0x00000002L, 0x02080002L, 0x00000800L, 0x00080802L,
+       },
+       {       /* nibble 1 */
+               0x40108010L, 0x00000000L, 0x00108000L, 0x40100000L,
+               0x40000010L, 0x00008010L, 0x40008000L, 0x00108000L,
+               0x00008000L, 0x40100010L, 0x00000010L, 0x40008000L,
+               0x00100010L, 0x40108000L, 0x40100000L, 0x00000010L,
+               0x00100000L, 0x40008010L, 0x40100010L, 0x00008000L,
+               0x00108010L, 0x40000000L, 0x00000000L, 0x00100010L,
+               0x40008010L, 0x00108010L, 0x40108000L, 0x40000010L,
+               0x40000000L, 0x00100000L, 0x00008010L, 0x40108010L,
+               0x00100010L, 0x40108000L, 0x40008000L, 0x00108010L,
+               0x40108010L, 0x00100010L, 0x40000010L, 0x00000000L,
+               0x40000000L, 0x00008010L, 0x00100000L, 0x40100010L,
+               0x00008000L, 0x40000000L, 0x00108010L, 0x40008010L,
+               0x40108000L, 0x00008000L, 0x00000000L, 0x40000010L,
+               0x00000010L, 0x40108010L, 0x00108000L, 0x40100000L,
+               0x40100010L, 0x00100000L, 0x00008010L, 0x40008000L,
+               0x40008010L, 0x00000010L, 0x40100000L, 0x00108000L,
+       },
+       {       /* nibble 2 */
+               0x04000001L, 0x04040100L, 0x00000100L, 0x04000101L,
+               0x00040001L, 0x04000000L, 0x04000101L, 0x00040100L,
+               0x04000100L, 0x00040000L, 0x04040000L, 0x00000001L,
+               0x04040101L, 0x00000101L, 0x00000001L, 0x04040001L,
+               0x00000000L, 0x00040001L, 0x04040100L, 0x00000100L,
+               0x00000101L, 0x04040101L, 0x00040000L, 0x04000001L,
+               0x04040001L, 0x04000100L, 0x00040101L, 0x04040000L,
+               0x00040100L, 0x00000000L, 0x04000000L, 0x00040101L,
+               0x04040100L, 0x00000100L, 0x00000001L, 0x00040000L,
+               0x00000101L, 0x00040001L, 0x04040000L, 0x04000101L,
+               0x00000000L, 0x04040100L, 0x00040100L, 0x04040001L,
+               0x00040001L, 0x04000000L, 0x04040101L, 0x00000001L,
+               0x00040101L, 0x04000001L, 0x04000000L, 0x04040101L,
+               0x00040000L, 0x04000100L, 0x04000101L, 0x00040100L,
+               0x04000100L, 0x00000000L, 0x04040001L, 0x00000101L,
+               0x04000001L, 0x00040101L, 0x00000100L, 0x04040000L,
+       },
+       {       /* nibble 3 */
+               0x00401008L, 0x10001000L, 0x00000008L, 0x10401008L,
+               0x00000000L, 0x10400000L, 0x10001008L, 0x00400008L,
+               0x10401000L, 0x10000008L, 0x10000000L, 0x00001008L,
+               0x10000008L, 0x00401008L, 0x00400000L, 0x10000000L,
+               0x10400008L, 0x00401000L, 0x00001000L, 0x00000008L,
+               0x00401000L, 0x10001008L, 0x10400000L, 0x00001000L,
+               0x00001008L, 0x00000000L, 0x00400008L, 0x10401000L,
+               0x10001000L, 0x10400008L, 0x10401008L, 0x00400000L,
+               0x10400008L, 0x00001008L, 0x00400000L, 0x10000008L,
+               0x00401000L, 0x10001000L, 0x00000008L, 0x10400000L,
+               0x10001008L, 0x00000000L, 0x00001000L, 0x00400008L,
+               0x00000000L, 0x10400008L, 0x10401000L, 0x00001000L,
+               0x10000000L, 0x10401008L, 0x00401008L, 0x00400000L,
+               0x10401008L, 0x00000008L, 0x10001000L, 0x00401008L,
+               0x00400008L, 0x00401000L, 0x10400000L, 0x10001008L,
+               0x00001008L, 0x10000000L, 0x10000008L, 0x10401000L,
+       },
+       {       /* nibble 4 */
+               0x08000000L, 0x00010000L, 0x00000400L, 0x08010420L,
+               0x08010020L, 0x08000400L, 0x00010420L, 0x08010000L,
+               0x00010000L, 0x00000020L, 0x08000020L, 0x00010400L,
+               0x08000420L, 0x08010020L, 0x08010400L, 0x00000000L,
+               0x00010400L, 0x08000000L, 0x00010020L, 0x00000420L,
+               0x08000400L, 0x00010420L, 0x00000000L, 0x08000020L,
+               0x00000020L, 0x08000420L, 0x08010420L, 0x00010020L,
+               0x08010000L, 0x00000400L, 0x00000420L, 0x08010400L,
+               0x08010400L, 0x08000420L, 0x00010020L, 0x08010000L,
+               0x00010000L, 0x00000020L, 0x08000020L, 0x08000400L,
+               0x08000000L, 0x00010400L, 0x08010420L, 0x00000000L,
+               0x00010420L, 0x08000000L, 0x00000400L, 0x00010020L,
+               0x08000420L, 0x00000400L, 0x00000000L, 0x08010420L,
+               0x08010020L, 0x08010400L, 0x00000420L, 0x00010000L,
+               0x00010400L, 0x08010020L, 0x08000400L, 0x00000420L,
+               0x00000020L, 0x00010420L, 0x08010000L, 0x08000020L,
+       },
+       {       /* nibble 5 */
+               0x80000040L, 0x00200040L, 0x00000000L, 0x80202000L,
+               0x00200040L, 0x00002000L, 0x80002040L, 0x00200000L,
+               0x00002040L, 0x80202040L, 0x00202000L, 0x80000000L,
+               0x80002000L, 0x80000040L, 0x80200000L, 0x00202040L,
+               0x00200000L, 0x80002040L, 0x80200040L, 0x00000000L,
+               0x00002000L, 0x00000040L, 0x80202000L, 0x80200040L,
+               0x80202040L, 0x80200000L, 0x80000000L, 0x00002040L,
+               0x00000040L, 0x00202000L, 0x00202040L, 0x80002000L,
+               0x00002040L, 0x80000000L, 0x80002000L, 0x00202040L,
+               0x80202000L, 0x00200040L, 0x00000000L, 0x80002000L,
+               0x80000000L, 0x00002000L, 0x80200040L, 0x00200000L,
+               0x00200040L, 0x80202040L, 0x00202000L, 0x00000040L,
+               0x80202040L, 0x00202000L, 0x00200000L, 0x80002040L,
+               0x80000040L, 0x80200000L, 0x00202040L, 0x00000000L,
+               0x00002000L, 0x80000040L, 0x80002040L, 0x80202000L,
+               0x80200000L, 0x00002040L, 0x00000040L, 0x80200040L,
+       },
+       {       /* nibble 6 */
+               0x00004000L, 0x00000200L, 0x01000200L, 0x01000004L,
+               0x01004204L, 0x00004004L, 0x00004200L, 0x00000000L,
+               0x01000000L, 0x01000204L, 0x00000204L, 0x01004000L,
+               0x00000004L, 0x01004200L, 0x01004000L, 0x00000204L,
+               0x01000204L, 0x00004000L, 0x00004004L, 0x01004204L,
+               0x00000000L, 0x01000200L, 0x01000004L, 0x00004200L,
+               0x01004004L, 0x00004204L, 0x01004200L, 0x00000004L,
+               0x00004204L, 0x01004004L, 0x00000200L, 0x01000000L,
+               0x00004204L, 0x01004000L, 0x01004004L, 0x00000204L,
+               0x00004000L, 0x00000200L, 0x01000000L, 0x01004004L,
+               0x01000204L, 0x00004204L, 0x00004200L, 0x00000000L,
+               0x00000200L, 0x01000004L, 0x00000004L, 0x01000200L,
+               0x00000000L, 0x01000204L, 0x01000200L, 0x00004200L,
+               0x00000204L, 0x00004000L, 0x01004204L, 0x01000000L,
+               0x01004200L, 0x00000004L, 0x00004004L, 0x01004204L,
+               0x01000004L, 0x01004200L, 0x01004000L, 0x00004004L,
+       },
+       {       /* nibble 7 */
+               0x20800080L, 0x20820000L, 0x00020080L, 0x00000000L,
+               0x20020000L, 0x00800080L, 0x20800000L, 0x20820080L,
+               0x00000080L, 0x20000000L, 0x00820000L, 0x00020080L,
+               0x00820080L, 0x20020080L, 0x20000080L, 0x20800000L,
+               0x00020000L, 0x00820080L, 0x00800080L, 0x20020000L,
+               0x20820080L, 0x20000080L, 0x00000000L, 0x00820000L,
+               0x20000000L, 0x00800000L, 0x20020080L, 0x20800080L,
+               0x00800000L, 0x00020000L, 0x20820000L, 0x00000080L,
+               0x00800000L, 0x00020000L, 0x20000080L, 0x20820080L,
+               0x00020080L, 0x20000000L, 0x00000000L, 0x00820000L,
+               0x20800080L, 0x20020080L, 0x20020000L, 0x00800080L,
+               0x20820000L, 0x00000080L, 0x00800080L, 0x20020000L,
+               0x20820080L, 0x00800000L, 0x20800000L, 0x20000080L,
+               0x00820000L, 0x00020080L, 0x20020080L, 0x20800000L,
+               0x00000080L, 0x20820000L, 0x00820080L, 0x00000000L,
+               0x20000000L, 0x20800080L, 0x00020000L, 0x00820080L,
+       }
+};
+
+#define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\
+       (a)=(a)^(t)^(t>>(16-(n))))
+
+static const unsigned char odd_parity[256]={
+       1,  1,  2,  2,  4,  4,  7,  7,  8,  8, 11, 11, 13, 13, 14, 14,
+       16, 16, 19, 19, 21, 21, 22, 22, 25, 25, 26, 26, 28, 28, 31, 31,
+       32, 32, 35, 35, 37, 37, 38, 38, 41, 41, 42, 42, 44, 44, 47, 47,
+       49, 49, 50, 50, 52, 52, 55, 55, 56, 56, 59, 59, 61, 61, 62, 62,
+       64, 64, 67, 67, 69, 69, 70, 70, 73, 73, 74, 74, 76, 76, 79, 79,
+       81, 81, 82, 82, 84, 84, 87, 87, 88, 88, 91, 91, 93, 93, 94, 94,
+       97, 97, 98, 98,100,100,103,103,104,104,107,107,109,109,110,110,
+       112,112,115,115,117,117,118,118,121,121,122,122,124,124,127,127,
+       128,128,131,131,133,133,134,134,137,137,138,138,140,140,143,143,
+       145,145,146,146,148,148,151,151,152,152,155,155,157,157,158,158,
+       161,161,162,162,164,164,167,167,168,168,171,171,173,173,174,174,
+       176,176,179,179,181,181,182,182,185,185,186,186,188,188,191,191,
+       193,193,194,194,196,196,199,199,200,200,203,203,205,205,206,206,
+       208,208,211,211,213,213,214,214,217,217,218,218,220,220,223,223,
+       224,224,227,227,229,229,230,230,233,233,234,234,236,236,239,239,
+       241,241,242,242,244,244,247,247,248,248,251,251,253,253,254,254
+};
+
+/**
+ * Create key schedule for a single DES 64Bit key
+ */
+static int des_set_key(des_cblock *key, des_key_schedule *schedule)
+{
+       static int shifts2[16] = {0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0};
+       register DES_LONG c,d,t,s,t2;
+       register unsigned char *in;
+       register DES_LONG *k;
+       register int i;
+
+       for (i = 0; i < sizeof(des_cblock); i++)
+       {
+               (*key)[i] = odd_parity[(*key)[i]];
+       }
+
+       k=(DES_LONG *)schedule;
+       in=(unsigned char *)key;
+
+       c2l(in,c);
+       c2l(in,d);
+
+       /* do PC1 in 60 simple operations */ 
+/*     PERM_OP(d,c,t,4,0x0f0f0f0fL);
+       HPERM_OP(c,t,-2, 0xcccc0000L);
+       HPERM_OP(c,t,-1, 0xaaaa0000L);
+       HPERM_OP(c,t, 8, 0x00ff0000L);
+       HPERM_OP(c,t,-1, 0xaaaa0000L);
+       HPERM_OP(d,t,-8, 0xff000000L);
+       HPERM_OP(d,t, 8, 0x00ff0000L);
+       HPERM_OP(d,t, 2, 0x33330000L);
+       d=((d&0x00aa00aaL)<<7L)|((d&0x55005500L)>>7L)|(d&0xaa55aa55L);
+       d=(d>>8)|((c&0xf0000000L)>>4);
+       c&=0x0fffffffL; */
+
+       /* I now do it in 47 simple operations :-)
+       * Thanks to John Fletcher (john_fletcher@lccmail.ocf.llnl.gov)
+       * for the inspiration. :-) */
+       PERM_OP (d,c,t,4,0x0f0f0f0fL);
+       HPERM_OP(c,t,-2,0xcccc0000L);
+       HPERM_OP(d,t,-2,0xcccc0000L);
+       PERM_OP (d,c,t,1,0x55555555L);
+       PERM_OP (c,d,t,8,0x00ff00ffL);
+       PERM_OP (d,c,t,1,0x55555555L);
+       d=      (((d&0x000000ffL)<<16L)| (d&0x0000ff00L)     |
+                       ((d&0x00ff0000L)>>16L)|((c&0xf0000000L)>>4L));
+       c&=0x0fffffffL;
+
+       for (i=0; i<ITERATIONS; i++)
+       {
+               if (shifts2[i])
+               { c=((c>>2L)|(c<<26L)); d=((d>>2L)|(d<<26L)); }
+               else
+               { c=((c>>1L)|(c<<27L)); d=((d>>1L)|(d<<27L)); }
+               c&=0x0fffffffL;
+               d&=0x0fffffffL;
+               /* could be a few less shifts but I am to lazy at this
+               * point in time to investigate */
+               s=      des_skb[0][ (c    )&0x3f                ]|
+                               des_skb[1][((c>> 6)&0x03)|((c>> 7L)&0x3c)]|
+                               des_skb[2][((c>>13)&0x0f)|((c>>14L)&0x30)]|
+                               des_skb[3][((c>>20)&0x01)|((c>>21L)&0x06) |
+                               ((c>>22L)&0x38)];
+               t=      des_skb[4][ (d    )&0x3f                ]|
+                               des_skb[5][((d>> 7L)&0x03)|((d>> 8L)&0x3c)]|
+                               des_skb[6][ (d>>15L)&0x3f                ]|
+                               des_skb[7][((d>>21L)&0x0f)|((d>>22L)&0x30)];
+
+               /* table contained 0213 4657 */
+               t2=((t<<16L)|(s&0x0000ffffL))&0xffffffffL;
+               *(k++)=ROTATE(t2,30)&0xffffffffL;
+
+               t2=((s>>16L)|(t&0xffff0000L));
+               *(k++)=ROTATE(t2,26)&0xffffffffL;
+       }
+       return(0);
+}
+
+
+static void des_encrypt(DES_LONG *data, des_key_schedule ks, int enc)
+{
+       register DES_LONG l,r,t,u;
+#ifdef DES_PTR
+       register unsigned char *des_SP=(unsigned char *)des_SPtrans;
+#endif
+#ifndef DES_UNROLL
+       register int i;
+#endif
+       register DES_LONG *s;
+
+       r=data[0];
+       l=data[1];
+
+       IP(r,l);
+       /* Things have been modified so that the initial rotate is
+       * done outside the loop.  This required the
+       * des_SPtrans values in sp.h to be rotated 1 bit to the right.
+       * One perl script later and things have a 5% speed up on a sparc2.
+       * Thanks to Richard Outerbridge <71755.204@CompuServe.COM>
+       * for pointing this out. */
+       /* clear the top bits on machines with 8byte longs */
+       /* shift left by 2 */
+       r=ROTATE(r,29)&0xffffffffL;
+       l=ROTATE(l,29)&0xffffffffL;
+
+       s=(DES_LONG *)ks;
+       /* I don't know if it is worth the effort of loop unrolling the
+       * inner loop */
+       if (enc)
+       {
+#ifdef DES_UNROLL
+               D_ENCRYPT(l,r, 0); /*  1 */
+               D_ENCRYPT(r,l, 2); /*  2 */
+               D_ENCRYPT(l,r, 4); /*  3 */
+               D_ENCRYPT(r,l, 6); /*  4 */
+               D_ENCRYPT(l,r, 8); /*  5 */
+               D_ENCRYPT(r,l,10); /*  6 */
+               D_ENCRYPT(l,r,12); /*  7 */
+               D_ENCRYPT(r,l,14); /*  8 */
+               D_ENCRYPT(l,r,16); /*  9 */
+               D_ENCRYPT(r,l,18); /*  10 */
+               D_ENCRYPT(l,r,20); /*  11 */
+               D_ENCRYPT(r,l,22); /*  12 */
+               D_ENCRYPT(l,r,24); /*  13 */
+               D_ENCRYPT(r,l,26); /*  14 */
+               D_ENCRYPT(l,r,28); /*  15 */
+               D_ENCRYPT(r,l,30); /*  16 */
+#else
+               for (i=0; i<32; i+=8)
+{
+       D_ENCRYPT(l,r,i+0); /*  1 */
+       D_ENCRYPT(r,l,i+2); /*  2 */
+       D_ENCRYPT(l,r,i+4); /*  3 */
+       D_ENCRYPT(r,l,i+6); /*  4 */
+}
+#endif
+       }
+       else
+{
+#ifdef DES_UNROLL
+               D_ENCRYPT(l,r,30); /* 16 */
+               D_ENCRYPT(r,l,28); /* 15 */
+               D_ENCRYPT(l,r,26); /* 14 */
+               D_ENCRYPT(r,l,24); /* 13 */
+               D_ENCRYPT(l,r,22); /* 12 */
+               D_ENCRYPT(r,l,20); /* 11 */
+               D_ENCRYPT(l,r,18); /* 10 */
+               D_ENCRYPT(r,l,16); /*  9 */
+               D_ENCRYPT(l,r,14); /*  8 */
+               D_ENCRYPT(r,l,12); /*  7 */
+               D_ENCRYPT(l,r,10); /*  6 */
+               D_ENCRYPT(r,l, 8); /*  5 */
+               D_ENCRYPT(l,r, 6); /*  4 */
+               D_ENCRYPT(r,l, 4); /*  3 */
+               D_ENCRYPT(l,r, 2); /*  2 */
+               D_ENCRYPT(r,l, 0); /*  1 */
+#else
+               for (i=30; i>0; i-=8)
+{
+       D_ENCRYPT(l,r,i-0); /* 16 */
+       D_ENCRYPT(r,l,i-2); /* 15 */
+       D_ENCRYPT(l,r,i-4); /* 14 */
+       D_ENCRYPT(r,l,i-6); /* 13 */
+}
+#endif
+}
+
+       /* rotate and clear the top bits on machines with 8byte longs */
+       l=ROTATE(l,3)&0xffffffffL;
+       r=ROTATE(r,3)&0xffffffffL;
+
+       FP(r,l);
+       data[0]=l;
+       data[1]=r;
+       l=r=t=u=0;
+}
+
+/**
+ * DES CBC encrypt decrypt routine
+ */
+static void des_cbc_encrypt(des_cblock *input, des_cblock *output, long length, 
+                                                   des_key_schedule schedule, des_cblock *ivec, int enc)
+{
+       register DES_LONG tin0,tin1;
+       register DES_LONG tout0,tout1,xor0,xor1;
+       register unsigned char *in,*out;
+       register long l=length;
+       DES_LONG tin[2];
+       unsigned char *iv;
+
+       in=(unsigned char *)input;
+       out=(unsigned char *)output;
+       iv=(unsigned char *)ivec;
+
+       if (enc)
+       {
+               c2l(iv,tout0);
+               c2l(iv,tout1);
+               for (l-=8; l>=0; l-=8)
+               {
+                       c2l(in,tin0);
+                       c2l(in,tin1);
+                       tin0^=tout0; tin[0]=tin0;
+                       tin1^=tout1; tin[1]=tin1;
+                       des_encrypt((DES_LONG *)tin,schedule,DES_ENCRYPT);
+                       tout0=tin[0]; l2c(tout0,out);
+                       tout1=tin[1]; l2c(tout1,out);
+               }
+               if (l != -8)
+               {
+                       c2ln(in,tin0,tin1,l+8);
+                       tin0^=tout0; tin[0]=tin0;
+                       tin1^=tout1; tin[1]=tin1;
+                       des_encrypt((DES_LONG *)tin,schedule,DES_ENCRYPT);
+                       tout0=tin[0]; l2c(tout0,out);
+                       tout1=tin[1]; l2c(tout1,out);
+               }
+       }
+       else
+       {
+               c2l(iv,xor0);
+               c2l(iv,xor1);
+               for (l-=8; l>=0; l-=8)
+               {
+                       c2l(in,tin0); tin[0]=tin0;
+                       c2l(in,tin1); tin[1]=tin1;
+                       des_encrypt((DES_LONG *)tin,schedule,DES_DECRYPT);
+                       tout0=tin[0]^xor0;
+                       tout1=tin[1]^xor1;
+                       l2c(tout0,out);
+                       l2c(tout1,out);
+                       xor0=tin0;
+                       xor1=tin1;
+               }
+               if (l != -8)
+               {
+                       c2l(in,tin0); tin[0]=tin0;
+                       c2l(in,tin1); tin[1]=tin1;
+                       des_encrypt((DES_LONG *)tin,schedule,DES_DECRYPT);
+                       tout0=tin[0]^xor0;
+                       tout1=tin[1]^xor1;
+                       l2cn(tout0,tout1,out,l+8);
+               /*      xor0=tin0;
+                       xor1=tin1; */
+               }
+       }
+       tin0=tin1=tout0=tout1=xor0=xor1=0;
+       tin[0]=tin[1]=0;
+}
+
+static void des_encrypt2(DES_LONG *data, des_key_schedule ks, int enc)
+{
+       register DES_LONG l,r,t,u;
+#ifdef DES_PTR
+       register unsigned char *des_SP=(unsigned char *)des_SPtrans;
+#endif
+#ifndef DES_UNROLL
+       register int i;
+#endif
+       register DES_LONG *s;
+
+       r=data[0];
+       l=data[1];
+
+       /* Things have been modified so that the initial rotate is
+        * done outside the loop.  This required the
+        * des_SPtrans values in sp.h to be rotated 1 bit to the right.
+        * One perl script later and things have a 5% speed up on a sparc2.
+        * Thanks to Richard Outerbridge <71755.204@CompuServe.COM>
+        * for pointing this out.
+        * clear the top bits on machines with 8byte longs */
+       r=ROTATE(r,29)&0xffffffffL;
+       l=ROTATE(l,29)&0xffffffffL;
+
+       s=(DES_LONG *)ks;
+       /* I don't know if it is worth the effort of loop unrolling the
+       * inner loop */
+       if (enc)
+       {
+#ifdef DES_UNROLL
+               D_ENCRYPT(l,r, 0); /*  1 */
+               D_ENCRYPT(r,l, 2); /*  2 */
+               D_ENCRYPT(l,r, 4); /*  3 */
+               D_ENCRYPT(r,l, 6); /*  4 */
+               D_ENCRYPT(l,r, 8); /*  5 */
+               D_ENCRYPT(r,l,10); /*  6 */
+               D_ENCRYPT(l,r,12); /*  7 */
+               D_ENCRYPT(r,l,14); /*  8 */
+               D_ENCRYPT(l,r,16); /*  9 */
+               D_ENCRYPT(r,l,18); /*  10 */
+               D_ENCRYPT(l,r,20); /*  11 */
+               D_ENCRYPT(r,l,22); /*  12 */
+               D_ENCRYPT(l,r,24); /*  13 */
+               D_ENCRYPT(r,l,26); /*  14 */
+               D_ENCRYPT(l,r,28); /*  15 */
+               D_ENCRYPT(r,l,30); /*  16 */
+#else
+               for (i=0; i<32; i+=8)
+{
+       D_ENCRYPT(l,r,i+0); /*  1 */
+       D_ENCRYPT(r,l,i+2); /*  2 */
+       D_ENCRYPT(l,r,i+4); /*  3 */
+       D_ENCRYPT(r,l,i+6); /*  4 */
+}
+#endif
+       }
+       else
+{
+#ifdef DES_UNROLL
+               D_ENCRYPT(l,r,30); /* 16 */
+               D_ENCRYPT(r,l,28); /* 15 */
+               D_ENCRYPT(l,r,26); /* 14 */
+               D_ENCRYPT(r,l,24); /* 13 */
+               D_ENCRYPT(l,r,22); /* 12 */
+               D_ENCRYPT(r,l,20); /* 11 */
+               D_ENCRYPT(l,r,18); /* 10 */
+               D_ENCRYPT(r,l,16); /*  9 */
+               D_ENCRYPT(l,r,14); /*  8 */
+               D_ENCRYPT(r,l,12); /*  7 */
+               D_ENCRYPT(l,r,10); /*  6 */
+               D_ENCRYPT(r,l, 8); /*  5 */
+               D_ENCRYPT(l,r, 6); /*  4 */
+               D_ENCRYPT(r,l, 4); /*  3 */
+               D_ENCRYPT(l,r, 2); /*  2 */
+               D_ENCRYPT(r,l, 0); /*  1 */
+#else
+               for (i=30; i>0; i-=8)
+{
+       D_ENCRYPT(l,r,i-0); /* 16 */
+       D_ENCRYPT(r,l,i-2); /* 15 */
+       D_ENCRYPT(l,r,i-4); /* 14 */
+       D_ENCRYPT(r,l,i-6); /* 13 */
+}
+#endif
+}
+       /* rotate and clear the top bits on machines with 8byte longs */
+       data[0]=ROTATE(l,3)&0xffffffffL;
+       data[1]=ROTATE(r,3)&0xffffffffL;
+       l=r=t=u=0;
+}
+
+/**
+ * Single block 3DES EDE encrypt routine
+ */
+static void des_encrypt3(DES_LONG *data, des_key_schedule ks1, 
+                                                des_key_schedule ks2, des_key_schedule ks3)
+{
+       register DES_LONG l,r;
+
+       l=data[0];
+       r=data[1];
+       IP(l,r);
+       data[0]=l;
+       data[1]=r;
+       des_encrypt2((DES_LONG *)data,ks1,DES_ENCRYPT);
+       des_encrypt2((DES_LONG *)data,ks2,DES_DECRYPT);
+       des_encrypt2((DES_LONG *)data,ks3,DES_ENCRYPT);
+       l=data[0];
+       r=data[1];
+       FP(r,l);
+       data[0]=l;
+       data[1]=r;
+}
+
+/**
+ * Single block 3DES EDE decrypt routine
+ */
+static void des_decrypt3(DES_LONG *data, des_key_schedule ks1, 
+                                                des_key_schedule ks2, des_key_schedule ks3)
+{
+       register DES_LONG l,r;
+
+       l=data[0];
+       r=data[1];
+       IP(l,r);
+       data[0]=l;
+       data[1]=r;
+       des_encrypt2((DES_LONG *)data,ks3,DES_DECRYPT);
+       des_encrypt2((DES_LONG *)data,ks2,DES_ENCRYPT);
+       des_encrypt2((DES_LONG *)data,ks1,DES_DECRYPT);
+       l=data[0];
+       r=data[1];
+       FP(r,l);
+       data[0]=l;
+       data[1]=r;
+}
+
+/**
+ * 3DES EDE CBC encrypt/decrypt routine
+ */
+static void des_ede3_cbc_encrypt(des_cblock *input, des_cblock *output, long length,
+                                                                des_key_schedule ks1, des_key_schedule ks2,
+                                                                des_key_schedule ks3, des_cblock *ivec, int enc)
+{
+       register DES_LONG tin0,tin1;
+       register DES_LONG tout0,tout1,xor0,xor1;
+       register unsigned char *in,*out;
+       register long l=length;
+       DES_LONG tin[2];
+       unsigned char *iv;
+
+       in=(unsigned char *)input;
+       out=(unsigned char *)output;
+       iv=(unsigned char *)ivec;
+
+       if (enc)
+       {
+               c2l(iv,tout0);
+               c2l(iv,tout1);
+               for (l-=8; l>=0; l-=8)
+               {
+                       c2l(in,tin0);
+                       c2l(in,tin1);
+                       tin0^=tout0;
+                       tin1^=tout1;
+
+                       tin[0]=tin0;
+                       tin[1]=tin1;
+                       des_encrypt3((DES_LONG *)tin,ks1,ks2,ks3);
+                       tout0=tin[0];
+                       tout1=tin[1];
+
+                       l2c(tout0,out);
+                       l2c(tout1,out);
+               }
+               if (l != -8)
+               {
+                       c2ln(in,tin0,tin1,l+8);
+                       tin0^=tout0;
+                       tin1^=tout1;
+
+                       tin[0]=tin0;
+                       tin[1]=tin1;
+                       des_encrypt3((DES_LONG *)tin,ks1,ks2,ks3);
+                       tout0=tin[0];
+                       tout1=tin[1];
+
+                       l2c(tout0,out);
+                       l2c(tout1,out);
+               }
+               iv=(unsigned char *)ivec;
+               l2c(tout0,iv);
+               l2c(tout1,iv);
+       }
+       else
+       {
+               register DES_LONG t0,t1;
+
+               c2l(iv,xor0);
+               c2l(iv,xor1);
+               for (l-=8; l>=0; l-=8)
+               {
+                       c2l(in,tin0);
+                       c2l(in,tin1);
+
+                       t0=tin0;
+                       t1=tin1;
+
+                       tin[0]=tin0;
+                       tin[1]=tin1;
+                       des_decrypt3((DES_LONG *)tin,ks1,ks2,ks3);
+                       tout0=tin[0];
+                       tout1=tin[1];
+
+                       tout0^=xor0;
+                       tout1^=xor1;
+                       l2c(tout0,out);
+                       l2c(tout1,out);
+                       xor0=t0;
+                       xor1=t1;
+               }
+               if (l != -8)
+               {
+                       c2l(in,tin0);
+                       c2l(in,tin1);
+                       
+                       t0=tin0;
+                       t1=tin1;
+
+                       tin[0]=tin0;
+                       tin[1]=tin1;
+                       des_decrypt3((DES_LONG *)tin,ks1,ks2,ks3);
+                       tout0=tin[0];
+                       tout1=tin[1];
+               
+                       tout0^=xor0;
+                       tout1^=xor1;
+                       l2cn(tout0,tout1,out,l+8);
+                       xor0=t0;
+                       xor1=t1;
+               }
+
+               iv=(unsigned char *)ivec;
+               l2c(xor0,iv);
+               l2c(xor1,iv);
+       }
+       tin0=tin1=tout0=tout1=xor0=xor1=0;
+       tin[0]=tin[1]=0;
+}
+
+/**
+ * Implementation of crypter_t.decrypt for DES.
+ */
+static status_t decrypt(private_des_crypter_t *this, chunk_t data, chunk_t iv, chunk_t *decrypted)
+{
+       des_cblock ivb;
+       
+       if (data.len % sizeof(des_cblock) != 0 ||
+               iv.len != sizeof(des_cblock))
+       {
+               return INVALID_ARG;
+       }
+       
+       *decrypted = chunk_alloc(data.len);
+       memcpy(&ivb, iv.ptr, sizeof(des_cblock));
+       des_cbc_encrypt((des_cblock*)(data.ptr), (des_cblock*)(decrypted->ptr),
+                                        data.len, this->ks, &ivb, DES_DECRYPT);
+       return SUCCESS;
+}
+
+
+/**
+ * Implementation of crypter_t.decrypt for DES.
+ */
+static status_t encrypt(private_des_crypter_t *this, chunk_t data, chunk_t iv, chunk_t *encrypted)
+{
+       des_cblock ivb;
+       
+       if (data.len % sizeof(des_cblock) != 0 ||
+               iv.len != sizeof(des_cblock))
+       {
+               return INVALID_ARG;
+       }
+       
+       *encrypted = chunk_alloc(data.len);
+       memcpy(&ivb, iv.ptr, sizeof(des_cblock));
+       des_cbc_encrypt((des_cblock*)(data.ptr), (des_cblock*)(encrypted->ptr),
+                                        data.len, this->ks, &ivb, DES_ENCRYPT);
+       return SUCCESS;
+}
+
+/**
+ * Implementation of crypter_t.decrypt for 3DES.
+ */
+static status_t decrypt3(private_des_crypter_t *this, chunk_t data, chunk_t iv, chunk_t *decrypted)
+{
+       des_cblock ivb;
+       
+       if (data.len % sizeof(des_cblock) != 0 ||
+               iv.len != sizeof(des_cblock))
+       {
+               return INVALID_ARG;
+       }
+       
+       *decrypted = chunk_alloc(data.len);
+       memcpy(&ivb, iv.ptr, sizeof(des_cblock));
+       des_ede3_cbc_encrypt((des_cblock*)(data.ptr), (des_cblock*)(decrypted->ptr),
+                                                data.len, this->ks3[0], this->ks3[1], this->ks3[2],
+                                                &ivb, DES_DECRYPT);
+       return SUCCESS;
+}
+
+/**
+ * Implementation of crypter_t.decrypt for 3DES.
+ */
+static status_t encrypt3(private_des_crypter_t *this, chunk_t data, chunk_t iv, chunk_t *encrypted)
+{
+       des_cblock ivb;
+       
+       if (data.len % sizeof(des_cblock) != 0 ||
+               iv.len != sizeof(des_cblock))
+       {
+               return INVALID_ARG;
+       }
+       
+       *encrypted = chunk_alloc(data.len);
+       memcpy(&ivb, iv.ptr, sizeof(des_cblock));
+       des_ede3_cbc_encrypt((des_cblock*)(data.ptr), (des_cblock*)(encrypted->ptr),
+                                                 data.len, this->ks3[0], this->ks3[1], this->ks3[2],
+                                                 &ivb, DES_ENCRYPT);
+       return SUCCESS;
+}
+
+/**
+ * Implementation of crypter_t.get_block_size.
+ */
+static size_t get_block_size (private_des_crypter_t *this)
+{
+       return sizeof(des_cblock);
+}
+
+/**
+ * Implementation of crypter_t.get_key_size.
+ */
+static size_t get_key_size (private_des_crypter_t *this)
+{
+       return this->key_size;
+}
+
+/**
+ * Implementation of crypter_t.set_key for DES.
+ */
+static status_t set_key(private_des_crypter_t *this, chunk_t key)
+{
+       if (key.len != sizeof(des_cblock))
+       {
+               return INVALID_ARG;
+       }
+       
+       des_set_key((des_cblock*)(key.ptr), &this->ks);
+       
+       return SUCCESS;
+}
+
+/**
+ * Implementation of crypter_t.set_key for 3DES.
+ */
+static status_t set_key3(private_des_crypter_t *this, chunk_t key)
+{
+       if (key.len != 3 * sizeof(des_cblock))
+       {
+               return INVALID_ARG;
+       }
+       
+       des_set_key((des_cblock*)(key.ptr) + 0, &this->ks3[0]);
+       des_set_key((des_cblock*)(key.ptr) + 1, &this->ks3[1]);
+       des_set_key((des_cblock*)(key.ptr) + 2, &this->ks3[2]);
+       
+       return SUCCESS;
+}
+
+/**
+ * Implementation of crypter_t.destroy and des_crypter_t.destroy.
+ */
+static void destroy(private_des_crypter_t *this)
+{
+       free(this);
+}
+
+/*
+ * Described in header
+ */
+des_crypter_t *des_crypter_create(encryption_algorithm_t algo)
+{
+       private_des_crypter_t *this = malloc_thing(private_des_crypter_t);
+       
+       /* functions of crypter_t interface */  
+       this->public.crypter_interface.get_block_size = (size_t (*) (crypter_t *)) get_block_size;
+       this->public.crypter_interface.get_key_size = (size_t (*) (crypter_t *)) get_key_size;
+       this->public.crypter_interface.destroy = (void (*) (crypter_t *)) destroy;
+       
+       /* use functions depending on algorithm */
+       switch (algo)
+       {
+               case ENCR_DES:
+                       this->key_size = sizeof(des_cblock);
+                       this->public.crypter_interface.set_key = (status_t (*) (crypter_t *,chunk_t)) set_key;
+                       this->public.crypter_interface.encrypt = (status_t (*) (crypter_t *, chunk_t,chunk_t, chunk_t *)) encrypt;
+                       this->public.crypter_interface.decrypt = (status_t (*) (crypter_t *, chunk_t , chunk_t, chunk_t *)) decrypt;
+                       break;
+               case ENCR_3DES:
+                       this->key_size = 3 * sizeof(des_cblock);
+                       this->public.crypter_interface.set_key = (status_t (*) (crypter_t *,chunk_t)) set_key3;
+                       this->public.crypter_interface.encrypt = (status_t (*) (crypter_t *, chunk_t,chunk_t, chunk_t *)) encrypt3;
+                       this->public.crypter_interface.decrypt = (status_t (*) (crypter_t *, chunk_t , chunk_t, chunk_t *)) decrypt3;
+                       break;
+               default:
+                       free(this);
+                       return NULL;
+       }
+       return &(this->public);
+}
diff --git a/src/libstrongswan/crypto/crypters/des_crypter.h b/src/libstrongswan/crypto/crypters/des_crypter.h
new file mode 100644 (file)
index 0000000..90e1580
--- /dev/null
@@ -0,0 +1,58 @@
+/**
+ * @file des_crypter.h
+ * 
+ * @brief Interface of des_crypter_t
+ * 
+ */
+
+/*
+ * Copyright (C) 2006 Martin Willi
+ * Hochschule fuer Technik Rapperswil
+ *
+ * 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.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * 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.
+ */
+
+#ifndef DES_CRYPTER_H_
+#define DES_CRYPTER_H_
+
+#include <crypto/crypters/crypter.h>
+
+
+typedef struct des_crypter_t des_crypter_t;
+
+/**
+ * @brief Class implementing the DES and 3DES encryption algorithms.
+ * 
+ * @b Constructors:
+ *  - des_crypter_create()
+ * 
+ * @ingroup crypters
+ */
+struct des_crypter_t {
+       
+       /**
+        * The crypter_t interface.
+        */
+       crypter_t crypter_interface;
+};
+
+/**
+ * @brief Constructor to create des_crypter_t objects.
+ * 
+ * @param algo         ENCR_DES for single DES, ENCR_3DES for triple DES
+ * @return                             
+ *                                     - des_crypter_t object
+ *                                     - NULL if algo not supported
+ */
+des_crypter_t *des_crypter_create(encryption_algorithm_t algo);
+
+
+#endif /* DES_CRYPTER_H_ */