diff --git a/THANKS b/THANKS
index 2f589c3d5..ff0fb3087 100644
--- a/THANKS
+++ b/THANKS
@@ -4,12 +4,14 @@ code.  Here is a list of those people.	Help me keep it complete and free of
 errors.
 
 Anand Kumria		wildfire@progsoc.uts.edu.au
+Brian Warner		warner@lothar.com
 Charles Levert		charles@comm.polymtl.ca
 Christian von Roques	roques@pond.sub.org
 Daniel Eisenbud 	eisenbud@cs.swarthmore.edu
 Detlef Lannert		lannert@lannert.rz.uni-duesseldorf.de
 Ed Boraas		ecxjo@esperanto.org
 Ernst Molitor		ernst.molitor@uni-bonn.de
+Frank Heckenbach	heckenb@mi.uni-erlangen.de
 Hendrik Buschkamp	buschkamp@rheumanet.org
 Ian McKellar		imckellar@harvestroad.com.au
 James Troup		J.J.Troup@scm.brad.ac.uk
diff --git a/TODO b/TODO
index e26f4ce6a..d9f61722a 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,6 @@
 
+    * add field to PKT_user_id to hold the hash context
+
     * add usage arguments to get_key_byname or return a PKC_LIST with
       all keys and add a selection.
 
@@ -33,11 +35,6 @@
       of the displayed list (needs changes in the user-id-from-keyid
       functions).
 
-    * enhance --sign-key, so that multiple-user-ids can be signed
-      (use the new classes 0x14..17), partly implemented, but I think we
-      should better make use of notation data - for now we allow only one
-      user id.
-
     * add an option to re-create a public key from a secret key. Think about
       a backup system of only the secret part of the secret key.
 
diff --git a/VERSION b/VERSION
index 6bf5ecb60..3c516158d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2.19
+0.2.19a
diff --git a/acconfig.h b/acconfig.h
index dfdcdec81..477ef64ef 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -71,13 +71,9 @@
 /* defined if we have a /dev/random and /dev/urandom */
 #undef HAVE_DEV_RANDOM
 
-/* RSA is only compiled in if you have these files. You can use
- * RSA without any restrictions, if your not in the U.S. or
- * wait until sep 20, 2000
- */
-#undef HAVE_RSA_CIPHER
-
-
+#undef USE_DYNAMIC_LINKING
+#undef HAVE_DL_DLOPEN
+#undef HAVE_DLD_DLD_LINK
 
 @BOTTOM@
 
diff --git a/cipher/ChangeLog b/cipher/ChangeLog
index 5e37e8f1a..79f3dc171 100644
--- a/cipher/ChangeLog
+++ b/cipher/ChangeLog
@@ -1,3 +1,16 @@
+Mon Jun  8 22:43:00 1998  Werner Koch  (wk@isil.d.shuttle.de)
+
+	* cipher.c: Major internal chnages to support extensions.
+	* blowfish.c (blowfish_get_info): New and made all internal
+	functions static, changed heder.
+	* cast5.c (cast5_get_info): Likewise.
+
+Mon Jun  8 12:27:52 1998  Werner Koch  (wk@isil.d.shuttle.de)
+
+	* tiger.c (transform): Fix for big endian
+
+	* cipher.c (do_cfb_decrypt): Big endian fix.
+
 Fri May 22 07:30:39 1998  Werner Koch  (wk@isil.d.shuttle.de)
 
 	* md.c (md_get_oid): Add a new one for TIGER.
diff --git a/cipher/Makefile.am b/cipher/Makefile.am
index 34f800769..10d1c8091 100644
--- a/cipher/Makefile.am
+++ b/cipher/Makefile.am
@@ -1,12 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
 INCLUDES =  -I$(top_srcdir)/include -I$(top_srcdir)/intl -I../intl
-EXTRA_DIST = @CIPHER_EXTRA_DIST@
 
 noinst_LIBRARIES = libcipher.a
 
 
 libcipher_a_SOURCES = cipher.c	\
+		 dynload.c	\
+		 dynload.h	\
 		 blowfish.c	\
 		 blowfish.h	\
 		 cast5.c	\
@@ -36,7 +37,4 @@ libcipher_a_SOURCES = cipher.c	\
 		 misc.c 	\
 		 smallprime.c
 
-libcipher_a_DEPENDENCIES = @CIPHER_EXTRA_OBJS@
-libcipher_a_LIBADD = @CIPHER_EXTRA_OBJS@
-
 
diff --git a/cipher/Makefile.in b/cipher/Makefile.in
index 7d09af9ab..feb58596a 100644
--- a/cipher/Makefile.in
+++ b/cipher/Makefile.in
@@ -64,8 +64,6 @@ target_triplet = @target@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
-CIPHER_EXTRA_DIST = @CIPHER_EXTRA_DIST@
-CIPHER_EXTRA_OBJS = @CIPHER_EXTRA_OBJS@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 G10_LOCALEDIR = @G10_LOCALEDIR@
@@ -93,11 +91,12 @@ ZLIBS = @ZLIBS@
 l = @l@
 
 INCLUDES =  -I$(top_srcdir)/include -I$(top_srcdir)/intl -I../intl
-EXTRA_DIST = @CIPHER_EXTRA_DIST@
 
 noinst_LIBRARIES = libcipher.a
 
 libcipher_a_SOURCES = cipher.c	\
+		 dynload.c	\
+		 dynload.h	\
 		 blowfish.c	\
 		 blowfish.h	\
 		 cast5.c	\
@@ -126,9 +125,6 @@ libcipher_a_SOURCES = cipher.c	\
 		 md.h		\
 		 misc.c 	\
 		 smallprime.c
-
-libcipher_a_DEPENDENCIES = @CIPHER_EXTRA_OBJS@
-libcipher_a_LIBADD = @CIPHER_EXTRA_OBJS@
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
@@ -139,8 +135,9 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I..
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-libcipher_a_OBJECTS =  cipher.o blowfish.o cast5.o elgamal.o md5.o \
-primegen.o random.o rand-unix.o rand-w32.o rand-dummy.o rmd160.o \
+libcipher_a_LIBADD = 
+libcipher_a_OBJECTS =  cipher.o dynload.o blowfish.o cast5.o elgamal.o \
+md5.o primegen.o random.o rand-unix.o rand-w32.o rand-dummy.o rmd160.o \
 tiger.o sha1.o dsa.o md.o misc.o smallprime.o
 AR = ar
 CFLAGS = @CFLAGS@
@@ -154,9 +151,10 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 TAR = tar
 GZIP = --best
 DEP_FILES =  .deps/blowfish.P .deps/cast5.P .deps/cipher.P .deps/dsa.P \
-.deps/elgamal.P .deps/md.P .deps/md5.P .deps/misc.P .deps/primegen.P \
-.deps/rand-dummy.P .deps/rand-unix.P .deps/rand-w32.P .deps/random.P \
-.deps/rmd160.P .deps/sha1.P .deps/smallprime.P .deps/tiger.P
+.deps/dynload.P .deps/elgamal.P .deps/md.P .deps/md5.P .deps/misc.P \
+.deps/primegen.P .deps/rand-dummy.P .deps/rand-unix.P .deps/rand-w32.P \
+.deps/random.P .deps/rmd160.P .deps/sha1.P .deps/smallprime.P \
+.deps/tiger.P
 SOURCES = $(libcipher_a_SOURCES)
 OBJECTS = $(libcipher_a_OBJECTS)
 
diff --git a/cipher/blowfish.c b/cipher/blowfish.c
index 466e8da67..ec686e1ee 100644
--- a/cipher/blowfish.c
+++ b/cipher/blowfish.c
@@ -38,6 +38,28 @@
 #include "types.h"
 #include "blowfish.h"
 
