Cleanups.

9 files changed, 7 insertions, 860 deletions

diff --git a/include/ChangeLog b/include/ChangeLog
index e1eada9a9..344ae6555 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-20  Werner Koch  <wk@g10code.com>
+
+	* errors.h, http.h, memory.h, mpi.h, util.h, i18n.h: Removed.
+	* Makefile.am: New.
+	* distfiles: Removed.
+
 2006-08-16  Werner Koch  <wk@g10code.com>
 
 	* keyserver.h:  Moved to ../common.
diff --git a/include/Makefile.am b/include/Makefile.am
new file mode 100644
index 000000000..25518bfa1
--- /dev/null
+++ b/include/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = cipher.h types.h host2net.h _regex.h 
diff --git a/include/distfiles b/include/distfiles
deleted file mode 100644
index 0f58e614d..000000000
--- a/include/distfiles
+++ /dev/null
@@ -1,12 +0,0 @@
-cipher.h
-errors.h
-memory.h
-mpi.h
-types.h
-util.h
-i18n.h
-host2net.h
-http.h
-_regex.h
-
-ChangeLog
diff --git a/include/errors.h b/include/errors.h
deleted file mode 100644
index f3269ce5b..000000000
--- a/include/errors.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* errors.h - error code
- *	Copyright (C) 1998, 1999, 2000, 2001 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
- */
-#ifndef GNUPG_INCLUDE_ERRORS_H
-#define GNUPG_INCLUDE_ERRORS_H
-
-#if 0
-#error Remove this file after replacing all error codes with those
-#error from libgpg-error.  The numerical values are identical, though.
-#endif
-
-
-#if 0 /* Not used anymore. */
-#define G10ERR_GENERAL	       1
-#define G10ERR_UNKNOWN_PACKET  2
-#define G10ERR_UNKNOWN_VERSION 3 /* Unknown version (in packet) */
-#define G10ERR_PUBKEY_ALGO     4 /* Unknown pubkey algorithm */
-#define G10ERR_DIGEST_ALGO     5 /* Unknown digest algorithm */
-#define G10ERR_BAD_PUBKEY      6 /* Bad public key */
-#define G10ERR_BAD_SECKEY      7 /* Bad secret key */
-#define G10ERR_BAD_SIGN        8 /* Bad signature */
-#define G10ERR_NO_PUBKEY       9 /* public key not found */
-#define G10ERR_CHECKSUM       10 /* checksum error */
-#define G10ERR_BAD_PASS       11 /* Bad passphrase */
-#define G10ERR_CIPHER_ALGO    12 /* Unknown cipher algorithm */
-#define G10ERR_KEYRING_OPEN   13
-#define G10ERR_INVALID_PACKET 14
-#define G10ERR_INVALID_ARMOR  15
-#define G10ERR_NO_USER_ID     16
-#define G10ERR_NO_SECKEY      17 /* secret key not available */
-#define G10ERR_WRONG_SECKEY   18 /* wrong seckey used */
-#define G10ERR_UNSUPPORTED    19
-#define G10ERR_BAD_KEY	      20 /* bad (session) key */
-#define G10ERR_READ_FILE      21
-#define G10ERR_WRITE_FILE     22
-#define G10ERR_COMPR_ALGO     23 /* Unknown compress algorithm */
-#define G10ERR_OPEN_FILE      24
-#define G10ERR_CREATE_FILE    25
-#define G10ERR_PASSPHRASE     26 /* invalid passphrase */
-#define G10ERR_NI_PUBKEY      27
-#define G10ERR_NI_CIPHER      28
-#define G10ERR_SIG_CLASS      29
-#define G10ERR_BAD_MPI	      30
-#define G10ERR_RESOURCE_LIMIT 31
-#define G10ERR_INV_KEYRING    32
-#define G10ERR_TRUSTDB	      33 /* a problem with the trustdb */
-#define G10ERR_BAD_CERT       34 /* bad certicate */
-#define G10ERR_INV_USER_ID    35
-#define G10ERR_CLOSE_FILE     36
-#define G10ERR_RENAME_FILE    37
-#define G10ERR_DELETE_FILE    38
-#define G10ERR_UNEXPECTED     39
-#define G10ERR_TIME_CONFLICT  40
-#define G10ERR_WR_PUBKEY_ALGO 41 /* unusabe pubkey algo */
-#define G10ERR_FILE_EXISTS    42
-#define G10ERR_WEAK_KEY       43 /* NOTE: hardcoded into the cipher modules */
-#define G10ERR_WRONG_KEYLEN   44 /* NOTE: hardcoded into the cipher modules */
-#define G10ERR_INV_ARG	      45
-#define G10ERR_BAD_URI	      46  /* syntax error in URI */
-#define G10ERR_INVALID_URI    47  /* e.g. unsupported scheme */
-#define G10ERR_NETWORK	      48  /* general network error */
-#define G10ERR_UNKNOWN_HOST   49
-#define G10ERR_SELFTEST_FAILED 50
-#define G10ERR_NOT_ENCRYPTED  51
-#define G10ERR_NOT_PROCESSED  52
-#define G10ERR_UNU_PUBKEY     53
-#define G10ERR_UNU_SECKEY     54
-#define G10ERR_KEYSERVER      55
-#endif
-
-#ifndef HAVE_STRERROR
-char *strerror( int n );
-#endif
-
-#endif /*GNUPG_INCLUDE_ERRORS_H*/
-
-
-
-
-
-
-
-
-
-
diff --git a/include/http.h b/include/http.h
deleted file mode 100644
index 2fd64c288..000000000
--- a/include/http.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* http.h  -  HTTP protocol handler
- * Copyright (C) 1999, 2000, 2001, 2003, 2004,
- *               2005 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
- */
-
-#ifndef G10_HTTP_H
-#define G10_HTTP_H 1
-
-#error this file should not be used anymore
-
-
-#include "../common/iobuf.h"
-
-struct uri_tuple {
-    struct uri_tuple *next;
-    const char *name;	/* a pointer into name */
-    char  *value;	/* a pointer to value (a Nul is always appended) */
-    size_t valuelen;	/* and the real length of the value */
-			/* because the value may contain embedded Nuls */
-};
-typedef struct uri_tuple *URI_TUPLE;
-
-struct parsed_uri {
-    /* all these pointers point into buffer; most stuff is not escaped */
-    char *scheme;	/* pointer to the scheme string (lowercase) */
-    char *auth;         /* username/password for basic auth */
-    char *host; 	/* host (converted to lowercase) */
-    ushort port;	/* port (always set if the host is set) */
-    char *path; 	/* the path */
-    URI_TUPLE params;	/* ";xxxxx" */
-    URI_TUPLE query;	/* "?xxx=yyy" */
-    char buffer[1];	/* buffer which holds a (modified) copy of the URI */
-};
-typedef struct parsed_uri *PARSED_URI;
-
-typedef enum {
-    HTTP_REQ_GET  = 1,
-    HTTP_REQ_HEAD = 2,
-    HTTP_REQ_POST = 3
-} HTTP_REQ_TYPE;
-
-/* put flag values into an enum, so that gdb can display them */
-enum
-  { 
-    HTTP_FLAG_NO_SHUTDOWN = 1,
-    HTTP_FLAG_TRY_SRV = 2
-  };
-
-struct http_context {
-    int initialized;
-    unsigned int status_code;
-    int sock;
-    int in_data;
-    iobuf_t fp_read;
-    iobuf_t fp_write;
-    int is_http_0_9;
-    PARSED_URI uri;
-    HTTP_REQ_TYPE req_type;
-    byte *buffer;	   /* line buffer */
-    unsigned buffer_size;
-    unsigned int flags;
-};
-typedef struct http_context *HTTP_HD;
-
-int http_open( HTTP_HD hd, HTTP_REQ_TYPE reqtype, const char *url,
-	       char *auth, unsigned int flags, const char *proxy );
-void http_start_data( HTTP_HD hd );
-int  http_wait_response( HTTP_HD hd, unsigned int *ret_status );
-void http_close( HTTP_HD hd );
-int http_open_document( HTTP_HD hd, const char *document, char *auth,
-			unsigned int flags, const char *proxy );
-
-#endif /*G10_HTTP_H*/
diff --git a/include/i18n.h b/include/i18n.h
deleted file mode 100644
index 6abd2dce3..000000000
--- a/include/i18n.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* i18n.h
- *	Copyright (C) 1998, 1999, 2000, 2001 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
- */
-
-#ifndef G10_I18N_H
-#define G10_I18N_H
-
-#ifdef USE_SIMPLE_GETTEXT
-int set_gettext_file( const char *filename, const char *regkey );
-const char *gettext( const char *msgid );
-
-#define _(a) gettext (a)
-#define N_(a) (a)
-
-#else
-#ifdef HAVE_LOCALE_H
-#include <locale.h>	/* suggested by Ernst Molitor */
-#endif
-
-#ifdef ENABLE_NLS
-#ifndef __riscos__
-#include <libintl.h>
-#else
-#include "libgettext.h"
-#endif /* __riscos__ */
-#define _(a) gettext (a)
-#ifdef gettext_noop
-#define N_(a) gettext_noop (a)
-#else
-#define N_(a) (a)
-#endif
-#else
-#define _(a) (a)
-#define N_(a) (a)
-#endif
-#endif /* !USE_SIMPLE_GETTEXT */
-
-#endif /*G10_I18N_H*/
diff --git a/include/memory.h b/include/memory.h
deleted file mode 100644
index 2e2f8fdce..000000000
--- a/include/memory.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* memory.h - memory allocation
- *	Copyright (C) 1998, 1999, 2000, 2001 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
- */
-
-#ifndef G10_MEMORY_H
-#define G10_MEMORY_H
-
-#error this file should not be used anymore
-
-#ifdef M_DEBUG
-#ifndef STR
-#define STR(v) #v
-#endif
-#ifndef __riscos__
-#define M_DBGINFO(a)	    __FUNCTION__ "["__FILE__ ":"  STR(a) "]"
-#else /* __riscos__ */
-#define M_DBGINFO(a)	     "["__FILE__ ":"  STR(a) "]"
-#endif /* __riscos__ */
-#define m_alloc(n)		m_debug_alloc((n), M_DBGINFO( __LINE__ ) )
-#define m_alloc_clear(n)	m_debug_alloc_clear((n), M_DBGINFO(__LINE__) )
-#define m_alloc_secure(n)	m_debug_alloc((n), M_DBGINFO(__LINE__) )
-#define m_alloc_secure_clear(n) m_debug_alloc_secure_clear((n), M_DBGINFO(__LINE__) )
-#define m_realloc(n,m)		m_debug_realloc((n),(m), M_DBGINFO(__LINE__) )
-#define m_free(n)		m_debug_free((n), M_DBGINFO(__LINE__) )
-#define m_check(n)		m_debug_check((n), M_DBGINFO(__LINE__) )
-/*#define m_copy(a)		  m_debug_copy((a), M_DBGINFO(__LINE__) )*/
-#define m_strdup(a)		m_debug_strdup((a), M_DBGINFO(__LINE__) )
-
-void *m_debug_alloc( size_t n, const char *info );
-void *m_debug_alloc_clear( size_t n, const char *info  );
-void *m_debug_alloc_secure( size_t n, const char *info	);
-void *m_debug_alloc_secure_clear( size_t n, const char *info  );
-void *m_debug_realloc( void *a, size_t n, const char *info  );
-void m_debug_free( void *p, const char *info  );
-void m_debug_check( const void *a, const char *info );
-/*void *m_debug_copy( const void *a, const char *info );*/
-char *m_debug_strdup( const char *a, const char *info );
-
-#else
-void *m_alloc( size_t n );
-void *m_alloc_clear( size_t n );
-void *m_alloc_secure( size_t n );
-void *m_alloc_secure_clear( size_t n );
-void *m_realloc( void *a, size_t n );
-void m_free( void *p );
-void m_check( const void *a );
-/*void *m_copy( const void *a );*/
-char *m_strdup( const char * a);
-#endif
-
-size_t m_size( const void *a );
-void m_print_stats(const char *prefix);
-
-/*-- secmem.c --*/
-void secmem_init( size_t npool );
-void secmem_term( void );
-void *secmem_malloc( size_t size );
-void *secmem_realloc( void *a, size_t newsize );
-void secmem_free( void *a );
-int  m_is_secure( const void *p );
-void secmem_dump_stats(void);
-void secmem_set_flags( unsigned flags );
-unsigned secmem_get_flags(void);
-
-
-#define DBG_MEMORY    memory_debug_mode
-#define DBG_MEMSTAT   memory_stat_debug_mode
-
-#ifndef EXTERN_UNLESS_MAIN_MODULE
-#if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE)
-#define EXTERN_UNLESS_MAIN_MODULE extern
-#else
-#define EXTERN_UNLESS_MAIN_MODULE 
-#endif
-#endif
-EXTERN_UNLESS_MAIN_MODULE int memory_debug_mode;
-EXTERN_UNLESS_MAIN_MODULE int memory_stat_debug_mode;
-
-#endif /*G10_MEMORY_H*/
diff --git a/include/mpi.h b/include/mpi.h
deleted file mode 100644
index 7402ef6d3..000000000
--- a/include/mpi.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/* mpi.h  -  Multi Precision Integers
- *	Copyright (C) 1994, 1996, 1998, 1999,
- *                    2000, 2001 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
- *
- * Note: This code is heavily based on the GNU MP Library.
- *	 Actually it's the same code with only minor changes in the
- *	 way the data is stored; this is to support the abstraction
- *	 of an optional secure memory allocation which may be used
- *	 to avoid revealing of sensitive data due to paging etc.
- *	 The GNU MP Library itself is published under the LGPL;
- *	 however I decided to publish this code under the plain GPL.
- */
-
-#ifndef G10_MPI_H
-#define G10_MPI_H
-
-#error this file should not be used anymore
-
-#include <gcrypt.h>
-
-#if 0
-
-
-#include <config.h>
-#include <stdio.h>
-#include "iobuf.h"
-#include "types.h"
-#include "memory.h"
-
-#if BYTES_PER_MPI_LIMB == SIZEOF_UNSIGNED_INT
-  typedef unsigned int mpi_limb_t;
-  typedef   signed int mpi_limb_signed_t;
-#elif BYTES_PER_MPI_LIMB == SIZEOF_UNSIGNED_LONG
-  typedef unsigned long int mpi_limb_t;
-  typedef   signed long int mpi_limb_signed_t;
-#elif BYTES_PER_MPI_LIMB == SIZEOF_UNSIGNED_LONG_LONG
-  typedef unsigned long long int mpi_limb_t;
-  typedef   signed long long int mpi_limb_signed_t;
-#elif BYTES_PER_MPI_LIMB == SIZEOF_UNSIGNED_SHORT
-  typedef unsigned short int mpi_limb_t;
-  typedef   signed short int mpi_limb_signed_t;
-#else
-#error BYTES_PER_MPI_LIMB does not match any C type
-#endif
-#define BITS_PER_MPI_LIMB    (8*BYTES_PER_MPI_LIMB)
-
-#ifndef EXTERN_UNLESS_MAIN_MODULE
-#if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE)
-#define EXTERN_UNLESS_MAIN_MODULE extern
-#else
-#define EXTERN_UNLESS_MAIN_MODULE 
-#endif
-#endif
-
-#define DBG_MPI     mpi_debug_mode
-EXTERN_UNLESS_MAIN_MODULE int mpi_debug_mode;
-
-
-struct gcry_mpi {
-    int alloced;    /* array size (# of allocated limbs) */
-    int nlimbs;     /* number of valid limbs */
-    int nbits;	    /* the real number of valid bits (info only) */
-    int sign;	    /* indicates a negative number */
-    unsigned flags; /* bit 0: array must be allocated in secure memory space */
-		    /* bit 1: not used */
-		    /* bit 2: the limb is a pointer to some m_alloced data */
-    mpi_limb_t *d;  /* array with the limbs */
-};
-
-typedef struct gcry_mpi *MPI;
-
-#define MPI_NULL NULL
-
-#define mpi_get_nlimbs(a)     ((a)->nlimbs)
-#define mpi_is_neg(a)	      ((a)->sign)
-
-/*-- mpiutil.c --*/
-
-#ifdef M_DEBUG
-#define mpi_alloc(n)	      mpi_debug_alloc((n), M_DBGINFO( __LINE__ ) )
-#define mpi_alloc_secure(n) mpi_debug_alloc_secure((n), M_DBGINFO( __LINE__ ) )
-#define mpi_alloc_like(n)   mpi_debug_alloc_like((n), M_DBGINFO( __LINE__ ) )
-#define mpi_free(a)	      mpi_debug_free((a), M_DBGINFO(__LINE__) )
-#define mpi_resize(a,b)     mpi_debug_resize((a),(b), M_DBGINFO(__LINE__) )
-#define mpi_copy(a)	      mpi_debug_copy((a), M_DBGINFO(__LINE__) )
-MPI mpi_debug_alloc( unsigned nlimbs, const char *info );
-MPI mpi_debug_alloc_secure( unsigned nlimbs, const char *info );
-MPI mpi_debug_alloc_like( MPI a, const char *info );
-void mpi_debug_free( MPI a, const char *info );
-void mpi_debug_resize( MPI a, unsigned nlimbs, const char *info );
-MPI  mpi_debug_copy( MPI a, const char *info	);
-#else
-MPI mpi_alloc( unsigned nlimbs );
-MPI mpi_alloc_secure( unsigned nlimbs );
-MPI mpi_alloc_like( MPI a );
-void mpi_free( MPI a );
-void mpi_resize( MPI a, unsigned nlimbs );
-MPI  mpi_copy( MPI a );
-#endif
-#define mpi_is_opaque(a) ((a) && ((a)->flags&4))
-MPI mpi_set_opaque( MPI a, void *p, int len );
-void *mpi_get_opaque( MPI a, int *len );
-#define mpi_is_secure(a) ((a) && ((a)->flags&1))
-void mpi_set_secure( MPI a );
-void mpi_clear( MPI a );
-void mpi_set( MPI w, MPI u);
-void mpi_set_ui( MPI w, ulong u);
-MPI  mpi_alloc_set_ui( unsigned long u);
-void mpi_m_check( MPI a );
-void mpi_swap( MPI a, MPI b);
-
-/*-- mpicoder.c --*/
-int mpi_write( IOBUF out, MPI a );
-#ifdef M_DEBUG
-#define mpi_read(a,b,c)   mpi_debug_read((a),(b),(c),  M_DBGINFO( __LINE__ ) )
-MPI mpi_debug_read(IOBUF inp, unsigned *nread, int secure, const char *info);
-#else
-MPI mpi_read(IOBUF inp, unsigned *nread, int secure);
-#endif
-MPI mpi_read_from_buffer(byte *buffer, unsigned *ret_nread, int secure);
-int mpi_fromstr(MPI val, const char *str);
-int mpi_print( FILE *fp, MPI a, int mode );
-void g10_log_mpidump( const char *text, MPI a );
-u32 mpi_get_keyid( MPI a, u32 *keyid );
-byte *mpi_get_buffer( MPI a, unsigned *nbytes, int *sign );
-byte *mpi_get_secure_buffer( MPI a, unsigned *nbytes, int *sign );
-void  mpi_set_buffer( MPI a, const byte *buffer, unsigned nbytes, int sign );
-
-#define log_mpidump g10_log_mpidump
-
-/*-- mpi-add.c --*/
-void mpi_add_ui(MPI w, MPI u, ulong v );
-void mpi_add(MPI w, MPI u, MPI v);
-void mpi_addm(MPI w, MPI u, MPI v, MPI m);
-void mpi_sub_ui(MPI w, MPI u, ulong v );
-void mpi_sub( MPI w, MPI u, MPI v);
-void mpi_subm( MPI w, MPI u, MPI v, MPI m);
-
-/*-- mpi-mul.c --*/
-void mpi_mul_ui(MPI w, MPI u, ulong v );
-void mpi_mul_2exp( MPI w, MPI u, ulong cnt);
-void mpi_mul( MPI w, MPI u, MPI v);
-void mpi_mulm( MPI w, MPI u, MPI v, MPI m);
-
-/*-- mpi-div.c --*/
-ulong mpi_fdiv_r_ui( MPI rem, MPI dividend, ulong divisor );
-void  mpi_fdiv_r( MPI rem, MPI dividend, MPI divisor );
-void  mpi_fdiv_q( MPI quot, MPI dividend, MPI divisor );
-void  mpi_fdiv_qr( MPI quot, MPI rem, MPI dividend, MPI divisor );
-void  mpi_tdiv_r( MPI rem, MPI num, MPI den);
-void  mpi_tdiv_qr( MPI quot, MPI rem, MPI num, MPI den);
-void  mpi_tdiv_q_2exp( MPI w, MPI u, unsigned count );
-int   mpi_divisible_ui(MPI dividend, ulong divisor );
-
-/*-- mpi-gcd.c --*/
-int mpi_gcd( MPI g, MPI a, MPI b );
-
-/*-- mpi-pow.c --*/
-void mpi_pow( MPI w, MPI u, MPI v);
-void mpi_powm( MPI res, MPI base, MPI exp, MPI mod);
-
-/*-- mpi-mpow.c --*/
-void mpi_mulpowm( MPI res, MPI *basearray, MPI *exparray, MPI mod);
-
-/*-- mpi-cmp.c --*/
-int mpi_cmp_ui( MPI u, ulong v );
-int mpi_cmp( MPI u, MPI v );
-
-/*-- mpi-scan.c --*/
-int mpi_getbyte( MPI a, unsigned idx );
-void mpi_putbyte( MPI a, unsigned idx, int value );
-unsigned mpi_trailing_zeros( MPI a );
-
-/*-- mpi-bit.c --*/
-void mpi_normalize( MPI a );
-unsigned mpi_get_nbits( MPI a );
-int  mpi_test_bit( MPI a, unsigned n );
-void mpi_set_bit( MPI a, unsigned n );
-void mpi_set_highbit( MPI a, unsigned n );
-void mpi_clear_highbit( MPI a, unsigned n );
-void mpi_clear_bit( MPI a, unsigned n );
-void mpi_rshift( MPI x, MPI a, unsigned n );
-
-/*-- mpi-inv.c --*/
-void mpi_invm( MPI x, MPI u, MPI v );
-#endif
-#endif /*G10_MPI_H*/
diff --git a/include/util.h b/include/util.h
deleted file mode 100644
index 1d6d01366..000000000
--- a/include/util.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/* util.h
- *	Copyright (C) 1998, 1999, 2000, 2001 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
- */
-#ifndef G10_UTIL_H
-#define G10_UTIL_H
-
-#error this file should not be used anymore
-#if 0 /* Dont use it anymore */
-
-#if defined (__MINGW32__) || defined (__CYGWIN32__)
-#include <stdarg.h>
-#endif
-
-#include "types.h"
-#include "errors.h"
-#include "types.h"
-#include "mpi.h"
-
-
-typedef struct {
-     int  *argc;	    /* pointer to argc (value subject to change) */
-     char ***argv;	    /* pointer to argv (value subject to change) */
-     unsigned flags;	    /* Global flags (DO NOT CHANGE) */
-     int err;		    /* print error about last option */
-			    /* 1 = warning, 2 = abort */
-     int r_opt; 	    /* return option */
-     int r_type;	    /* type of return value (0 = no argument found)*/
-     union {
-	 int   ret_int;
-	 long  ret_long;
-	 ulong ret_ulong;
-	 char *ret_str;
-     } r;		    /* Return values */
-     struct {
-	 int idx;
-	 int inarg;
-	 int stopped;
-	 const char *last;
-	 void *aliases;
-	 const void *cur_alias;
-     } internal;	    /* DO NOT CHANGE */
-} ARGPARSE_ARGS;
-
-typedef struct {
-    int 	short_opt;
-    const char *long_opt;
-    unsigned flags;
-    const char *description; /* optional option description */
-} ARGPARSE_OPTS;
-
-/*-- logger.c --*/
-void log_set_logfile( const char *name, int fd );
-FILE *log_stream(void);
-void g10_log_print_prefix(const char *text);
-void log_set_name( const char *name );
-const char *log_get_name(void);
-void log_set_pid( int pid );
-int  log_get_errorcount( int clear );
-void log_inc_errorcount(void);
-int log_set_strict(int val);
-void g10_log_hexdump( const char *text, const char *buf, size_t len );
-
-#if defined (__riscos__) \
-    || (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5 ))
-  void g10_log_bug( const char *fmt, ... )
-			    __attribute__ ((noreturn, format (printf,1,2)));
-  void g10_log_bug0( const char *, int, const char * ) __attribute__ ((noreturn));
-  void g10_log_fatal( const char *fmt, ... )
-			    __attribute__ ((noreturn, format (printf,1,2)));
-  void g10_log_error( const char *fmt, ... ) __attribute__ ((format (printf,1,2)));
-  void g10_log_info( const char *fmt, ... )  __attribute__ ((format (printf,1,2)));
-  void g10_log_warning( const char *fmt, ... )  __attribute__ ((format (printf,1,2)));
-  void g10_log_debug( const char *fmt, ... ) __attribute__ ((format (printf,1,2)));
-  void g10_log_fatal_f( const char *fname, const char *fmt, ... )
-			    __attribute__ ((noreturn, format (printf,2,3)));
-  void g10_log_error_f( const char *fname, const char *fmt, ... )
-			    __attribute__ ((format (printf,2,3)));
-  void g10_log_info_f( const char *fname, const char *fmt, ... )
-			    __attribute__ ((format (printf,2,3)));
-  void g10_log_debug_f( const char *fname,  const char *fmt, ... )
-			    __attribute__ ((format (printf,2,3)));
-#ifndef __riscos__
-#define BUG() g10_log_bug0(  __FILE__ , __LINE__, __FUNCTION__ )
-#else
-#define BUG() g10_log_bug0(  __FILE__ , __LINE__, __func__ )
-#endif
-#else
-  void g10_log_bug( const char *fmt, ... );
-  void g10_log_bug0( const char *, int );
-  void g10_log_fatal( const char *fmt, ... );
-  void g10_log_error( const char *fmt, ... );
-  void g10_log_info( const char *fmt, ... );
-  void g10_log_warning( const char *fmt, ... );
-  void g10_log_debug( const char *fmt, ... );
-  void g10_log_fatal_f( const char *fname, const char *fmt, ... );
-  void g10_log_error_f( const char *fname, const char *fmt, ... );
-  void g10_log_info_f( const char *fname, const char *fmt, ... );
-  void g10_log_debug_f( const char *fname, const char *fmt, ... );
-#define BUG() g10_log_bug0( __FILE__ , __LINE__ )
-#endif
-
-#define log_hexdump g10_log_hexdump
-#define log_bug     g10_log_bug
-#define log_bug0    g10_log_bug0
-#define log_fatal   g10_log_fatal
-#define log_error   g10_log_error
-#define log_info    g10_log_info
-#define log_warning g10_log_warning
-#define log_debug   g10_log_debug
-#define log_fatal_f g10_log_fatal_f
-#define log_error_f g10_log_error_f
-#define log_info_f  g10_log_info_f
-#define log_debug_f g10_log_debug_f
-
-
-/*-- argparse.c --*/
-int arg_parse( ARGPARSE_ARGS *arg, ARGPARSE_OPTS *opts);
-int optfile_parse( FILE *fp, const char *filename, unsigned *lineno,
-		   ARGPARSE_ARGS *arg, ARGPARSE_OPTS *opts);
-void usage( int level );
-const char *default_strusage( int level );
-
-
-/*-- (main program) --*/
-const char *strusage( int level );
-
-
-/*-- dotlock.c --*/
-struct dotlock_handle;
-typedef struct dotlock_handle *DOTLOCK;
-
-void disable_dotlock(void);
-DOTLOCK create_dotlock( const char *file_to_lock );
-int make_dotlock( DOTLOCK h, long timeout );
-int release_dotlock( DOTLOCK h );
-void remove_lockfiles (void);
-
-/*-- fileutil.c --*/
-char * make_basename(const char *filepath, const char *inputpath);
-char * make_dirname(const char *filepath);
-char *make_filename( const char *first_part, ... );
-int compare_filenames( const char *a, const char *b );
-const char *print_fname_stdin( const char *s );
-const char *print_fname_stdout( const char *s );
-int  is_file_compressed(const char *s, int *r_status);
-
-
-/*-- miscutil.c --*/
-u32 make_timestamp(void);
-u32 scan_isodatestr( const char *string );
-u32 add_days_to_timestamp( u32 stamp, u16 days );
-const char *strtimevalue( u32 stamp );
-const char *strtimestamp( u32 stamp ); /* GMT */
-const char *asctimestamp( u32 stamp ); /* localized */
-void print_string( FILE *fp, const byte *p, size_t n, int delim );
-void  print_utf8_string( FILE *fp, const byte *p, size_t n );
-void  print_utf8_string2( FILE *fp, const byte *p, size_t n, int delim);
-char *make_printable_string( const byte *p, size_t n, int delim );
-int answer_is_yes_no_default( const char *s, int def_answer );
-int answer_is_yes( const char *s );
-int answer_is_yes_no_quit( const char *s );
-
-/*-- strgutil.c --*/
-
-#include "../jnlib/strlist.h"
-
-const char *memistr( const char *buf, size_t buflen, const char *sub );
-const char *ascii_memistr( const char *buf, size_t buflen, const char *sub );
-char *mem2str( char *, const void *, size_t);
-char *trim_spaces( char *string );
-unsigned int trim_trailing_chars( byte *line, unsigned int len,
-                                  const char *trimchars);
-unsigned int trim_trailing_ws( byte *line, unsigned len );
-unsigned int check_trailing_chars( const byte *line, unsigned int len,
-                                   const char *trimchars );
-unsigned int check_trailing_ws( const byte *line, unsigned int len );
-int string_count_chr( const char *string, int c );
-int set_native_charset( const char *newset );
-const char* get_native_charset(void);
-char *native_to_utf8( const char *string );
-char *utf8_to_native( const char *string, size_t length, int delim);
-int  check_utf8_string( const char *string );
-
-int ascii_isupper (int c);
-int ascii_islower (int c);
-int ascii_toupper (int c);
-int ascii_tolower (int c);
-int ascii_strcasecmp( const char *a, const char *b );
-int ascii_strncasecmp( const char *a, const char *b, size_t n);
-int ascii_memcasecmp( const char *a, const char *b, size_t n);
-
-#ifndef HAVE_STPCPY
-char *stpcpy(char *a,const char *b);
-#endif
-#ifndef HAVE_STRLWR
-char *strlwr(char *a);
-#endif
-#ifndef HAVE_STRSEP
-char *strsep (char **stringp, const char *delim);
-#endif
-#ifndef HAVE_STRCASECMP
-int strcasecmp( const char *, const char *b);
-#endif
-#ifndef HAVE_STRNCASECMP
-int strncasecmp (const char *, const char *b, size_t n);
-#endif
-#ifndef HAVE_STRTOUL
-#define strtoul(a,b,c)  ((unsigned long)strtol((a),(b),(c)))
-#endif
-#ifndef HAVE_MEMMOVE
-#define memmove(d, s, n) bcopy((s), (d), (n))
-#endif
-
-#if defined (__MINGW32__)
-/*-- w32reg.c --*/
-char *read_w32_registry_string( const char *root,
-				const char *dir, const char *name );
-int write_w32_registry_string(const char *root, const char *dir,
-                              const char *name, const char *value);
-
-/*-- strgutil.c --*/
-int vasprintf ( char **result, const char *format, va_list args);
-#endif
-
-/**** other missing stuff ****/
-#ifndef HAVE_ATEXIT  /* For SunOS */
-#define atexit(a)    (on_exit((a),0))
-#endif
-
-#ifndef HAVE_RAISE
-#define raise(a) kill(getpid(), (a))
-#endif
-
-/******** some macros ************/
-#ifndef STR
-#define STR(v) #v
-#endif
-#define STR2(v) STR(v)
-#define DIM(v) (sizeof(v)/sizeof((v)[0]))
-#define DIMof(type,member)   DIM(((type *)0)->member)
-
-#define wipememory2(_ptr,_set,_len) do { volatile char *_vptr=(volatile char *)(_ptr); size_t _vlen=(_len); while(_vlen) { *_vptr=(_set); _vptr++; _vlen--; } } while(0)
-#define wipememory(_ptr,_len) wipememory2(_ptr,0,_len)
-
-/******* RISC OS stuff ***********/
-#ifdef __riscos__
-/* needed for strcasecmp() */
-#include <strings.h>
-/* needed for filename munging */
-#include <unixlib/local.h>
-/* needed for image file system feature */
-#include <unixlib/features.h>
-void riscos_global_defaults(void);
-#define RISCOS_GLOBAL_STATICS(a) const char *__dynamic_da_name = (a);
-int riscos_load_module(const char *name, const char * const path[], int fatal);
-int riscos_get_filetype_from_string(const char *string, int len);
-int riscos_get_filetype(const char *filename);
-void riscos_set_filetype_by_number(const char *filename, int type);
-void riscos_set_filetype_by_mimetype(const char *filename, const char *mimetype);
-pid_t riscos_getpid(void);
-int riscos_kill(pid_t pid, int sig);
-int riscos_access(const char *path, int amode);
-int riscos_getchar(void);
-char *riscos_make_basename(const char *filepath, const char *inputpath);
-int riscos_check_regexp(const char *exp, const char *string, int debug);
-int riscos_fdopenfile(const char *filename, const int allow_write);
-void riscos_close_fds(void);
-int riscos_renamefile(const char *old, const char *new);
-char *riscos_gstrans(const char *old);
-void riscos_not_implemented(const char *feature);
-#ifdef DEBUG
-void riscos_dump_fdlist(void);
-void riscos_list_openfiles(void);
-#endif
-#ifndef __RISCOS__C__
-#define getpid riscos_getpid
-#define kill(a,b) riscos_kill((a),(b))
-#define access(a,b) riscos_access((a),(b))
-#endif /* !__RISCOS__C__ */
-#endif /* __riscos__ */
-
-#endif
-
-#endif /*G10_UTIL_H*/