Removed some obsolete header files.

cipher/ChangeLog

@@ -1,3 +1,8 @@
+2002-08-04  Werner Koch  <wk@gnupg.org>
+
+	* blowfish.h, cast5.h, des.h: Removed after moving all prototypes to
+	* algorithms.h: here. Changed all sources to use this one.
+	
 2002-08-03  Stefan Bellon  <sbellon@sbellon.de>
 
 	* idea-stub.c (idea_get_info): RISC OS' Norcroft C needs a cast.

cipher/Makefile.am

@@ -28,12 +28,9 @@ libcipher_a_SOURCES = cipher.c	\
 		 dynload.c	\
 		 bithelp.h	\
 		 des.c		\
-		 des.h		\
 		 twofish.c	\
 		 blowfish.c	\
-		 blowfish.h	\
 		 cast5.c	\
-		 cast5.h	\
 		 rijndael.c     \
 		 elgamal.c	\
 		 elgamal.h	\

cipher/algorithms.h

@@ -62,5 +62,57 @@ tiger_get_info (int algo, size_t *contextsize,
                 );
 
 
+const char *
+des_get_info( int algo, size_t *keylen,
+		   size_t *blocksize, size_t *contextsize,
+		   int	(**setkeyf)( void *c, byte *key, unsigned keylen ),
+		   void (**encryptf)( void *c, byte *outbuf, byte *inbuf ),
+		   void (**decryptf)( void *c, byte *outbuf, byte *inbuf )
+		 );
+
+const char *
+cast5_get_info( int algo, size_t *keylen,
+		   size_t *blocksize, size_t *contextsize,
+		   int	(**setkeyf)( void *c, byte *key, unsigned keylen ),
+		   void (**encryptf)( void *c, byte *outbuf, byte *inbuf ),
+		   void (**decryptf)( void *c, byte *outbuf, byte *inbuf )
+		 );
+
+
+const char *
+blowfish_get_info( int algo, size_t *keylen,
+		   size_t *blocksize, size_t *contextsize,
+		   int	(**setkeyf)( void *c, byte *key, unsigned keylen ),
+		   void (**encryptf)( void *c, byte *outbuf, byte *inbuf ),
+		   void (**decryptf)( void *c, byte *outbuf, byte *inbuf )
+		 );
+
+const char *
+twofish_get_info( int algo, size_t *keylen,
+		   size_t *blocksize, size_t *contextsize,
+		   int	(**setkeyf)( void *c, byte *key, unsigned keylen ),
+		   void (**encryptf)( void *c, byte *outbuf, byte *inbuf ),
+		   void (**decryptf)( void *c, byte *outbuf, byte *inbuf )
+		 );
+
+/* this is just a kludge for the time we have not yet changed the cipher
+ * stuff to the scheme we use for random and digests */
+const char *
+rijndael_get_info( int algo, size_t *keylen,
+		   size_t *blocksize, size_t *contextsize,
+		   int	(**setkeyf)( void *c, byte *key, unsigned keylen ),
+		   void (**encryptf)( void *c, byte *outbuf, byte *inbuf ),
+		   void (**decryptf)( void *c, byte *outbuf, byte *inbuf )
+		 );
+
+const char *
+idea_get_info( int algo, size_t *keylen,
+               size_t *blocksize, size_t *contextsize,
+               int	(**setkeyf)( void *c, byte *key, unsigned keylen ),
+               void (**encryptf)( void *c, byte *outbuf, byte *inbuf ),
+               void (**decryptf)( void *c, byte *outbuf, byte *inbuf )
+               );
+
+
 
 #endif /*GNUPG_ALGORITHMS_H*/

cipher/blowfish.c

@@ -36,8 +36,7 @@
 #include <assert.h>
 #include "types.h"
 #include "errors.h"
-#include "blowfish.h"
+#include "algorithms.h"
-#include "dynload.h"
 
 
 

cipher/blowfish.h

@@ -1,62 +0,0 @@
-/* blowfish.h
- *	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_BLOWFISH_H
-#define G10_BLOWFISH_H
-
-#include "types.h"
-
-
-const char *
-blowfish_get_info( int algo, size_t *keylen,
-		   size_t *blocksize, size_t *contextsize,
-		   int	(**setkeyf)( void *c, byte *key, unsigned keylen ),
-		   void (**encryptf)( void *c, byte *outbuf, byte *inbuf ),
-		   void (**decryptf)( void *c, byte *outbuf, byte *inbuf )
-		 );
-
-/* this is just a kludge for the time we have not yet chnaged the cipher
- * stuff to the scheme we use for random and digests */
-const char *
-twofish_get_info( int algo, size_t *keylen,
-		   size_t *blocksize, size_t *contextsize,
-		   int	(**setkeyf)( void *c, byte *key, unsigned keylen ),
-		   void (**encryptf)( void *c, byte *outbuf, byte *inbuf ),
-		   void (**decryptf)( void *c, byte *outbuf, byte *inbuf )
-		 );
-
-/* this is just a kludge for the time we have not yet changed the cipher
- * stuff to the scheme we use for random and digests */
-const char *
-rijndael_get_info( int algo, size_t *keylen,
-		   size_t *blocksize, size_t *contextsize,
-		   int	(**setkeyf)( void *c, byte *key, unsigned keylen ),
-		   void (**encryptf)( void *c, byte *outbuf, byte *inbuf ),
-		   void (**decryptf)( void *c, byte *outbuf, byte *inbuf )
-		 );
-
-const char *
-idea_get_info( int algo, size_t *keylen,
-               size_t *blocksize, size_t *contextsize,
-               int	(**setkeyf)( void *c, byte *key, unsigned keylen ),
-               void (**encryptf)( void *c, byte *outbuf, byte *inbuf ),
-               void (**decryptf)( void *c, byte *outbuf, byte *inbuf )
-               );
-
-#endif /*G10_BLOWFISH_H*/