+#define CIPHER_ALGO_BLOWFISH	 4  /* blowfish 128 bit key */
+#define CIPHER_ALGO_BLOWFISH160 42  /* blowfish 160 bit key (not in OpenPGP)*/
+
+#define FNCCAST_SETKEY(f)  (void(*)(void*, byte*, unsigned))(f)
+#define FNCCAST_CRYPT(f)   (void(*)(void*, byte*, byte*))(f)
+
+#define BLOWFISH_BLOCKSIZE 8
+#define BLOWFISH_ROUNDS 16
+
+typedef struct {
+    u32 s0[256];
+    u32 s1[256];
+    u32 s2[256];
+    u32 s3[256];
+    u32 p[BLOWFISH_ROUNDS+2];
+} BLOWFISH_context;
+
+static void blowfish_setkey( BLOWFISH_context *c, byte *key, unsigned keylen );
+static void blowfish_encrypt_block( BLOWFISH_context *bc, byte *outbuf, byte *inbuf );
+static void blowfish_decrypt_block( BLOWFISH_context *bc, byte *outbuf, byte *inbuf );
+
+
 /* precomputed S boxes */
 static const u32 ks0[256] = {
     0xD1310BA6,0x98DFB5AC,0x2FFD72DB,0xD01ADFB7,0xB8E1AFED,0x6A267E96,
@@ -391,7 +413,7 @@ decrypt(  BLOWFISH_context *bc, u32 *ret_xl, u32 *ret_xr )
 #undef F
 #undef R
 
-void
+static void
 blowfish_encrypt_block( BLOWFISH_context *bc, byte *outbuf, byte *inbuf )
 {
     u32 d1, d2;
@@ -410,7 +432,7 @@ blowfish_encrypt_block( BLOWFISH_context *bc, byte *outbuf, byte *inbuf )
 }
 
 
-void
+static void
 blowfish_decrypt_block( BLOWFISH_context *bc, byte *outbuf, byte *inbuf )
 {
     u32 d1, d2;
@@ -458,7 +480,7 @@ selftest()
 
 
 
-void
+static void
 blowfish_setkey( BLOWFISH_context *c, byte *key, unsigned keylen )
 {
     int i, j;
@@ -524,3 +546,31 @@ blowfish_setkey( BLOWFISH_context *c, byte *key, unsigned keylen )
 }
 
 
+/****************
+ * Return some information about the algorithm.  We need algo here to
+ * distinguish different flavors of the algorithm.
+ * Returns: A pointer to string describing the algorithm or NULL if
+ *	    the ALGO is invalid.
+ */
+const char *
+blowfish_get_info( int algo, size_t *keylen,
+		   size_t *blocksize, size_t *contextsize,
+		   void (**setkey)( void *c, byte *key, unsigned keylen ),
+		   void (**encrypt)( void *c, byte *outbuf, byte *inbuf ),
+		   void (**decrypt)( void *c, byte *outbuf, byte *inbuf )
+		 )
+{
+    *keylen = algo == CIPHER_ALGO_BLOWFISH ? 128 : 160;
+    *blocksize = BLOWFISH_BLOCKSIZE;
+    *contextsize = sizeof(BLOWFISH_context);
+    *setkey = FNCCAST_SETKEY(blowfish_setkey);
+    *encrypt= FNCCAST_CRYPT(blowfish_encrypt_block);
+    *decrypt= FNCCAST_CRYPT(blowfish_decrypt_block);
+
+    if( algo == CIPHER_ALGO_BLOWFISH )
+	return "BLOWFISH";
+    if( algo == CIPHER_ALGO_BLOWFISH160 )
+	return "BLOWFISH160";
+    return NULL;
+}
+
diff --git a/cipher/blowfish.h b/cipher/blowfish.h
index db96d3720..e328415f5 100644
--- a/cipher/blowfish.h
+++ b/cipher/blowfish.h
@@ -22,19 +22,13 @@
 
 #include "types.h"
 
-#define BLOWFISH_BLOCKSIZE 8
-#define BLOWFISH_ROUNDS 16
 
-typedef struct {
-    u32 s0[256];
-    u32 s1[256];
-    u32 s2[256];
-    u32 s3[256];
-    u32 p[BLOWFISH_ROUNDS+2];
-} BLOWFISH_context;
-
-void blowfish_setkey( BLOWFISH_context *c, byte *key, unsigned keylen );
-void blowfish_encrypt_block( BLOWFISH_context *bc, byte *outbuf, byte *inbuf );
-void blowfish_decrypt_block( BLOWFISH_context *bc, byte *outbuf, byte *inbuf );
+const char *
+blowfish_get_info( int algo, size_t *keylen,
+		   size_t *blocksize, size_t *contextsize,
+		   void (**setkey)( void *c, byte *key, unsigned keylen ),
+		   void (**encrypt)( void *c, byte *outbuf, byte *inbuf ),
+		   void (**decrypt)( void *c, byte *outbuf, byte *inbuf )
+		 );
 
 #endif /*G10_BLOWFISH_H*/
diff --git a/cipher/cast5.c b/cipher/cast5.c
index 99791e05e..5e29debe6 100644
--- a/cipher/cast5.c
+++ b/cipher/cast5.c
@@ -44,6 +44,26 @@
 #include "types.h"
 #include "cast5.h"
 
+
+#define CIPHER_ALGO_CAST5	 3
+
+#define FNCCAST_SETKEY(f)  (void(*)(void*, byte*, unsigned))(f)
+#define FNCCAST_CRYPT(f)   (void(*)(void*, byte*, byte*))(f)
+
+#define CAST5_BLOCKSIZE 8
+
+typedef struct {
+    u32  Km[16];
+    byte Kr[16];
+} CAST5_context;
+
+static void setkey( CAST5_context *c, byte *key, unsigned keylen );
+static void encrypt_block( CAST5_context *bc, byte *outbuf, byte *inbuf );
+static void decrypt_block( CAST5_context *bc, byte *outbuf, byte *inbuf );
+
+
+
+
 static const u32 s1[256] = {
 0x30fb40d4, 0x9fa0ff0b, 0x6beccd2f, 0x3f258c7a, 0x1e213f2f, 0x9c004dd3, 0x6003e540, 0xcf9fc949,
 0xbfd4af27, 0x88bbbdb5, 0xe2034090, 0x98d09675, 0x6e63a0e0, 0x15c361d2, 0xc2e7661d, 0x22d4ff8e,
@@ -338,8 +358,8 @@ rol(int n, u32 x)
 #define F3(D,m,r)  (  (I = ((m) - (D))), (I=rol((r),I)),   \
     (((s1[I >> 24] + s2[(I>>16)&0xff]) ^ s3[(I>>8)&0xff]) - s4[I&0xff]) )
 
-void
-cast5_encrypt_block( CAST5_context *c, byte *outbuf, byte *inbuf )
+static void
+encrypt_block( CAST5_context *c, byte *outbuf, byte *inbuf )
 {
     u32 l, r, t;
     u32 I;   /* used by the Fx macros */
@@ -392,8 +412,8 @@ cast5_encrypt_block( CAST5_context *c, byte *outbuf, byte *inbuf )
     outbuf[7] =  l	  & 0xff;
 }
 
-void
-cast5_decrypt_block(  CAST5_context *c, byte *outbuf, byte *inbuf )
+static void
+decrypt_block(	CAST5_context *c, byte *outbuf, byte *inbuf )
 {
     u32 l, r, t;
     u32 I;
@@ -445,11 +465,11 @@ selftest()
     byte cipher[8]= { 0x23, 0x8B, 0x4F, 0xE5, 0x84, 0x7E, 0x44, 0xB2 };
     byte buffer[8];
 
-    cast5_setkey( &c, key, 16 );
-    cast5_encrypt_block( &c, buffer, plain );
+    setkey( &c, key, 16 );
+    encrypt_block( &c, buffer, plain );
     if( memcmp( buffer, cipher, 8 ) )
 	log_error("wrong cast5-128 encryption\n");
-    cast5_decrypt_block( &c, buffer, buffer );
+    decrypt_block( &c, buffer, buffer );
     if( memcmp( buffer, plain, 8 ) )
 	log_bug("cast5-128 failed\n");
 
@@ -466,12 +486,12 @@ selftest()
 			0x80,0xAC,0x05,0xB8,0xE8,0x3D,0x69,0x6E };
 
 	for(i=0; i < 1000000; i++ ) {
-	    cast5_setkey( &c, b0, 16 );
-	    cast5_encrypt_block( &c, a0, a0 );
-	    cast5_encrypt_block( &c, a0+8, a0+8 );
-	    cast5_setkey( &c, a0, 16 );
-	    cast5_encrypt_block( &c, b0, b0 );
-	    cast5_encrypt_block( &c, b0+8, b0+8 );
+	    setkey( &c, b0, 16 );
+	    encrypt_block( &c, a0, a0 );
+	    encrypt_block( &c, a0+8, a0+8 );
+	    setkey( &c, a0, 16 );
+	    encrypt_block( &c, b0, b0 );
+	    encrypt_block( &c, b0+8, b0+8 );
 	}
 	if( memcmp( a0, a1, 16 ) || memcmp( b0, b1, 16 ) )
 	    log_bug("cast5-128 maintenance test failed\n");
@@ -529,8 +549,8 @@ key_schedule( u32 *x, u32 *z, u32 *k )
 }
 
 
-void
-cast5_setkey( CAST5_context *c, byte *key, unsigned keylen )
+static void
+setkey( CAST5_context *c, byte *key, unsigned keylen )
 {
   static int initialized;
     int i;
@@ -565,3 +585,29 @@ cast5_setkey( CAST5_context *c, byte *key, unsigned keylen )
 }
 
 
+/****************
+ * Return some information about the algorithm.  We need algo here to
+ * distinguish different flavors of the algorithm.
+ * Returns: A pointer to string describing the algorithm or NULL if
+ *	    the ALGO is invalid.
+ */
+const char *
+cast5_get_info( int algo, size_t *keylen,
+		   size_t *blocksize, size_t *contextsize,
+		   void (**setkey)( void *c, byte *key, unsigned keylen ),
+		   void (**encrypt)( void *c, byte *outbuf, byte *inbuf ),
+		   void (**decrypt)( void *c, byte *outbuf, byte *inbuf )
+		 )
+{
+    *keylen = 128;
+    *blocksize = CAST5_BLOCKSIZE;
+    *contextsize = sizeof(CAST5_context);
+    *setkey = FNCCAST_SETKEY(setkey);
+    *encrypt= FNCCAST_CRYPT(encrypt_block);
+    *decrypt= FNCCAST_CRYPT(decrypt_block);
+
+    if( algo == CIPHER_ALGO_CAST5 )
+	return "CAST5";
+    return NULL;
+}
+
diff --git a/cipher/cast5.h b/cipher/cast5.h
index 6d943c25e..070255c6d 100644
--- a/cipher/cast5.h
+++ b/cipher/cast5.h
@@ -22,16 +22,12 @@
 
 #include "types.h"
 
-#define CAST5_BLOCKSIZE 8
-
-typedef struct {
-    u32  Km[16];
-    byte Kr[16];
-} CAST5_context;
-
-void cast5_setkey( CAST5_context *c, byte *key, unsigned keylen );
-void cast5_encrypt_block( CAST5_context *bc, byte *outbuf, byte *inbuf );
-void cast5_decrypt_block( CAST5_context *bc, byte *outbuf, byte *inbuf );
-
+const char *
+cast5_get_info( int algo, size_t *keylen,
+		   size_t *blocksize, size_t *contextsize,
+		   void (**setkey)( void *c, byte *key, unsigned keylen ),
+		   void (**encrypt)( void *c, byte *outbuf, byte *inbuf ),
+		   void (**decrypt)( void *c, byte *outbuf, byte *inbuf )
+		 );
 
 #endif /*G10_CAST5_H*/
diff --git a/cipher/cipher.c b/cipher/cipher.c
index c6b296b36..5d39c3ca3 100644
--- a/cipher/cipher.c
+++ b/cipher/cipher.c
@@ -33,32 +33,20 @@
 #include "cast5.h"
 #include "des.h"
 
+#include <dlfcn.h>
+
 #define STD_BLOCKSIZE 8
+#define TABLE_SIZE 20
 
-#if BLOWFISH_BLOCKSIZE != STD_BLOCKSIZE
-  #error Invalid BLOWFISH blocksize
-#elif CAST5_BLOCKSIZE != STD_BLOCKSIZE
-  #error Invalid CAST blocksize
-#elif DES_BLOCKSIZE != STD_BLOCKSIZE
-  #error Invalid DES blocksize
-#endif
-
-
-static struct { const char *name; int algo; int keylen; } cipher_names[] = {
-    { "IDEA",        CIPHER_ALGO_IDEA        ,0   },
-    { "3DES",        CIPHER_ALGO_3DES        ,168 },
-    { "CAST",        CIPHER_ALGO_CAST        ,128 },
-    { "BLOWFISH160", CIPHER_ALGO_BLOWFISH160 ,160 },
-    { "SAFER_SK128", CIPHER_ALGO_SAFER_SK128 ,0   },
-    { "DES_SK",      CIPHER_ALGO_DES_SK      ,0   },
-    { "BLOWFISH",    CIPHER_ALGO_BLOWFISH    ,128 },
-    { "DUMMY"   ,    CIPHER_ALGO_DUMMY       ,128 },
-    {NULL} };
-
-
-/* Hmmm, no way for a void arg in function pointer? */
-#define FNCCAST_SETKEY(f)  (void(*)(void*, byte*, unsigned))(f)
-#define FNCCAST_CRYPT(f)   (void(*)(void*, byte*, byte*))(f)
+static struct {
+    const char *name;
+    int algo;
+    int keylen;
+    int contextsize; /* allocate this amount of context */
+    void (*setkey)( void *c, byte *key, unsigned keylen );
+    void (*encrypt)( void *c, byte *outbuf, byte *inbuf );
+    void (*decrypt)( void *c, byte *outbuf, byte *inbuf );
+} cipher_table[TABLE_SIZE];
 
 
 struct cipher_handle_s {
@@ -70,15 +58,11 @@ struct cipher_handle_s {
     void (*setkey)( void *c, byte *key, unsigned keylen );
     void (*encrypt)( void *c, byte *outbuf, byte *inbuf );
     void (*decrypt)( void *c, byte *outbuf, byte *inbuf );
-    void (*sync_cfb)( void *c );
-    union {
-	int		 context;
-	BLOWFISH_context blowfish;
-	CAST5_context cast5;
-    } c;
+    byte context[1];
 };
 
 
+
 static void
 dummy_setkey( void *c, byte *key, unsigned keylen ) { }
 static void
@@ -87,6 +71,135 @@ static void
 dummy_decrypt_block( void *c, byte *outbuf, byte *inbuf ) { BUG(); }
 
 
+
+/****************
+ * Put the static entries into the table.
+ */
+static void
+setup_cipher_table()
+{
+
+    static int initialized = 0;
+    int i;
+    size_t blocksize;
+
+    if( initialized )
+	return;
+
+    i = 0;
+    cipher_table[i].algo = CIPHER_ALGO_BLOWFISH;
+    cipher_table[i].name = blowfish_get_info( cipher_table[i].algo,
+					 &cipher_table[i].keylen,
+					 &blocksize,
+					 &cipher_table[i].contextsize,
+					 &cipher_table[i].setkey,
+					 &cipher_table[i].encrypt,
+					 &cipher_table[i].decrypt     );
+    if( !cipher_table[i].name || blocksize != STD_BLOCKSIZE )
+	BUG();
+    i++;
+    cipher_table[i].algo = CIPHER_ALGO_CAST5;
+    cipher_table[i].name = cast5_get_info( cipher_table[i].algo,
+					 &cipher_table[i].keylen,
+					 &blocksize,
+					 &cipher_table[i].contextsize,
+					 &cipher_table[i].setkey,
+					 &cipher_table[i].encrypt,
+					 &cipher_table[i].decrypt     );
+    if( !cipher_table[i].name || blocksize != STD_BLOCKSIZE )
+	BUG();
+    i++;
+    cipher_table[i].algo = CIPHER_ALGO_BLOWFISH160;
+    cipher_table[i].name = blowfish_get_info( cipher_table[i].algo,
+					 &cipher_table[i].keylen,
+					 &blocksize,
+					 &cipher_table[i].contextsize,
+					 &cipher_table[i].setkey,
+					 &cipher_table[i].encrypt,
+					 &cipher_table[i].decrypt     );
+    if( !cipher_table[i].name || blocksize != STD_BLOCKSIZE )
+	BUG();
+    i++;
+    cipher_table[i].algo = CIPHER_ALGO_DUMMY;
+    cipher_table[i].name = "DUMMY";
+    cipher_table[i].keylen = 128;
+    cipher_table[i].contextsize = 0;
+    cipher_table[i].setkey = dummy_setkey;
+    cipher_table[i].encrypt = dummy_encrypt_block;
+    cipher_table[i].decrypt = dummy_decrypt_block;
+    i++;
+
+    for( ; i < TABLE_SIZE; i++ )
+	cipher_table[i].name = NULL;
+    initialized = 1;
+}
+
+
+/****************
+ * Try to load all modules and return true if new modules are available
+ */
+static int
+load_cipher_modules()
+{
+    static int done = 0;
+
+    if( !done ) {
+	void *handle;
+	char **name;
+	void *sym;
+	void * (*enumfunc)(int, int*, int*, int*);
+	const char *err;
+
+	log_debug("load_cipher_modules\n");
+	handle = dlopen("/sahara/proj/psst+g10/non-free-src/rsa+idea.so", RTLD_LAZY);
+	if( !handle )
+	    log_bug("dlopen(rsa+idea) failed: %s\n", dlerror() );
+	name = (char**)dlsym(handle, "gnupgext_version");
+	if( (err=dlerror()) )
+	    log_error("dlsym: gnupgext_version not found: %s\n", err );
+	else {
+	    log_debug("dlsym: gnupgext_version='%s'\n", *name );
+	    sym = dlsym(handle, "gnupgext_enum_func");
+	    if( (err=dlerror()) )
+		log_error("dlsym: gnupgext_enum_func not found: %s\n", err );
+	    else {
+		int seq = 0;
+		int class, vers;
+
+		enumfunc = (void *(*)(int,int*,int*,int*))sym;
+		while( (sym = enumfunc(0, &seq, &class, &vers)) ) {
+		    if( vers != 1 ) {
+			log_debug("ignoring extfunc with version %d\n", vers);
+			continue;
+		    }
+		    switch( class ) {
+		      case 11:
+		      case 21:
+		      case 31:
+			log_info("provides %s algorithm %d\n",
+					class == 11? "md"     :
+					class == 21? "cipher" : "pubkey",
+							       *(int*)sym);
+			break;
+		      default:
+			log_debug("skipping class %d\n", class);
+		    }
+		}
+	    }
+	}
+	dlclose(handle);
+	done = 1;
+    }
+
+    return 0;
+}
+
+
+
+
+
+
+
 /****************
  * Map a string to the cipher algo
  */
@@ -96,9 +209,12 @@ string_to_cipher_algo( const char *string )
     int i;
     const char *s;
 
-    for(i=0; (s=cipher_names[i].name); i++ )
-	if( !stricmp( s, string ) )
-	    return cipher_names[i].algo;
+    setup_cipher_table();
+    do {
+	for(i=0; (s=cipher_table[i].name); i++ )
+	    if( !stricmp( s, string ) )
+		return cipher_table[i].algo;
+    } while( load_cipher_modules() );
     return 0;
 }
 
@@ -110,9 +226,12 @@ cipher_algo_to_string( int algo )
 {
     int i;
 
-    for(i=0; cipher_names[i].name; i++ )
-	if( cipher_names[i].algo == algo )
-	    return cipher_names[i].name;
+    setup_cipher_table();
+    do {
+	for(i=0; cipher_table[i].name; i++ )
+	    if( cipher_table[i].algo == algo )
+		return cipher_table[i].name;
+    } while( load_cipher_modules() );
     return NULL;
 }
 
@@ -122,16 +241,15 @@ cipher_algo_to_string( int algo )
 int
 check_cipher_algo( int algo )
 {
-    switch( algo ) {
-      case CIPHER_ALGO_BLOWFISH160:
-      case CIPHER_ALGO_BLOWFISH:
-      case CIPHER_ALGO_CAST:
-      case CIPHER_ALGO_3DES:
-      case CIPHER_ALGO_DUMMY:
-	return 0;
-      default:
-	return G10ERR_CIPHER_ALGO;
-    }
+    int i;
+
+    setup_cipher_table();
+    do {
+       for(i=0; cipher_table[i].name; i++ )
+	   if( cipher_table[i].algo == algo )
+	       return 0; /* okay */
+    } while( load_cipher_modules() );
+    return G10ERR_CIPHER_ALGO;
 }
 
 
@@ -141,14 +259,19 @@ cipher_get_keylen( int algo )
     int i;
     unsigned len = 0;
 
-    for(i=0; cipher_names[i].name; i++ )
-	if( cipher_names[i].algo == algo ) {
-	    len = cipher_names[i].keylen;
-	    break;
+    setup_cipher_table();
+    do {
+	for(i=0; cipher_table[i].name; i++ ) {
+	    if( cipher_table[i].algo == algo ) {
+		len = cipher_table[i].keylen;
+		if( !len )
+		    log_bug("cipher %d w/o key length\n", algo );
+		return len;
+	    }
 	}
-    if( !len )
-	log_bug("cipher %d w/o key length\n", algo );
-    return len;
+    } while( load_cipher_modules() );
+    log_bug("cipher %d not found\n", algo );
+    return 0;
 }
 
 
@@ -160,13 +283,29 @@ CIPHER_HANDLE
 cipher_open( int algo, int mode, int secure )
 {
     CIPHER_HANDLE hd;
+    int i;
 
+    setup_cipher_table();
     fast_random_poll();
-    /* performance hint:
-     * It is possible to allocate less memory depending on the cipher */
-    hd = secure ? m_alloc_secure_clear( sizeof *hd )
-		: m_alloc_clear( sizeof *hd );
+    do {
+	for(i=0; cipher_table[i].name; i++ )
+	    if( cipher_table[i].algo == algo )
+		break;
+    } while( !cipher_table[i].name && load_cipher_modules() );
+    if( !cipher_table[i].name ) {
+	log_fatal("cipher_open: algorithm %d not available\n", algo );
+	return NULL;
+    }
+
+    /* ? perform selftest here and mark this with a flag in cipher_table ? */
+
+    hd = secure ? m_alloc_secure_clear( sizeof *hd
+					+ cipher_table[i].contextsize )
+		: m_alloc_clear( sizeof *hd + cipher_table[i].contextsize );
     hd->algo = algo;
+    hd->setkey	= cipher_table[i].setkey;
+    hd->encrypt = cipher_table[i].encrypt;
+    hd->decrypt = cipher_table[i].decrypt;
     if( algo == CIPHER_ALGO_DUMMY )
 	hd->mode = CIPHER_MODE_DUMMY;
     else if( mode == CIPHER_MODE_AUTO_CFB ) {
@@ -177,34 +316,6 @@ cipher_open( int algo, int mode, int secure )
     }
     else
 	hd->mode = mode;
-    switch( algo )  {
-      case CIPHER_ALGO_BLOWFISH:
-      case CIPHER_ALGO_BLOWFISH160:
-	hd->setkey  = FNCCAST_SETKEY(blowfish_setkey);
-	hd->encrypt = FNCCAST_CRYPT(blowfish_encrypt_block);
-	hd->decrypt = FNCCAST_CRYPT(blowfish_decrypt_block);
-	break;
-
-      case CIPHER_ALGO_CAST:
-	hd->setkey  = FNCCAST_SETKEY(cast5_setkey);
-	hd->encrypt = FNCCAST_CRYPT(cast5_encrypt_block);
-	hd->decrypt = FNCCAST_CRYPT(cast5_decrypt_block);
-	break;
-#if 0
-      case CIPHER_ALGO_3DES:
-	hd->setkey  = FNCCAST_SETKEY(des_3des_setkey);
-	hd->encrypt = FNCCAST_CRYPT(des_encrypt_block);
-	hd->decrypt = FNCCAST_CRYPT(des_decrypt_block);
-	break;
-#endif
-      case CIPHER_ALGO_DUMMY:
-	hd->setkey  = FNCCAST_SETKEY(dummy_setkey);
-	hd->encrypt = FNCCAST_CRYPT(dummy_encrypt_block);
-	hd->decrypt = FNCCAST_CRYPT(dummy_decrypt_block);
-	break;
-
-      default: log_fatal("cipher_open: invalid algo %d\n", algo );
-    }
 
     return hd;
 }
@@ -220,7 +331,7 @@ cipher_close( CIPHER_HANDLE c )
 void
 cipher_setkey( CIPHER_HANDLE c, byte *key, unsigned keylen )
 {
-    (*c->setkey)( &c->c.context, key, keylen );
+    (*c->setkey)( &c->context, key, keylen );
 }
 
 
@@ -243,7 +354,7 @@ do_ecb_encrypt( CIPHER_HANDLE c, byte *outbuf, byte *inbuf, unsigned nblocks )
     unsigned n;
 
     for(n=0; n < nblocks; n++ ) {
-	(*c->encrypt)( &c->c.context, outbuf, inbuf );
+	(*c->encrypt)( &c->context, outbuf, inbuf );
 	inbuf  += STD_BLOCKSIZE;;
 	outbuf += STD_BLOCKSIZE;
     }
@@ -255,7 +366,7 @@ do_ecb_decrypt( CIPHER_HANDLE c, byte *outbuf, byte *inbuf, unsigned nblocks )
     unsigned n;
 
     for(n=0; n < nblocks; n++ ) {
-	(*c->decrypt)( &c->c.context, outbuf, inbuf );
+	(*c->decrypt)( &c->context, outbuf, inbuf );
 	inbuf  += STD_BLOCKSIZE;;
 	outbuf += STD_BLOCKSIZE;
     }
@@ -287,7 +398,7 @@ do_cfb_encrypt( CIPHER_HANDLE c, byte *outbuf, byte *inbuf, unsigned nbytes )
 	int i;
 	/* encrypt the IV (and save the current one) */
 	memcpy( c->lastiv, c->iv, STD_BLOCKSIZE );
-	(*c->encrypt)( &c->c.context, c->iv, c->iv );
+	(*c->encrypt)( &c->context, c->iv, c->iv );
 	/* XOR the input with the IV and store input into IV */
 	for(ivp=c->iv,i=0; i < STD_BLOCKSIZE; i++ )
 	    *outbuf++ = (*ivp++ ^= *inbuf++);
@@ -296,7 +407,7 @@ do_cfb_encrypt( CIPHER_HANDLE c, byte *outbuf, byte *inbuf, unsigned nbytes )
     if( nbytes ) { /* process the remaining bytes */
 	/* encrypt the IV (and save the current one) */
 	memcpy( c->lastiv, c->iv, STD_BLOCKSIZE );
-	(*c->encrypt)( &c->c.context, c->iv, c->iv );
+	(*c->encrypt)( &c->context, c->iv, c->iv );
 	c->unused = STD_BLOCKSIZE;
 	/* and apply the xor */
 	c->unused -= nbytes;
@@ -305,7 +416,6 @@ do_cfb_encrypt( CIPHER_HANDLE c, byte *outbuf, byte *inbuf, unsigned nbytes )
     }
 }
 