cipher/cast5.c

@@ -41,7 +41,7 @@
 #include <string.h>
 #include "types.h"
 #include "errors.h"
-#include "cast5.h"
+#include "algorithms.h"
 
 
 #define CIPHER_ALGO_CAST5	 3

cipher/cast5.h

@@ -1,33 +0,0 @@
-/* cast5.h
- *	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_CAST5_H
-#define G10_CAST5_H
-
-#include "types.h"
-
-const char *
-cast5_get_info( int algo, size_t *keylen,
-		   size_t *blocksize, size_t *contextsize,
-		   int	(**setkeyf)( void *c, byte *key, unsigned keylen ),
-		   void (**encryptf)( void *c, byte *outbuf, byte *inbuf ),
-		   void (**decryptf)( void *c, byte *outbuf, byte *inbuf )
-		 );
-
-#endif /*G10_CAST5_H*/

cipher/cipher.c

@@ -27,9 +27,7 @@
 #include "util.h"
 #include "errors.h"
 #include "cipher.h"
-#include "des.h"
+#include "algorithms.h"
-#include "blowfish.h"
-#include "cast5.h"
 
 
 #define MAX_BLOCKSIZE 16

cipher/des.c

@@ -116,7 +116,7 @@
 #include <string.h>	       /* memcpy, memcmp */
 #include "types.h"             /* for byte and u32 typedefs */
 #include "errors.h"
-#include "des.h"
+#include "algorithms.h"
 
 #if defined(__GNUC__) && defined(__GNU_LIBRARY__)
 #define working_memcmp memcmp

cipher/des.h

@@ -1,34 +0,0 @@
-/* des.h
- *	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_DES_H
-#define G10_DES_H
-
-#include "types.h"
-
-
-const char *
-des_get_info( int algo, size_t *keylen,
-		   size_t *blocksize, size_t *contextsize,
-		   int	(**setkeyf)( void *c, byte *key, unsigned keylen ),
-		   void (**encryptf)( void *c, byte *outbuf, byte *inbuf ),
-		   void (**decryptf)( void *c, byte *outbuf, byte *inbuf )
-		 );
-
-#endif /*G10_DES_H*/

cipher/dynload.h

@@ -1,68 +0,0 @@
-/* dynload.h
- *	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
-
-#include "mpi.h"
-
-
-void register_internal_cipher_extension( const char *module_id,
-			      void * (*enumfunc)(int, int*, int*, int*) );
-
-int
-enum_gnupgext_digests( void **enum_context,
-	    int *algo,
-	    const char *(**r_get_info)( int, size_t*,byte**, int*, int*,
-				       void (**)(void*),
-				       void (**)(void*,byte*,size_t),
-				       void (**)(void*),byte *(**)(void*)) );
-
-const char *
-enum_gnupgext_ciphers( void **enum_context, int *algo,
-		       size_t *keylen, size_t *blocksize, size_t *contextsize,
-		       int  (**setkeyf)( void *c, byte *key, unsigned keylen ),
-		       void (**encryptf)( void *c, byte *outbuf, byte *inbuf ),
-		       void (**decryptf)( void *c, byte *outbuf, byte *inbuf )
-		     );
-
-
-const char *
-enum_gnupgext_pubkeys( void **enum_context, int *algo,
-    int *npkey, int *nskey, int *nenc, int *nsig, int *use,
-    int (**generate)( int algo, unsigned nbits, MPI *skey, MPI **retfactors ),
-    int (**check_secret_key)( int algo, MPI *skey ),
-    int (**encryptf)( int algo, MPI *resarr, MPI data, MPI *pkey ),
-    int (**decryptf)( int algo, MPI *result, MPI *data, MPI *skey ),
-    int (**sign)( int algo, MPI *resarr, MPI data, MPI *skey ),
-    int (**verify)( int algo, MPI hash, MPI *data, MPI *pkey,
-		    int (*cmp)(void *, MPI), void *opaquev ),
-    unsigned (**get_nbits)( int algo, MPI *pkey ) );
-
-
-int (*dynload_getfnc_gather_random(void))( void (*)(const void*, size_t, int),
-					   int, size_t, int);
-void (*dynload_getfnc_fast_random_poll(void)
-				)( void (*)(const void*, size_t, int), int );
-
-
-/** This function is in construct.c **/
-void cipher_modules_constructor(void);
-
-#endif /*G10_CIPHER_DYNLOAD_H*/

cipher/rijndael.c

@@ -41,7 +41,7 @@
 #include "types.h"  /* for byte and u32 typedefs */
 #include "util.h"
 #include "errors.h"
-#include "dynload.h"
+#include "algorithms.h"
 
 #define MAXKC			(256/32)
 #define MAXROUNDS		14

cipher/rndunix.c

@@ -101,7 +101,7 @@
 
 #include "types.h"  /* for byte and u32 typedefs */
 #ifndef IS_MODULE
-#include "dynload.h"
+#include "algorithms.h"
 #endif
 #include "util.h"
 

cipher/twofish.c

@@ -29,8 +29,7 @@
 #include "types.h"  /* for byte and u32 typedefs */
 #include "util.h"
 #include "errors.h"
-#include "dynload.h"
+#include "algorithms.h"
-
 
 /* Prototype for the self-test function. */
 static const char *selftest(void);