-
 static void
 do_cfb_decrypt( CIPHER_HANDLE c, byte *outbuf, byte *inbuf, unsigned nbytes )
 {
@@ -340,7 +450,7 @@ do_cfb_decrypt( CIPHER_HANDLE c, byte *outbuf, byte *inbuf, unsigned nbytes )
 	while( nbytes >= STD_BLOCKSIZE ) {
 	    /* encrypt the IV (and save the current one) */
 	    memcpy( c->lastiv, c->iv, STD_BLOCKSIZE );
-	    (*c->encrypt)( &c->c.context, c->iv, c->iv );
+	    (*c->encrypt)( &c->context, c->iv, c->iv );
 	    ivp = c->iv;
 	    /* XOR the input with the IV and store input into IV */
 	  #if SIZEOF_UNSIGNED_LONG == STD_BLOCKSIZE
@@ -371,6 +481,8 @@ do_cfb_decrypt( CIPHER_HANDLE c, byte *outbuf, byte *inbuf, unsigned nbytes )
 	    #error Please disable the align test.
 	  #endif
 	    nbytes -= STD_BLOCKSIZE;
+	    inbuf  += STD_BLOCKSIZE;
+	    outbuf += STD_BLOCKSIZE;
 	}
     }
     else { /* non aligned version */
@@ -379,7 +491,7 @@ do_cfb_decrypt( CIPHER_HANDLE c, byte *outbuf, byte *inbuf, unsigned nbytes )
 	    int i;
 	    /* encrypt the IV (and save the current one) */
 	    memcpy( c->lastiv, c->iv, STD_BLOCKSIZE );
-	    (*c->encrypt)( &c->c.context, c->iv, c->iv );
+	    (*c->encrypt)( &c->context, c->iv, c->iv );
 	    /* XOR the input with the IV and store input into IV */
 	    for(ivp=c->iv,i=0; i < STD_BLOCKSIZE; i++ ) {
 		temp = *inbuf++;
@@ -394,7 +506,7 @@ do_cfb_decrypt( CIPHER_HANDLE c, byte *outbuf, byte *inbuf, unsigned nbytes )
     if( nbytes ) { /* process the remaining bytes */
 	/* encrypt the IV (and save the current one) */
 	memcpy( c->lastiv, c->iv, STD_BLOCKSIZE );
-	(*c->encrypt)( &c->c.context, c->iv, c->iv );
+	(*c->encrypt)( &c->context, c->iv, c->iv );
 	c->unused = STD_BLOCKSIZE;
 	/* and apply the xor */
 	c->unused -= nbytes;
diff --git a/cipher/des.c b/cipher/des.c
index 47dd00047..53afbc3ca 100644
--- a/cipher/des.c
+++ b/cipher/des.c
@@ -18,10 +18,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-/* Test values:
- *
- */
-
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -31,366 +27,150 @@
 #include "types.h"
 #include "des.h"
 
-/* precomputed S boxes */
-static const u32 ks0[256] = {
-    0xD1310BA6,0x98DFB5AC,0x2FFD72DB,0xD01ADFB7,0xB8E1AFED,0x6A267E96,
-    0xBA7C9045,0xF12C7F99,0x24A19947,0xB3916CF7,0x0801F2E2,0x858EFC16,
-    0x636920D8,0x71574E69,0xA458FEA3,0xF4933D7E,0x0D95748F,0x728EB658,
-    0x718BCD58,0x82154AEE,0x7B54A41D,0xC25A59B5,0x9C30D539,0x2AF26013,
-    0xC5D1B023,0x286085F0,0xCA417918,0xB8DB38EF,0x8E79DCB0,0x603A180E,
-    0x6C9E0E8B,0xB01E8A3E,0xD71577C1,0xBD314B27,0x78AF2FDA,0x55605C60,
-    0xE65525F3,0xAA55AB94,0x57489862,0x63E81440,0x55CA396A,0x2AAB10B6,
-    0xB4CC5C34,0x1141E8CE,0xA15486AF,0x7C72E993,0xB3EE1411,0x636FBC2A,
-    0x2BA9C55D,0x741831F6,0xCE5C3E16,0x9B87931E,0xAFD6BA33,0x6C24CF5C,
-    0x7A325381,0x28958677,0x3B8F4898,0x6B4BB9AF,0xC4BFE81B,0x66282193,
-    0x61D809CC,0xFB21A991,0x487CAC60,0x5DEC8032,0xEF845D5D,0xE98575B1,
-    0xDC262302,0xEB651B88,0x23893E81,0xD396ACC5,0x0F6D6FF3,0x83F44239,
-    0x2E0B4482,0xA4842004,0x69C8F04A,0x9E1F9B5E,0x21C66842,0xF6E96C9A,
-    0x670C9C61,0xABD388F0,0x6A51A0D2,0xD8542F68,0x960FA728,0xAB5133A3,
-    0x6EEF0B6C,0x137A3BE4,0xBA3BF050,0x7EFB2A98,0xA1F1651D,0x39AF0176,
-    0x66CA593E,0x82430E88,0x8CEE8619,0x456F9FB4,0x7D84A5C3,0x3B8B5EBE,
-    0xE06F75D8,0x85C12073,0x401A449F,0x56C16AA6,0x4ED3AA62,0x363F7706,
-    0x1BFEDF72,0x429B023D,0x37D0D724,0xD00A1248,0xDB0FEAD3,0x49F1C09B,
-    0x075372C9,0x80991B7B,0x25D479D8,0xF6E8DEF7,0xE3FE501A,0xB6794C3B,
-    0x976CE0BD,0x04C006BA,0xC1A94FB6,0x409F60C4,0x5E5C9EC2,0x196A2463,
-    0x68FB6FAF,0x3E6C53B5,0x1339B2EB,0x3B52EC6F,0x6DFC511F,0x9B30952C,
-    0xCC814544,0xAF5EBD09,0xBEE3D004,0xDE334AFD,0x660F2807,0x192E4BB3,
-    0xC0CBA857,0x45C8740F,0xD20B5F39,0xB9D3FBDB,0x5579C0BD,0x1A60320A,
-    0xD6A100C6,0x402C7279,0x679F25FE,0xFB1FA3CC,0x8EA5E9F8,0xDB3222F8,
-    0x3C7516DF,0xFD616B15,0x2F501EC8,0xAD0552AB,0x323DB5FA,0xFD238760,
-    0x53317B48,0x3E00DF82,0x9E5C57BB,0xCA6F8CA0,0x1A87562E,0xDF1769DB,
-    0xD542A8F6,0x287EFFC3,0xAC6732C6,0x8C4F5573,0x695B27B0,0xBBCA58C8,
-    0xE1FFA35D,0xB8F011A0,0x10FA3D98,0xFD2183B8,0x4AFCB56C,0x2DD1D35B,
-    0x9A53E479,0xB6F84565,0xD28E49BC,0x4BFB9790,0xE1DDF2DA,0xA4CB7E33,
-    0x62FB1341,0xCEE4C6E8,0xEF20CADA,0x36774C01,0xD07E9EFE,0x2BF11FB4,
-    0x95DBDA4D,0xAE909198,0xEAAD8E71,0x6B93D5A0,0xD08ED1D0,0xAFC725E0,
-    0x8E3C5B2F,0x8E7594B7,0x8FF6E2FB,0xF2122B64,0x8888B812,0x900DF01C,
-    0x4FAD5EA0,0x688FC31C,0xD1CFF191,0xB3A8C1AD,0x2F2F2218,0xBE0E1777,
-    0xEA752DFE,0x8B021FA1,0xE5A0CC0F,0xB56F74E8,0x18ACF3D6,0xCE89E299,
-    0xB4A84FE0,0xFD13E0B7,0x7CC43B81,0xD2ADA8D9,0x165FA266,0x80957705,
-    0x93CC7314,0x211A1477,0xE6AD2065,0x77B5FA86,0xC75442F5,0xFB9D35CF,
-    0xEBCDAF0C,0x7B3E89A0,0xD6411BD3,0xAE1E7E49,0x00250E2D,0x2071B35E,
-    0x226800BB,0x57B8E0AF,0x2464369B,0xF009B91E,0x5563911D,0x59DFA6AA,
-    0x78C14389,0xD95A537F,0x207D5BA2,0x02E5B9C5,0x83260376,0x6295CFA9,
-    0x11C81968,0x4E734A41,0xB3472DCA,0x7B14A94A,0x1B510052,0x9A532915,
-    0xD60F573F,0xBC9BC6E4,0x2B60A476,0x81E67400,0x08BA6FB5,0x571BE91F,
-    0xF296EC6B,0x2A0DD915,0xB6636521,0xE7B9F9B6,0xFF34052E,0xC5855664,
-    0x53B02D5D,0xA99F8FA1,0x08BA4799,0x6E85076A };
 
-static const u32 ks1[256] = {
-    0x4B7A70E9,0xB5B32944,0xDB75092E,0xC4192623,0xAD6EA6B0,0x49A7DF7D,
-    0x9CEE60B8,0x8FEDB266,0xECAA8C71,0x699A17FF,0x5664526C,0xC2B19EE1,
-    0x193602A5,0x75094C29,0xA0591340,0xE4183A3E,0x3F54989A,0x5B429D65,
-    0x6B8FE4D6,0x99F73FD6,0xA1D29C07,0xEFE830F5,0x4D2D38E6,0xF0255DC1,
-    0x4CDD2086,0x8470EB26,0x6382E9C6,0x021ECC5E,0x09686B3F,0x3EBAEFC9,
-    0x3C971814,0x6B6A70A1,0x687F3584,0x52A0E286,0xB79C5305,0xAA500737,
-    0x3E07841C,0x7FDEAE5C,0x8E7D44EC,0x5716F2B8,0xB03ADA37,0xF0500C0D,
-    0xF01C1F04,0x0200B3FF,0xAE0CF51A,0x3CB574B2,0x25837A58,0xDC0921BD,
-    0xD19113F9,0x7CA92FF6,0x94324773,0x22F54701,0x3AE5E581,0x37C2DADC,
-    0xC8B57634,0x9AF3DDA7,0xA9446146,0x0FD0030E,0xECC8C73E,0xA4751E41,
-    0xE238CD99,0x3BEA0E2F,0x3280BBA1,0x183EB331,0x4E548B38,0x4F6DB908,
-    0x6F420D03,0xF60A04BF,0x2CB81290,0x24977C79,0x5679B072,0xBCAF89AF,
-    0xDE9A771F,0xD9930810,0xB38BAE12,0xDCCF3F2E,0x5512721F,0x2E6B7124,
-    0x501ADDE6,0x9F84CD87,0x7A584718,0x7408DA17,0xBC9F9ABC,0xE94B7D8C,
-    0xEC7AEC3A,0xDB851DFA,0x63094366,0xC464C3D2,0xEF1C1847,0x3215D908,
-    0xDD433B37,0x24C2BA16,0x12A14D43,0x2A65C451,0x50940002,0x133AE4DD,
-    0x71DFF89E,0x10314E55,0x81AC77D6,0x5F11199B,0x043556F1,0xD7A3C76B,
-    0x3C11183B,0x5924A509,0xF28FE6ED,0x97F1FBFA,0x9EBABF2C,0x1E153C6E,
-    0x86E34570,0xEAE96FB1,0x860E5E0A,0x5A3E2AB3,0x771FE71C,0x4E3D06FA,
-    0x2965DCB9,0x99E71D0F,0x803E89D6,0x5266C825,0x2E4CC978,0x9C10B36A,
-    0xC6150EBA,0x94E2EA78,0xA5FC3C53,0x1E0A2DF4,0xF2F74EA7,0x361D2B3D,
-    0x1939260F,0x19C27960,0x5223A708,0xF71312B6,0xEBADFE6E,0xEAC31F66,
-    0xE3BC4595,0xA67BC883,0xB17F37D1,0x018CFF28,0xC332DDEF,0xBE6C5AA5,
-    0x65582185,0x68AB9802,0xEECEA50F,0xDB2F953B,0x2AEF7DAD,0x5B6E2F84,
-    0x1521B628,0x29076170,0xECDD4775,0x619F1510,0x13CCA830,0xEB61BD96,
-    0x0334FE1E,0xAA0363CF,0xB5735C90,0x4C70A239,0xD59E9E0B,0xCBAADE14,
-    0xEECC86BC,0x60622CA7,0x9CAB5CAB,0xB2F3846E,0x648B1EAF,0x19BDF0CA,
-    0xA02369B9,0x655ABB50,0x40685A32,0x3C2AB4B3,0x319EE9D5,0xC021B8F7,
-    0x9B540B19,0x875FA099,0x95F7997E,0x623D7DA8,0xF837889A,0x97E32D77,
-    0x11ED935F,0x16681281,0x0E358829,0xC7E61FD6,0x96DEDFA1,0x7858BA99,
-    0x57F584A5,0x1B227263,0x9B83C3FF,0x1AC24696,0xCDB30AEB,0x532E3054,
-    0x8FD948E4,0x6DBC3128,0x58EBF2EF,0x34C6FFEA,0xFE28ED61,0xEE7C3C73,
-    0x5D4A14D9,0xE864B7E3,0x42105D14,0x203E13E0,0x45EEE2B6,0xA3AAABEA,
-    0xDB6C4F15,0xFACB4FD0,0xC742F442,0xEF6ABBB5,0x654F3B1D,0x41CD2105,
-    0xD81E799E,0x86854DC7,0xE44B476A,0x3D816250,0xCF62A1F2,0x5B8D2646,
-    0xFC8883A0,0xC1C7B6A3,0x7F1524C3,0x69CB7492,0x47848A0B,0x5692B285,
-    0x095BBF00,0xAD19489D,0x1462B174,0x23820E00,0x58428D2A,0x0C55F5EA,
-    0x1DADF43E,0x233F7061,0x3372F092,0x8D937E41,0xD65FECF1,0x6C223BDB,
-    0x7CDE3759,0xCBEE7460,0x4085F2A7,0xCE77326E,0xA6078084,0x19F8509E,
-    0xE8EFD855,0x61D99735,0xA969A7AA,0xC50C06C2,0x5A04ABFC,0x800BCADC,
-    0x9E447A2E,0xC3453484,0xFDD56705,0x0E1E9EC9,0xDB73DBD3,0x105588CD,
-    0x675FDA79,0xE3674340,0xC5C43465,0x713E38D8,0x3D28F89E,0xF16DFF20,
-    0x153E21E7,0x8FB03D4A,0xE6E39F2B,0xDB83ADF7 };
+static const int IP[64] = {
+  58, 50, 42, 34, 26, 18, 10,  2, 60, 52, 44, 36, 28, 20, 12, 4,
+  62, 54, 46, 38, 30, 22, 14,  6, 64, 56, 48, 40, 32, 24, 16, 8,
+  57, 49, 41, 33, 25, 17,  9,  1, 59, 51, 43, 35, 27, 19, 11, 3,
+  61, 53, 45, 37, 29, 21, 13,  5, 63, 55, 47, 39, 31, 23, 15, 7
+};
 
-static const u32 ks2[256] = {
-    0xE93D5A68,0x948140F7,0xF64C261C,0x94692934,0x411520F7,0x7602D4F7,
-    0xBCF46B2E,0xD4A20068,0xD4082471,0x3320F46A,0x43B7D4B7,0x500061AF,
-    0x1E39F62E,0x97244546,0x14214F74,0xBF8B8840,0x4D95FC1D,0x96B591AF,
-    0x70F4DDD3,0x66A02F45,0xBFBC09EC,0x03BD9785,0x7FAC6DD0,0x31CB8504,
-    0x96EB27B3,0x55FD3941,0xDA2547E6,0xABCA0A9A,0x28507825,0x530429F4,
-    0x0A2C86DA,0xE9B66DFB,0x68DC1462,0xD7486900,0x680EC0A4,0x27A18DEE,
-    0x4F3FFEA2,0xE887AD8C,0xB58CE006,0x7AF4D6B6,0xAACE1E7C,0xD3375FEC,
-    0xCE78A399,0x406B2A42,0x20FE9E35,0xD9F385B9,0xEE39D7AB,0x3B124E8B,
-    0x1DC9FAF7,0x4B6D1856,0x26A36631,0xEAE397B2,0x3A6EFA74,0xDD5B4332,
-    0x6841E7F7,0xCA7820FB,0xFB0AF54E,0xD8FEB397,0x454056AC,0xBA489527,
-    0x55533A3A,0x20838D87,0xFE6BA9B7,0xD096954B,0x55A867BC,0xA1159A58,
-    0xCCA92963,0x99E1DB33,0xA62A4A56,0x3F3125F9,0x5EF47E1C,0x9029317C,
-    0xFDF8E802,0x04272F70,0x80BB155C,0x05282CE3,0x95C11548,0xE4C66D22,
-    0x48C1133F,0xC70F86DC,0x07F9C9EE,0x41041F0F,0x404779A4,0x5D886E17,
-    0x325F51EB,0xD59BC0D1,0xF2BCC18F,0x41113564,0x257B7834,0x602A9C60,
-    0xDFF8E8A3,0x1F636C1B,0x0E12B4C2,0x02E1329E,0xAF664FD1,0xCAD18115,
-    0x6B2395E0,0x333E92E1,0x3B240B62,0xEEBEB922,0x85B2A20E,0xE6BA0D99,
-    0xDE720C8C,0x2DA2F728,0xD0127845,0x95B794FD,0x647D0862,0xE7CCF5F0,
-    0x5449A36F,0x877D48FA,0xC39DFD27,0xF33E8D1E,0x0A476341,0x992EFF74,
-    0x3A6F6EAB,0xF4F8FD37,0xA812DC60,0xA1EBDDF8,0x991BE14C,0xDB6E6B0D,
-    0xC67B5510,0x6D672C37,0x2765D43B,0xDCD0E804,0xF1290DC7,0xCC00FFA3,
-    0xB5390F92,0x690FED0B,0x667B9FFB,0xCEDB7D9C,0xA091CF0B,0xD9155EA3,
-    0xBB132F88,0x515BAD24,0x7B9479BF,0x763BD6EB,0x37392EB3,0xCC115979,
-    0x8026E297,0xF42E312D,0x6842ADA7,0xC66A2B3B,0x12754CCC,0x782EF11C,
-    0x6A124237,0xB79251E7,0x06A1BBE6,0x4BFB6350,0x1A6B1018,0x11CAEDFA,
-    0x3D25BDD8,0xE2E1C3C9,0x44421659,0x0A121386,0xD90CEC6E,0xD5ABEA2A,
-    0x64AF674E,0xDA86A85F,0xBEBFE988,0x64E4C3FE,0x9DBC8057,0xF0F7C086,
-    0x60787BF8,0x6003604D,0xD1FD8346,0xF6381FB0,0x7745AE04,0xD736FCCC,
-    0x83426B33,0xF01EAB71,0xB0804187,0x3C005E5F,0x77A057BE,0xBDE8AE24,
-    0x55464299,0xBF582E61,0x4E58F48F,0xF2DDFDA2,0xF474EF38,0x8789BDC2,
-    0x5366F9C3,0xC8B38E74,0xB475F255,0x46FCD9B9,0x7AEB2661,0x8B1DDF84,
-    0x846A0E79,0x915F95E2,0x466E598E,0x20B45770,0x8CD55591,0xC902DE4C,
-    0xB90BACE1,0xBB8205D0,0x11A86248,0x7574A99E,0xB77F19B6,0xE0A9DC09,
-    0x662D09A1,0xC4324633,0xE85A1F02,0x09F0BE8C,0x4A99A025,0x1D6EFE10,
-    0x1AB93D1D,0x0BA5A4DF,0xA186F20F,0x2868F169,0xDCB7DA83,0x573906FE,
-    0xA1E2CE9B,0x4FCD7F52,0x50115E01,0xA70683FA,0xA002B5C4,0x0DE6D027,
-    0x9AF88C27,0x773F8641,0xC3604C06,0x61A806B5,0xF0177A28,0xC0F586E0,
-    0x006058AA,0x30DC7D62,0x11E69ED7,0x2338EA63,0x53C2DD94,0xC2C21634,
-    0xBBCBEE56,0x90BCB6DE,0xEBFC7DA1,0xCE591D76,0x6F05E409,0x4B7C0188,
-    0x39720A3D,0x7C927C24,0x86E3725F,0x724D9DB9,0x1AC15BB4,0xD39EB8FC,
-    0xED545578,0x08FCA5B5,0xD83D7CD3,0x4DAD0FC4,0x1E50EF5E,0xB161E6F8,
-    0xA28514D9,0x6C51133C,0x6FD5C7E7,0x56E14EC4,0x362ABFCE,0xDDC6C837,
-    0xD79A3234,0x92638212,0x670EFA8E,0x406000E0 };
+/* this is IP^(-1) */
+static const int IPinv[64] = {
+  40,  8, 48, 16, 56, 24, 64, 32, 39,  7, 47, 15, 55, 23, 63, 31,
+  38,  6, 46, 14, 54, 22, 62, 30, 37,  5, 45, 13, 53, 21, 61, 29,
+  36,  4, 44, 12, 52, 20, 60, 28, 35,  3, 43, 11, 51, 19, 59, 27,
+  34,  2, 42, 10, 50, 18, 58, 26, 33,  1, 41,  9, 49, 17, 57, 25
+};
 
-static const u32 ks3[256] = {
-    0x3A39CE37,0xD3FAF5CF,0xABC27737,0x5AC52D1B,0x5CB0679E,0x4FA33742,
-    0xD3822740,0x99BC9BBE,0xD5118E9D,0xBF0F7315,0xD62D1C7E,0xC700C47B,
-    0xB78C1B6B,0x21A19045,0xB26EB1BE,0x6A366EB4,0x5748AB2F,0xBC946E79,
-    0xC6A376D2,0x6549C2C8,0x530FF8EE,0x468DDE7D,0xD5730A1D,0x4CD04DC6,
-    0x2939BBDB,0xA9BA4650,0xAC9526E8,0xBE5EE304,0xA1FAD5F0,0x6A2D519A,
-    0x63EF8CE2,0x9A86EE22,0xC089C2B8,0x43242EF6,0xA51E03AA,0x9CF2D0A4,
-    0x83C061BA,0x9BE96A4D,0x8FE51550,0xBA645BD6,0x2826A2F9,0xA73A3AE1,
-    0x4BA99586,0xEF5562E9,0xC72FEFD3,0xF752F7DA,0x3F046F69,0x77FA0A59,
-    0x80E4A915,0x87B08601,0x9B09E6AD,0x3B3EE593,0xE990FD5A,0x9E34D797,
-    0x2CF0B7D9,0x022B8B51,0x96D5AC3A,0x017DA67D,0xD1CF3ED6,0x7C7D2D28,
-    0x1F9F25CF,0xADF2B89B,0x5AD6B472,0x5A88F54C,0xE029AC71,0xE019A5E6,
-    0x47B0ACFD,0xED93FA9B,0xE8D3C48D,0x283B57CC,0xF8D56629,0x79132E28,
-    0x785F0191,0xED756055,0xF7960E44,0xE3D35E8C,0x15056DD4,0x88F46DBA,
-    0x03A16125,0x0564F0BD,0xC3EB9E15,0x3C9057A2,0x97271AEC,0xA93A072A,
-    0x1B3F6D9B,0x1E6321F5,0xF59C66FB,0x26DCF319,0x7533D928,0xB155FDF5,
-    0x03563482,0x8ABA3CBB,0x28517711,0xC20AD9F8,0xABCC5167,0xCCAD925F,
-    0x4DE81751,0x3830DC8E,0x379D5862,0x9320F991,0xEA7A90C2,0xFB3E7BCE,
-    0x5121CE64,0x774FBE32,0xA8B6E37E,0xC3293D46,0x48DE5369,0x6413E680,
-    0xA2AE0810,0xDD6DB224,0x69852DFD,0x09072166,0xB39A460A,0x6445C0DD,
-    0x586CDECF,0x1C20C8AE,0x5BBEF7DD,0x1B588D40,0xCCD2017F,0x6BB4E3BB,
-    0xDDA26A7E,0x3A59FF45,0x3E350A44,0xBCB4CDD5,0x72EACEA8,0xFA6484BB,
-    0x8D6612AE,0xBF3C6F47,0xD29BE463,0x542F5D9E,0xAEC2771B,0xF64E6370,
-    0x740E0D8D,0xE75B1357,0xF8721671,0xAF537D5D,0x4040CB08,0x4EB4E2CC,
-    0x34D2466A,0x0115AF84,0xE1B00428,0x95983A1D,0x06B89FB4,0xCE6EA048,
-    0x6F3F3B82,0x3520AB82,0x011A1D4B,0x277227F8,0x611560B1,0xE7933FDC,
-    0xBB3A792B,0x344525BD,0xA08839E1,0x51CE794B,0x2F32C9B7,0xA01FBAC9,
-    0xE01CC87E,0xBCC7D1F6,0xCF0111C3,0xA1E8AAC7,0x1A908749,0xD44FBD9A,
-    0xD0DADECB,0xD50ADA38,0x0339C32A,0xC6913667,0x8DF9317C,0xE0B12B4F,
-    0xF79E59B7,0x43F5BB3A,0xF2D519FF,0x27D9459C,0xBF97222C,0x15E6FC2A,
-    0x0F91FC71,0x9B941525,0xFAE59361,0xCEB69CEB,0xC2A86459,0x12BAA8D1,
-    0xB6C1075E,0xE3056A0C,0x10D25065,0xCB03A442,0xE0EC6E0E,0x1698DB3B,
-    0x4C98A0BE,0x3278E964,0x9F1F9532,0xE0D392DF,0xD3A0342B,0x8971F21E,
-    0x1B0A7441,0x4BA3348C,0xC5BE7120,0xC37632D8,0xDF359F8D,0x9B992F2E,
-    0xE60B6F47,0x0FE3F11D,0xE54CDA54,0x1EDAD891,0xCE6279CF,0xCD3E7E6F,
-    0x1618B166,0xFD2C1D05,0x848FD2C5,0xF6FB2299,0xF523F357,0xA6327623,
-    0x93A83531,0x56CCCD02,0xACF08162,0x5A75EBB5,0x6E163697,0x88D273CC,
-    0xDE966292,0x81B949D0,0x4C50901B,0x71C65614,0xE6C6C7BD,0x327A140A,
-    0x45E1D006,0xC3F27B9A,0xC9AA53FD,0x62A80F00,0xBB25BFE2,0x35BDD2F6,
-    0x71126905,0xB2040222,0xB6CBCF7C,0xCD769C2B,0x53113EC0,0x1640E3D3,
-    0x38ABBD60,0x2547ADF0,0xBA38209C,0xF746CE76,0x77AFA1C5,0x20756060,
-    0x85CBFE4E,0x8AE88DD8,0x7AAAF9B0,0x4CF9AA7E,0x1948C25C,0x02FB8A8C,
-    0x01C36AE4,0xD6EBE1F9,0x90D4F869,0xA65CDEA0,0x3F09252D,0xC208E69F,
-    0xB74E6132,0xCE77E25B,0x578FDFE3,0x3AC372E6 };
+static const int E[48] = {
+  32,  1,  2,  3,  4,  5,  4,  5,  6,  7,  8,  9,
+   8,  9, 10, 11, 12, 13, 12, 13, 14, 15, 16, 17,
+  16, 17, 18, 19, 20, 21, 20, 21, 22, 23, 24, 25,
+  24, 25, 26, 27, 28, 29, 28, 29, 30, 31, 32,  1
+};
 
-static const u32 ps[BLOWFISH_ROUNDS+2] = {
-    0x243F6A88,0x85A308D3,0x13198A2E,0x03707344,0xA4093822,0x299F31D0,
-    0x082EFA98,0xEC4E6C89,0x452821E6,0x38D01377,0xBE5466CF,0x34E90C6C,
-    0xC0AC29B7,0xC97C50DD,0x3F84D5B5,0xB5470917,0x9216D5D9,0x8979FB1B };
+static const int P[32] = {
+  16,  7, 20, 21, 29, 12, 28, 17,  1, 15, 23, 26,  5, 18, 31, 10,
+  2,   8, 24, 14, 32, 27,  3,  9, 19, 13, 30,  6, 22, 11,  4, 25
+};
 
+static const int PC1[56] = {
+  57, 49, 41, 33, 25, 17,  9, 1, 58, 50, 42, 34, 26, 18,
+  10,  2, 59, 51, 43, 35, 27, 19, 11,  3, 60, 52, 44, 36,
+  63, 55, 47, 39, 31, 23, 15,  7, 62, 54, 46, 38, 30, 22,
+  14,  6, 61, 53, 45, 37, 29, 21, 13,  5, 28, 20, 12,  4
+};
 
+static const int PC2[48] = {
+  14, 17, 11, 24,  1,  5,  3, 28, 15,  6, 21, 10,
+  23, 19, 12,  4, 26,  8, 16,  7, 27, 20, 13,  2,
+  41, 52, 31, 37, 47, 55, 30, 40, 51, 45, 33, 48,
+  44, 49, 39, 56, 34, 53, 46, 42, 50, 36, 29, 32
+};
 
-#if BLOWFISH_ROUNDS != 16
-static inline u32
-function_F( BLOWFISH_context *bc, u32 x )
-{
-    u16 a, b, c, d;
-
-  #ifdef BIG_ENDIAN_HOST
-    a = ((byte*)&x)[0];
-    b = ((byte*)&x)[1];
-    c = ((byte*)&x)[2];
-    d = ((byte*)&x)[3];
-  #else
-    a = ((byte*)&x)[3];
-    b = ((byte*)&x)[2];
-    c = ((byte*)&x)[1];
-    d = ((byte*)&x)[0];
-  #endif
-
-    return ((bc->s0[a] + bc->s1[b]) ^ bc->s2[c] ) + bc->s3[d];
-}
-#endif
-
-#ifdef BIG_ENDIAN_HOST
-  #define F(x) ((( s0[((byte*)&x)[0]] + s1[((byte*)&x)[1]])	 \
-		   ^ s2[((byte*)&x)[2]]) + s3[((byte*)&x)[3]] )
-#else
-  #define F(x) ((( s0[((byte*)&x)[3]] + s1[((byte*)&x)[2]])	 \
-		   ^ s2[((byte*)&x)[1]]) + s3[((byte*)&x)[0]] )
-#endif
-#define R(l,r,i)  do { l ^= p[i]; r ^= F(l); } while(0)
-
-
-static void
-encrypt(  BLOWFISH_context *bc, u32 *ret_xl, u32 *ret_xr )
-{
-  #if BLOWFISH_ROUNDS == 16
-    u32 xl, xr, *s0, *s1, *s2, *s3, *p;
-
-    xl = *ret_xl;
-    xr = *ret_xr;
-    p = bc->p;
-    s0 = bc->s0;
-    s1 = bc->s1;
-    s2 = bc->s2;
-    s3 = bc->s3;
-
-    R( xl, xr,	0);
-    R( xr, xl,	1);
-    R( xl, xr,	2);
-    R( xr, xl,	3);
-    R( xl, xr,	4);
-    R( xr, xl,	5);
-    R( xl, xr,	6);
-    R( xr, xl,	7);
-    R( xl, xr,	8);
-    R( xr, xl,	9);
-    R( xl, xr, 10);
-    R( xr, xl, 11);
-    R( xl, xr, 12);
-    R( xr, xl, 13);
-    R( xl, xr, 14);
-    R( xr, xl, 15);
-
-    xl ^= p[BLOWFISH_ROUNDS];
-    xr ^= p[BLOWFISH_ROUNDS+1];
-
-    *ret_xl = xr;
-    *ret_xr = xl;
-
-  #else
-    u32 xl, xr, temp, *p;
-    int i;
-
-    xl = *ret_xl;
-    xr = *ret_xr;
-    p = bc->p;
-
-    for(i=0; i < BLOWFISH_ROUNDS; i++ ) {
-	xl ^= p[i];
-	xr ^= function_F(bc, xl);
-	temp = xl;
-	xl = xr;
-	xr = temp;
+/* S-boxes */
+static const int sbox[8][4][16]= {
+    { { 14,  4, 13,  1,  2, 15, 11,  8,  3, 10,  6, 12,  5,  9,  0,  7 },
+      {  0, 15,  7,  4, 14,  2, 13,  1, 10,  6, 12, 11,  9,  5,  3,  8 },
+      {  4,  1, 14,  8, 13,  6,  2, 11, 15, 12,  9,  7,  3, 10,  5,  0 },
+      { 15, 12,  8,  2,  4,  9,  1,  7,  5, 11,  3, 14, 10,  0,  6, 13 }
+    },
+    { { 15,  1,  8, 14,  6, 11,  3,  4,  9,  7,  2, 13, 12,  0,  5, 10 },
+      {  3, 13,  4,  7, 15,  2,  8, 14, 12,  0,  1, 10,  6,  9, 11,  5 },
+      {  0, 14,  7, 11, 10,  4, 13,  1,  5,  8, 12,  6,  9,  3,  2, 15 },
+      { 13,  8, 10,  1,  3, 15,  4,  2, 11,  6,  7, 12,  0,  5, 14,  9 }
+    },
+    { { 10,  0,  9, 14,  6,  3, 15,  5,  1, 13, 12,  7, 11,  4,  2,  8 },
+      { 13,  7,  0,  9,  3,  4,  6, 10,  2,  8,  5, 14, 12, 11, 15,  1 },
+      { 13,  6,  4,  9,  8, 15,  3,  0, 11,  1,  2, 12,  5, 10, 14,  7 },
+      {  1, 10, 13,  0,  6,  9,  8,  7,  4, 15, 14,  3, 11,  5,  2, 12 }
+    },
+    { {  7, 13, 14,  3,  0,  6,  9, 10,  1,  2,  8,  5, 11, 12,  4, 15 },
+      { 13,  8, 11,  5,  6, 15,  0,  3,  4,  7,  2, 12,  1, 10, 14,  9 },
+      { 10,  6,  9,  0, 12, 11,  7, 13, 15,  1,  3, 14,  5,  2,  8,  4 },
+      {  3, 15,  0,  6, 10,  1, 13,  8,  9,  4,  5, 11, 12,  7,  2, 14 }
+    },
+    { {  2, 12,  4,  1,  7, 10, 11,  6,  8,  5,  3, 15, 13,  0, 14,  9 },
+      { 14, 11,  2, 12,  4,  7, 13,  1,  5,  0, 15, 10,  3,  9,  8,  6 },
+      {  4,  2,  1, 11, 10, 13,  7,  8, 15,  9, 12,  5,  6,  3,  0, 14 },
+      { 11,  8, 12,  7,  1, 14,  2, 13,  6, 15,  0,  9, 10,  4,  5,  3 }
+    },
+    { { 12,  1, 10, 15,  9,  2,  6,  8,  0, 13,  3,  4, 14,  7,  5, 11 },
+      { 10, 15,  4,  2,  7, 12,  9,  5,  6,  1, 13, 14,  0, 11,  3,  8 },
+      {  9, 14, 15,  5,  2,  8, 12,  3,  7,  0,  4, 10,  1, 13, 11,  6 },
+      {  4,  3,  2, 12,  9,  5, 15, 10, 11, 14,  1,  7,  6,  0,  8, 13 }
+    },
+    { {  4, 11,  2, 14, 15,  0,  8, 13,  3, 12,  9,  7,  5, 10,  6,  1 },
+      { 13,  0, 11,  7,  4,  9,  1, 10, 14,  3,  5, 12,  2, 15,  8,  6 },
+      {  1,  4, 11, 13, 12,  3,  7, 14, 10, 15,  6,  8,  0,  5,  9,  2 },
+      {  6, 11, 13,  8,  1,  4, 10,  7,  9,  5,  0, 15, 14,  2,  3, 12 }
+    },
+    { { 13,  2,  8,  4,  6, 15, 11,  1, 10,  9,  3, 14,  5,  0, 12,  7 },
+      {  1, 15, 13,  8, 10,  3,  7,  4, 12,  5,  6, 11,  0, 14,  9,  2 },
+      {  7, 11,  4,  1,  9, 12, 14,  2,  0,  6, 10, 13, 15,  3,  5,  8 },
+      {  2,  1, 14,  7,  4, 10,  8, 13, 15, 12,  9,  0,  3,  5,  6, 11 }
     }
-    temp = xl;
-    xl = xr;
-    xr = temp;
+};
 
-    xr ^= p[BLOWFISH_ROUNDS];
-    xl ^= p[BLOWFISH_ROUNDS+1];
+/*
+ * How much to rotate each 28 bit half of the pc1 permutated
+ *  56 bit key before using pc2 to give the i' key
+ */
+static const int rots[16] = {
+  1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1
+};
 
-    *ret_xl = xl;
-    *ret_xr = xr;
-  #endif
+
+struct ip_table { u32 l, r };
+
+
+
+static struct ip_table *ip_tbl, *ipinv_tbl;
+
+static struct ip_table *
+make_ip_table( int *bitno )
+{
+    struct ip_table *ip = m_alloc( 8*256* sizeof *ip );
+    for(i=0; i < 8; i++ )
+
+    return ip;
 }
 
 
 static void
-decrypt(  BLOWFISH_context *bc, u32 *ret_xl, u32 *ret_xr )
+gen_tables()
 {
-  #if BLOWFISH_ROUNDS == 16
-    u32 xl, xr, *s0, *s1, *s2, *s3, *p;
-
-    xl = *ret_xl;
-    xr = *ret_xr;
-    p = bc->p;
-    s0 = bc->s0;
-    s1 = bc->s1;
-    s2 = bc->s2;
-    s3 = bc->s3;
-
-    R( xl, xr, 17);
-    R( xr, xl, 16);
-    R( xl, xr, 15);
-    R( xr, xl, 14);
-    R( xl, xr, 13);
-    R( xr, xl, 12);
-    R( xl, xr, 11);
-    R( xr, xl, 10);
-    R( xl, xr,	9);
-    R( xr, xl,	8);
-    R( xl, xr,	7);
-    R( xr, xl,	6);
-    R( xl, xr,	5);
-    R( xr, xl,	4);
-    R( xl, xr,	3);
-    R( xr, xl,	2);
-
-    xl ^= p[1];
-    xr ^= p[0];
-
-    *ret_xl = xr;
-    *ret_xr = xl;
-
-  #else
-    u32 xl, xr, temp, *p;
-    int i;
-
-    xl = *ret_xl;
-    xr = *ret_xr;
-    p = bc->p;
-
-    for(i=BLOWFISH_ROUNDS+1; i > 1; i-- ) {
-	xl ^= p[i];
-	xr ^= function_F(bc, xl);
-	temp = xl;
-	xl = xr;
-	xr = temp;
-    }
-
-    temp = xl;
-    xl = xr;
-    xr = temp;
-
-    xr ^= p[1];
-    xl ^= p[0];
-
-    *ret_xl = xl;
-    *ret_xr = xr;
-  #endif
+    ip_tbl = make_ip_table( IP );
+    ipinv_tbl = make_ip_table( IPinv );
 }
 
-#undef F
-#undef R
+
+
+
+
+
 
 void
-des_encrypt_block( BLOWFISH_context *bc, byte *outbuf, byte *inbuf )
+des_encrypt_block( DES_context *bc, byte *outbuf, byte *inbuf )
 {
-    u32 d1, d2;
+    u32 l, r;
+
+    data =   inbuf[0] << 56 | inbuf[1] << 48 | inbuf[2] << 40 | inbuf[3] << 32
+	   | inbuf[4] << 24 | inbuf[5] << 16 | inbuf[6] <<  8 | inbuf[7];
+
+#define IP(L, R, B) \
+	L  = ip[0][B[0]].l; R  = ip[0][B[0]].r; \
+	L |= ip[1][B[1]].l; R |= ip[1][B[1]].r; \
+	L |= ip[2][B[2]].l; R |= ip[2][B[2]].r; \
+	L |= ip[3][B[3]].l; R |= ip[3][B[3]].r; \
+	L |= ip[4][B[4]].l; R |= ip[4][B[4]].r; \
+	L |= ip[5][B[5]].l; R |= ip[5][B[5]].r; \
+	L |= ip[6][B[6]].l; R |= ip[6][B[6]].r; \
+	L |= ip[7][B[7]].l; R |= ip[7][B[7]].r
+
+
 
-    d1 = inbuf[0] << 24 | inbuf[1] << 16 | inbuf[2] << 8 | inbuf[3];
-    d2 = inbuf[4] << 24 | inbuf[5] << 16 | inbuf[6] << 8 | inbuf[7];
     encrypt( bc, &d1, &d2 );
     outbuf[0] = (d1 >> 24) & 0xff;
     outbuf[1] = (d1 >> 16) & 0xff;
@@ -425,28 +205,6 @@ des_decrypt_block( BLOWFISH_context *bc, byte *outbuf, byte *inbuf )
 static void
 selftest()
 {
-    BLOWFISH_context c;
-    byte plain[] = "BLOWFISH";
-    byte buffer[8];
-    byte plain3[] = { 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10 };
-    byte key3[] = { 0x41, 0x79, 0x6E, 0xA0, 0x52, 0x61, 0x6E, 0xE4 };
-    byte cipher3[] = { 0xE1, 0x13, 0xF4, 0x10, 0x2C, 0xFC, 0xCE, 0x43 };
-
-    blowfish_setkey( &c, "abcdefghijklmnopqrstuvwxyz", 26 );
-    blowfish_encrypt_block( &c, buffer, plain );
-    if( memcmp( buffer, "\x32\x4E\xD0\xFE\xF4\x13\xA2\x03", 8 ) )
-	log_error("wrong blowfish encryption\n");
-    blowfish_decrypt_block( &c, buffer, buffer );
-    if( memcmp( buffer, plain, 8 ) )
-	log_bug("blowfish failed\n");
-
-    blowfish_setkey( &c, key3, 8 );
-    blowfish_encrypt_block( &c, buffer, plain3 );
-    if( memcmp( buffer, cipher3, 8 ) )
-	log_error("wrong blowfish encryption (3)\n");
-    blowfish_decrypt_block( &c, buffer, buffer );
-    if( memcmp( buffer, plain3, 8 ) )
-	log_bug("blowfish failed (3)\n");
 }
 
 
@@ -459,67 +217,6 @@ des_3des_setkey( DES_context *c, byte *key, unsigned keylen )
 void
 des_setkey( DES_context *c, byte *key, unsigned keylen )
 {
-    int i, j;
-    u32 data, datal, datar;
-    static int initialized;
-
-    if( !initialized ) {
-	initialized = 1;
-	selftest();
-    }
-    c->tripledes = 0;
-
-    for(i=0; i < BLOWFISH_ROUNDS+2; i++ )
-	c->p[i] = ps[i];
-    for(i=0; i < 256; i++ ) {
-	c->s0[i] = ks0[i];
-	c->s1[i] = ks1[i];
-	c->s2[i] = ks2[i];
-	c->s3[i] = ks3[i];
-    }
-
-    for(i=j=0; i < BLOWFISH_ROUNDS+2; i++ ) {
-      #ifdef BIG_ENDIAN_HOST
-	((byte*)&data)[0] = key[j];
-	((byte*)&data)[1] = key[(j+1)%keylen];
-	((byte*)&data)[2] = key[(j+2)%keylen];
-	((byte*)&data)[3] = key[(j+3)%keylen];
-      #else
-	((byte*)&data)[3] = key[j];
-	((byte*)&data)[2] = key[(j+1)%keylen];
-	((byte*)&data)[1] = key[(j+2)%keylen];
-	((byte*)&data)[0] = key[(j+3)%keylen];
-      #endif
-	c->p[i] ^= data;
-	j = (j+4) % keylen;
-    }
-
-    datal = datar = 0;
-    for(i=0; i < BLOWFISH_ROUNDS+2; i += 2 ) {
-	encrypt( c, &datal, &datar );
-	c->p[i]   = datal;
-	c->p[i+1] = datar;
-    }
-    for(i=0; i < 256; i += 2 )	{
-	encrypt( c, &datal, &datar );
-	c->s0[i]   = datal;
-	c->s0[i+1] = datar;
-    }
-    for(i=0; i < 256; i += 2 )	{
-	encrypt( c, &datal, &datar );
-	c->s1[i]   = datal;
-	c->s1[i+1] = datar;
-    }
-    for(i=0; i < 256; i += 2 )	{
-	encrypt( c, &datal, &datar );
-	c->s2[i]   = datal;
-	c->s2[i+1] = datar;
-    }
-    for(i=0; i < 256; i += 2 )	{
-	encrypt( c, &datal, &datar );
-	c->s3[i]   = datal;
-	c->s3[i+1] = datar;
-    }
 }
 
 
diff --git a/cipher/dynload.c b/cipher/dynload.c
new file mode 100644
index 000000000..19e035d9d
--- /dev/null
+++ b/cipher/dynload.c
@@ -0,0 +1,30 @@
+/* dynload.c - load cipher extensions
+ *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *
+ * This file is part of GNUPG.
+ *
+ * GNUPG 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.
+ *
+ * GNUPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+
+
+#include <config.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "dynload.h"
+
+
+
diff --git a/cipher/dynload.h b/cipher/dynload.h
new file mode 100644
index 000000000..a839a91b3
--- /dev/null
+++ b/cipher/dynload.h
@@ -0,0 +1,24 @@
+/* dynload.5
+ *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *
+ * This file is part of GNUPG.
+ *
+ * GNUPG 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.
+ *
+ * GNUPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+#ifndef G10_CIPHER_DYNLOAD_H
+#define G10_CIPHER_DYNLOAD_H
+
+
+#endif /*G10_CIPHER_DYNLOAD_H*/
diff --git a/cipher/rand-unix.c b/cipher/rand-unix.c
index c0b7bc702..93afba13a 100644
--- a/cipher/rand-unix.c
+++ b/cipher/rand-unix.c
@@ -124,15 +124,22 @@ read_random_source( byte *buffer, size_t length, int level )
     int n;
     int warn=0;
 
-    if( level == 2 ) {
+    if( level >= 2 ) {
 	if( fd_random == -1 )
 	    fd_random = open_device( "/dev/random", 8 );
 	fd = fd_random;
     }
+    else if( level == 1 ) {
+	if( fd_urandom == -1 )
+	    fd_urandom = open_device( "/dev/urandom", 9 );
+	fd = fd_urandom;
+    }
     else {
-	/* fixme: we should use a simpler one for level 0,
-	 * because reading from /dev/urandom removes entropy
-	 * and the next read on /dev/random may have to wait */
+	/* This is level 0, which only yields simple random bytes.
+	 * We do not use /dev/urandom as this would remove entropy
+	 * from the kernel entropy pool */
+       /* FIXME !!!! */
+
 	if( fd_urandom == -1 )
 	    fd_urandom = open_device( "/dev/urandom", 9 );
 	fd = fd_urandom;
diff --git a/cipher/tiger.c b/cipher/tiger.c
index 69770258c..c43226445 100644
--- a/cipher/tiger.c
+++ b/cipher/tiger.c
@@ -703,10 +703,10 @@ transform( TIGER_CONTEXT *hd, byte *data )
     u64 x[8];
   #ifdef BIG_ENDIAN_HOST
     #define MKWORD(d,n) \
-		(  ((u64)(d)[8*(n)+0]) << 56 | ((u64)(d)[8*(n)+1]) << 48  \
-		 | ((u64)(d)[8*(n)+2]) << 40 | ((u64)(d)[8*(n)+3]) << 32  \
-		 | ((u64)(d)[8*(n)+4]) << 24 | ((u64)(d)[8*(n)+5]) << 16  \
-		 | ((u64)(d)[8*(n)+6]) << 8  | ((u64)(d)[8*(n)+7])	 )
+		(  ((u64)(d)[8*(n)+7]) << 56 | ((u64)(d)[8*(n)+6]) << 48  \
+		 | ((u64)(d)[8*(n)+5]) << 40 | ((u64)(d)[8*(n)+4]) << 32  \
+		 | ((u64)(d)[8*(n)+3]) << 24 | ((u64)(d)[8*(n)+2]) << 16  \
+		 | ((u64)(d)[8*(n)+1]) << 8  | ((u64)(d)[8*(n)	])	 )
     x[0] = MKWORD(data, 0);
     x[1] = MKWORD(data, 1);
     x[2] = MKWORD(data, 2);
diff --git a/config.h.in b/config.h.in
index 24525d8e6..3be8f18f1 100644
--- a/config.h.in
+++ b/config.h.in
@@ -120,11 +120,9 @@
 /* defined if we have a /dev/random and /dev/urandom */
 #undef HAVE_DEV_RANDOM
 
-/* RSA is only compiled in if you have these files. You can use
- * RSA without any restrictions, if your not in the U.S. or
- * wait until sep 20, 2000
- */
-#undef HAVE_RSA_CIPHER
+#undef USE_DYNAMIC_LINKING
+#undef HAVE_DL_DLOPEN
+#undef HAVE_DLD_DLD_LINK
 
 /* The number of bytes in a unsigned int.  */
 #undef SIZEOF_UNSIGNED_INT
@@ -237,6 +235,12 @@
 /* Define if you have the <zlib.h> header file.  */
 #undef HAVE_ZLIB_H
 
+/* Define if you have the dl library (-ldl).  */
+#undef HAVE_LIBDL
+
+/* Define if you have the dld library (-ldld).  */
+#undef HAVE_LIBDLD
+
 /* Define if you have the i library (-li).  */
 #undef HAVE_LIBI
 
diff --git a/configure.in b/configure.in
index 245f91e05..7a3093bfd 100644
--- a/configure.in
+++ b/configure.in
@@ -111,6 +111,19 @@ AC_DEFINE_UNQUOTED(PRINTABLE_OS_NAME, "$PRINTABLE_OS_NAME")
 
 dnl Checks for libraries.
 
+AC_CHECK_LIB(dl,dlopen)
+if test "$ac_cv_lib_dl_dlopen" = "yes"; then
+  AC_DEFINE(USE_DYNAMIC_LINKING)
+  AC_DEFINE(HAVE_DL_DLOPEN)
+else
+AC_CHECK_LIB(dld,dld_link)
+if test "$ac_cv_lib_dld_dld_link" = "yes"; then
+  AC_DEFINE(USE_DYNAMIC_LINKING)
+  AC_DEFINE(HAVE_DLD_DLD_LINK)
+fi
+fi
+
+
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS(unistd.h)
@@ -214,20 +227,6 @@ fi
 AC_SUBST(ZLIBS)
 
 
-dnl checking whether we have other cipher source files
-CIPHER_EXTRA_OBJS=""
-CIPHER_EXTRA_DIST=""
-AC_CACHE_CHECK(for extra cipher modules, ac_cv_have_rsa_cipher,
-[if test -f $srcdir/cipher/rsa.c && test -f $srcdir/cipher/rsa.h; then
-  ac_cv_have_rsa_cipher=yes; else ac_cv_have_rsa_cipher=no; fi])
-if test $ac_cv_have_rsa_cipher = yes; then
-    AC_DEFINE(HAVE_RSA_CIPHER)
-    CIPHER_EXTRA_OBJS="rsa.o"
-    CIPHER_EXTRA_DIST="rsa.c rsa.h"
-fi
-AC_SUBST(CIPHER_EXTRA_OBJS)
-AC_SUBST(CIPHER_EXTRA_DIST)
-
 AM_GNU_GETTEXT
 G10_LOCALEDIR="$g10_prefix/$DATADIRNAME/locale"
 AC_SUBST(G10_LOCALEDIR)
diff --git a/doc/DETAILS b/doc/DETAILS
index d306eb361..7ff8e2420 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -264,6 +264,8 @@ There is one enhancement used with the old style packet headers:
 
 
 
+
+
 Keyserver Message Format
 -------------------------
 
diff --git a/g10/ChangeLog b/g10/ChangeLog
index a3037a618..9b42cb3d8 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun  8 22:23:37 1998  Werner Koch  (wk@isil.d.shuttle.de)
+
+	* seckey-cert.c (do_check): Removed cipher constants
+	(protect_secret_key): Ditto.
+
 Fri May 29 10:00:28 1998  Werner Koch  (wk@isil.d.shuttle.de)
 
 	* trustdb.c (query_trust_info): New.
diff --git a/g10/Makefile.in b/g10/Makefile.in
index 91473ab37..bc306754b 100644
--- a/g10/Makefile.in
+++ b/g10/Makefile.in
@@ -64,8 +64,6 @@ target_triplet = @target@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
-CIPHER_EXTRA_DIST = @CIPHER_EXTRA_DIST@
-CIPHER_EXTRA_OBJS = @CIPHER_EXTRA_OBJS@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 G10_LOCALEDIR = @G10_LOCALEDIR@
diff --git a/g10/build-packet.c b/g10/build-packet.c
index a37aba55c..33709e7da 100644
--- a/g10/build-packet.c
+++ b/g10/build-packet.c
@@ -575,6 +575,7 @@ build_sig_subpkt( PKT_signature *sig, sigsubpkttype_t type,
 
     switch( type ) {
       case SIGSUBPKT_SIG_CREATED:
+      case SIGSUBPKT_PRIV_ADD_SIG:
 	       hashed = 1; break;
       default: hashed = 0; break;
     }
diff --git a/g10/keylist.c b/g10/keylist.c
index 554fb1f9c..b6e219723 100644
--- a/g10/keylist.c
+++ b/g10/keylist.c
@@ -319,6 +319,7 @@ list_one( const char *name, int secret )
 	    if( opt.with_colons )
 		printf(":%02x:", sig->sig_class );
 	    putchar('\n');
+	    /* FIXME: check or list other sigs here (subpkt PRIV_ADD_SIG)*/
 	}
     }
     if( !any ) {/* oops, no user id */
diff --git a/g10/packet.h b/g10/packet.h
index 7f38cd5cf..3fc1ea280 100644
--- a/g10/packet.h
+++ b/g10/packet.h
@@ -234,7 +234,8 @@ typedef enum {
     SIGSUBPKT_PRIMARY_UID  =25, /* primary user id */
     SIGSUBPKT_POLICY	   =26, /* policy URL */
     SIGSUBPKT_KEY_FLAGS    =27, /* key flags */
-    SIGSUBPKT_SIGNERS_UID  =28	/* signer's user id */
+    SIGSUBPKT_SIGNERS_UID  =28, /* signer's user id */
+    SIGSUBPKT_PRIV_ADD_SIG =101 /* signatur is also valid for this uid */
 } sigsubpkttype_t;
 
 
diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index 14d4c7b1c..e1f023261 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -615,6 +615,7 @@ parse_sig_subpkt( const byte *buffer, sigsubpkttype_t reqtype, size_t *ret_n )
 	   : type == SIGSUBPKT_POLICY	   ? "policy URL"
 	   : type == SIGSUBPKT_KEY_FLAGS   ? "key flags"
 	   : type == SIGSUBPKT_SIGNERS_UID ? "signer's user id"
+	   : type == SIGSUBPKT_PRIV_ADD_SIG? "signs additional user id"
 			      : "?");
 	}
 	else if( type == reqtype )
@@ -636,6 +637,13 @@ parse_sig_subpkt( const byte *buffer, sigsubpkttype_t reqtype, size_t *ret_n )
 	if( n < 8 )
 	    break;
 	return buffer;
+      case SIGSUBPKT_PRIV_ADD_SIG:
+	/* because we use private data, we check the GNUPG marker */
+	if( n < 24 )
+	    break;
+	if( buffer[0] != 'G' || buffer[1] != 'P' || buffer[2] != 'G' )
+	    return NULL;
+	return buffer+3;
       default: BUG(); /* not yet needed */
     }
     log_error("subpacket of type %d too short\n", type);
diff --git a/g10/pubkey-enc.c b/g10/pubkey-enc.c
index d9503265d..8f15057ec 100644
--- a/g10/pubkey-enc.c
+++ b/g10/pubkey-enc.c
@@ -127,7 +127,7 @@ get_session_key( PKT_pubkey_enc *k, DEK *dek )
 	    { rc = G10ERR_WRONG_SECKEY; goto leave; }
 	break;
       case CIPHER_ALGO_BLOWFISH:
-      case CIPHER_ALGO_CAST:
+      case CIPHER_ALGO_CAST5:
 	if( dek->keylen != 16 )
 	    { rc = G10ERR_WRONG_SECKEY; goto leave; }
 	break;
diff --git a/g10/seckey-cert.c b/g10/seckey-cert.c
index 6f0dc1ae9..3373bd35e 100644
--- a/g10/seckey-cert.c
+++ b/g10/seckey-cert.c
@@ -49,112 +49,106 @@ do_check( PKT_secret_cert *cert )
 	PKT_secret_cert *save_cert;
 	char save_iv[8];
 
-	switch( cert->protect.algo ) {
-	  case CIPHER_ALGO_NONE: BUG(); break;
-	  case CIPHER_ALGO_BLOWFISH160:
-	  case CIPHER_ALGO_BLOWFISH:
-	  case CIPHER_ALGO_CAST:
-	    keyid_from_skc( cert, keyid );
-	    dek = passphrase_to_dek( keyid, cert->protect.algo,
-				     &cert->protect.s2k, 0 );
-	    cipher_hd = cipher_open( cert->protect.algo,
-				     CIPHER_MODE_AUTO_CFB, 1);
-	    cipher_setkey( cipher_hd, dek->key, dek->keylen );
-	    cipher_setiv( cipher_hd, NULL );
-	    m_free(dek); /* pw is in secure memory, so m_free() burns it */
-	    save_cert = copy_secret_cert( NULL, cert );
-	    memcpy(save_iv, cert->protect.iv, 8 );
-	    cipher_decrypt( cipher_hd, cert->protect.iv, cert->protect.iv, 8 );
-	    switch( cert->pubkey_algo ) {
-	      case PUBKEY_ALGO_ELGAMAL:
-	      case PUBKEY_ALGO_ELGAMAL_E:
-		buffer = mpi_get_secure_buffer( cert->d.elg.x, &nbytes, NULL );
-		cipher_decrypt( cipher_hd, buffer, buffer, nbytes );
-		mpi_set_buffer( cert->d.elg.x, buffer, nbytes, 0 );
-		csum = checksum_mpi( cert->d.elg.x );
-		m_free( buffer );
-		break;
-	      case PUBKEY_ALGO_DSA:
-		buffer = mpi_get_secure_buffer( cert->d.dsa.x, &nbytes, NULL );
-		cipher_decrypt( cipher_hd, buffer, buffer, nbytes );
-		mpi_set_buffer( cert->d.dsa.x, buffer, nbytes, 0 );
-		csum = checksum_mpi( cert->d.dsa.x );
-		m_free( buffer );
-		break;
-	    #ifdef HAVE_RSA_CIPHER
-	      case PUBKEY_ALGO_RSA:
-	      case PUBKEY_ALGO_RSA_E:
-	      case PUBKEY_ALGO_RSA_S:
-		csum = 0;
-		#define X(a) do { \
-		    buffer = mpi_get_secure_buffer( cert->d.rsa.##a,	 \
-						    &nbytes, NULL );	 \
-		    csum += checksum_u16( nbytes*8 );			 \
-		    cipher_decrypt( cipher_hd, buffer, buffer, nbytes ); \
-		    csum += checksum( buffer, nbytes ); 		 \
-		    mpi_set_buffer(cert->d.rsa.##a, buffer, nbytes, 0 ); \
-		    m_free( buffer );					 \
-		   } while(0)
-		X(d);
-		X(p);
-		X(q);
-		X(u);
-		#undef X
-		break;
-	    #endif /* HAVE_RSA_CIPHER */
+	if( cert->protect.algo == CIPHER_ALGO_NONE )
+	    BUG();
+	if( check_cipher_algo( cert->protect.algo ) )
+	    return G10ERR_CIPHER_ALGO; /* unsupported protection algorithm */
+	keyid_from_skc( cert, keyid );
+	dek = passphrase_to_dek( keyid, cert->protect.algo,
+				 &cert->protect.s2k, 0 );
+	cipher_hd = cipher_open( cert->protect.algo,
+				 CIPHER_MODE_AUTO_CFB, 1);
+	cipher_setkey( cipher_hd, dek->key, dek->keylen );
+	cipher_setiv( cipher_hd, NULL );
+	m_free(dek); /* pw is in secure memory, so m_free() burns it */
+	save_cert = copy_secret_cert( NULL, cert );
+	memcpy(save_iv, cert->protect.iv, 8 );
+	cipher_decrypt( cipher_hd, cert->protect.iv, cert->protect.iv, 8 );
+	switch( cert->pubkey_algo ) {
+	  case PUBKEY_ALGO_ELGAMAL:
+	  case PUBKEY_ALGO_ELGAMAL_E:
+	    buffer = mpi_get_secure_buffer( cert->d.elg.x, &nbytes, NULL );
+	    cipher_decrypt( cipher_hd, buffer, buffer, nbytes );
+	    mpi_set_buffer( cert->d.elg.x, buffer, nbytes, 0 );
+	    csum = checksum_mpi( cert->d.elg.x );
+	    m_free( buffer );
+	    break;
+	  case PUBKEY_ALGO_DSA:
+	    buffer = mpi_get_secure_buffer( cert->d.dsa.x, &nbytes, NULL );
+	    cipher_decrypt( cipher_hd, buffer, buffer, nbytes );
+	    mpi_set_buffer( cert->d.dsa.x, buffer, nbytes, 0 );
+	    csum = checksum_mpi( cert->d.dsa.x );
+	    m_free( buffer );
+	    break;
+	#ifdef HAVE_RSA_CIPHER
+	  case PUBKEY_ALGO_RSA:
+	  case PUBKEY_ALGO_RSA_E:
+	  case PUBKEY_ALGO_RSA_S:
+	    csum = 0;
+	    #define X(a) do { \
+		buffer = mpi_get_secure_buffer( cert->d.rsa.##a,     \
+						&nbytes, NULL );     \
+		csum += checksum_u16( nbytes*8 );		     \
+		cipher_decrypt( cipher_hd, buffer, buffer, nbytes ); \
+		csum += checksum( buffer, nbytes );		     \
+		mpi_set_buffer(cert->d.rsa.##a, buffer, nbytes, 0 ); \
+		m_free( buffer );				     \
+	       } while(0)
+	    X(d);
+	    X(p);
+	    X(q);
+	    X(u);
+	    #undef X
+	    break;
+	#endif /* HAVE_RSA_CIPHER */
 
-	      default: BUG();
+	  default: BUG();
+	}
+	cipher_close( cipher_hd );
+	/* now let's see whether we have used the right passphrase */
+	if( csum != cert->csum ) {
+	    if( cert->pubkey_algo == PUBKEY_ALGO_ELGAMAL_E ) {
+		/* very bad kludge to work around an early bug */
+		csum -= checksum_u16( mpi_get_nbits(cert->d.elg.x) );
+		nbytes = mpi_get_nlimbs(cert->d.elg.x) * 4;
+		csum += checksum_u16( nbytes*8 );
+		if( !opt.batch && csum == cert->csum )
+		    log_info("Probably you have an old key - use "
+			 "\"--change-passphrase\" to convert.\n");
 	    }
-	    cipher_close( cipher_hd );
-	    /* now let's see whether we have used the right passphrase */
 	    if( csum != cert->csum ) {
-		if( cert->pubkey_algo == PUBKEY_ALGO_ELGAMAL_E ) {
-		    /* very bad kludge to work around an early bug */
-		    csum -= checksum_u16( mpi_get_nbits(cert->d.elg.x) );
-		    nbytes = mpi_get_nlimbs(cert->d.elg.x) * 4;
-		    csum += checksum_u16( nbytes*8 );
-		    if( !opt.batch && csum == cert->csum )
-			log_info("Probably you have an old key - use "
-			     "\"--change-passphrase\" to convert.\n");
-		}
-		if( csum != cert->csum ) {
-		    copy_secret_cert( cert, save_cert );
-		    free_secret_cert( save_cert );
-		    memcpy( cert->protect.iv, save_iv, 8 );
-		    return G10ERR_BAD_PASS;
-		}
-	    }
-
-	    switch( cert->pubkey_algo ) {
-	      case PUBKEY_ALGO_ELGAMAL_E:
-	      case PUBKEY_ALGO_ELGAMAL:
-		res = elg_check_secret_key( &cert->d.elg );
-		break;
-	      case PUBKEY_ALGO_DSA:
-		res = dsa_check_secret_key( &cert->d.dsa );
-		break;
-	    #ifdef HAVE_RSA_CIPHER
-	      case PUBKEY_ALGO_RSA:
-	      case PUBKEY_ALGO_RSA_E:
-	      case PUBKEY_ALGO_RSA_S:
-		res = rsa_check_secret_key( &cert->d.rsa );
-		break;
-	    #endif
-	      default: BUG();
-	    }
-	    if( !res ) {
 		copy_secret_cert( cert, save_cert );
 		free_secret_cert( save_cert );
 		memcpy( cert->protect.iv, save_iv, 8 );
 		return G10ERR_BAD_PASS;
 	    }
-	    free_secret_cert( save_cert );
-	    cert->is_protected = 0;
-	    break;
-
-	  default:
-	    return G10ERR_CIPHER_ALGO; /* unsupported protection algorithm */
 	}
+
+	switch( cert->pubkey_algo ) {
+	  case PUBKEY_ALGO_ELGAMAL_E:
+	  case PUBKEY_ALGO_ELGAMAL:
+	    res = elg_check_secret_key( &cert->d.elg );
+	    break;
+	  case PUBKEY_ALGO_DSA:
+	    res = dsa_check_secret_key( &cert->d.dsa );
+	    break;
+	#ifdef HAVE_RSA_CIPHER
+	  case PUBKEY_ALGO_RSA:
+	  case PUBKEY_ALGO_RSA_E:
+	  case PUBKEY_ALGO_RSA_S:
+	    res = rsa_check_secret_key( &cert->d.rsa );
+	    break;
+	#endif
+	  default: BUG();
+	}
+	if( !res ) {
+	    copy_secret_cert( cert, save_cert );
+	    free_secret_cert( save_cert );
+	    memcpy( cert->protect.iv, save_iv, 8 );
+	    return G10ERR_BAD_PASS;
+	}
+	free_secret_cert( save_cert );
+	cert->is_protected = 0;
     }
     else { /* not protected */
 	switch( cert->pubkey_algo ) {
@@ -320,11 +314,9 @@ protect_secret_key( PKT_secret_cert *cert, DEK *dek )
     if( !cert->is_protected ) { /* okay, apply the protection */
 	CIPHER_HANDLE cipher_hd=NULL;
 
-	switch( cert->protect.algo ) {
-	  case CIPHER_ALGO_NONE: BUG(); break;
-	  case CIPHER_ALGO_BLOWFISH160:
-	  case CIPHER_ALGO_BLOWFISH:
-	  case CIPHER_ALGO_CAST:
+	if( check_cipher_algo( cert->protect.algo ) )
+	    rc = G10ERR_CIPHER_ALGO; /* unsupport protection algorithm */
+	else {
 	    cipher_hd = cipher_open( cert->protect.algo,
 				     CIPHER_MODE_AUTO_CFB, 1 );
 	    cipher_setkey( cipher_hd, dek->key, dek->keylen );
@@ -333,11 +325,6 @@ protect_secret_key( PKT_secret_cert *cert, DEK *dek )
 	    if( !do_protect( &cipher_encrypt, cipher_hd, cert ) )
 		cert->is_protected = 1;
 	    cipher_close( cipher_hd );
-	    break;
-
-	  default:
-	    rc = G10ERR_CIPHER_ALGO; /* unsupport protection algorithm */
-	    break;
 	}
     }
     return rc;
diff --git a/g10/sig-check.c b/g10/sig-check.c
index a30d0efcc..6dc660916 100644
--- a/g10/sig-check.c
+++ b/g10/sig-check.c
@@ -319,38 +319,6 @@ check_key_signature( KBNODE root, KBNODE node, int *is_selfsig )
 	    rc = G10ERR_SIG_CLASS;
 	}
     }
-    else if( sig->sig_class >= 0x14 && sig->sig_class <= 0x17 ) {
-	/* a gnupg extension: calculate the signature over all
-	 * preceding userids */
-	KBNODE unode = find_prev_kbnode( root, node, PKT_USER_ID );
-	u32 keyid[2];
-	int any = 0;
-
-	keyid_from_pkc( pkc, keyid );
-	md = md_open( algo, 0 );
-	hash_public_cert( md, pkc );
-
-	for( unode=root->next; unode && unode != node; unode = unode->next ) {
-	    if( unode->pkt->pkttype == PKT_USER_ID ) {
-		hash_uid_node( unode, md, sig );
-		any++;
-	    }
-	}
-	if( any ) {
-	    if( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1] ) {
-		if( is_selfsig )
-		    *is_selfsig = 1;
-		rc = do_check( pkc, sig, md );
-	    }
-	    else
-		rc = signature_check( sig, md );
-	}
-	else {
-	    log_error("no user id for key signature packet\n");
-	    rc = G10ERR_SIG_CLASS;
-	}
-	md_close(md);
-    }
     else {
 	KBNODE unode = find_prev_kbnode( root, node, PKT_USER_ID );
 
diff --git a/include/ChangeLog b/include/ChangeLog
index b5f086805..05b40fa04 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jun  8 22:14:48 1998  Werner Koch  (wk@isil.d.shuttle.de)
+
+	* cipher.h (CIPHER_ALGO_CAST5): Changed name from .. CAST
+
 Thu May 21 13:25:51 1998  Werner Koch  (wk@isil.d.shuttle.de)
 
 	* cipher.h: removed ROT 5 and changed one id and add dummy
diff --git a/include/cipher.h b/include/cipher.h
index a9349c2f6..502825553 100644
--- a/include/cipher.h
+++ b/include/cipher.h
@@ -40,7 +40,7 @@
 #define CIPHER_ALGO_NONE	 0
 #define CIPHER_ALGO_IDEA	 1
 #define CIPHER_ALGO_3DES	 2
-#define CIPHER_ALGO_CAST	 3
+#define CIPHER_ALGO_CAST5	 3
 #define CIPHER_ALGO_BLOWFISH	 4  /* blowfish 128 bit key */
 #define CIPHER_ALGO_SAFER_SK128  5
 #define CIPHER_ALGO_DES_SK	 6
diff --git a/mpi/sparc32/mpih-rshift.S b/mpi/sparc32/mpih-rshift.S
index 009962663..e74675d13 100644
--- a/mpi/sparc32/mpih-rshift.S
+++ b/mpi/sparc32/mpih-rshift.S
@@ -29,7 +29,7 @@
 
 	.text
 	.align	4
-	.global C_SYMBOL_NAME(mpohelp_rshift)
+	.global C_SYMBOL_NAME(mpihelp_rshift)
 C_SYMBOL_NAME(mpihelp_rshift):
 	ld	[%o1],%g2	! load first limb
 	sub	%g0,%o3,%o5	! negate shift count
diff --git a/zlib/Makefile b/zlib/Makefile
index a98c6cc7a..6d752930c 100644
--- a/zlib/Makefile
+++ b/zlib/Makefile
@@ -69,8 +69,8 @@ target_triplet = i586-pc-linux-gnu
 CATALOGS =  de.gmo it.gmo
 CATOBJEXT = .gmo
 CC = gcc
-CIPHER_EXTRA_DIST = 
-CIPHER_EXTRA_OBJS = 
+CIPHER_EXTRA_DIST = @CIPHER_EXTRA_DIST@
+CIPHER_EXTRA_OBJS = @CIPHER_EXTRA_OBJS@
 CPP = gcc -E
 DATADIRNAME = share
 G10_LOCALEDIR = /usr/local/share/locale
@@ -93,7 +93,7 @@ POSUB = po
 RANLIB = ranlib
 USE_INCLUDED_LIBINTL = yes
 USE_NLS = yes
-VERSION = 0.2.19
+VERSION = 0.2.19a
 ZLIBS = 
 l = 
 
@@ -123,7 +123,7 @@ LIBRARIES =  $(noinst_LIBRARIES)
 DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I..
 CPPFLAGS = 
 LDFLAGS = 
-LIBS = -lz
+LIBS = -ldl -lz
 libzlib_a_LIBADD = 
 libzlib_a_OBJECTS =  adler32.o compress.o crc32.o gzio.o uncompr.o \
 deflate.o trees.o zutil.o inflate.o infblock.o inftrees.o infcodes.o \