commit 164bed7d32bc802a99c5f06a4a019d457e56d62f
parent 8ba8ee559a1e8f46f77db39ec0d83963f3bc758a
Author: Christian Grothoff <christian@grothoff.org>
Date: Mon, 17 Nov 2008 08:21:43 +0000
dce
Diffstat:
5 files changed, 2 insertions(+), 31 deletions(-)
diff --git a/src/daemon/https/tls/gnutls_errors.h b/src/daemon/https/tls/gnutls_errors.h
@@ -50,7 +50,6 @@ extern int MHD__gnutls_log_level;
# define MHD__gnutls_debug_log(...) LEVEL(2, __VA_ARGS__)
# define MHD__gnutls_handshake_log(...) LEVEL(3, __VA_ARGS__)
-# define MHD__gnutls_io_log(...) LEVEL_EQ(5, __VA_ARGS__)
# define MHD__gnutls_buffers_log(...) LEVEL_EQ(6, __VA_ARGS__)
# define MHD__gnutls_hard_log(...) LEVEL(9, __VA_ARGS__)
# define MHD__gnutls_record_log(...) LEVEL(4, __VA_ARGS__)
@@ -60,7 +59,6 @@ extern int MHD__gnutls_log_level;
#else
# define MHD__gnutls_debug_log MHD__gnutls_null_log
# define MHD__gnutls_handshake_log MHD__gnutls_null_log
-# define MHD__gnutls_io_log MHD__gnutls_null_log
# define MHD__gnutls_buffers_log MHD__gnutls_null_log
# define MHD__gnutls_hard_log MHD__gnutls_null_log
# define MHD__gnutls_record_log MHD__gnutls_null_log
diff --git a/src/daemon/https/tls/gnutls_mem.h b/src/daemon/https/tls/gnutls_mem.h
@@ -31,15 +31,6 @@
typedef void svoid; /* for functions that allocate using MHD_gnutls_secure_malloc */
-/* Use MHD_gnutls_afree() when calling alloca, or
- * memory leaks may occur in systems which do not
- * support alloca.
- */
-#ifdef USE_EFENCE
-# define MHD_gnutls_alloca MHD_gnutls_malloc
-# define MHD_gnutls_afree MHD_gnutls_free
-#endif
-
#ifdef HAVE_ALLOCA
# ifdef HAVE_ALLOCA_H
# include <alloca.h>
diff --git a/src/daemon/https/tls/gnutls_mpi.h b/src/daemon/https/tls/gnutls_mpi.h
@@ -33,30 +33,14 @@ typedef gcry_mpi_t mpi_t;
#define MHD__gnutls_mpi_cmp gcry_mpi_cmp
#define MHD__gnutls_mpi_cmp_ui gcry_mpi_cmp_ui
-#define MHD__gnutls_mpi_mod gcry_mpi_mod
#define MHD__gnutls_mpi_new gcry_mpi_new
#define MHD__gnutls_mpi_snew gcry_mpi_snew
#define MHD__gnutls_mpi_copy gcry_mpi_copy
-#define MHD__gnutls_mpi_set_ui gcry_mpi_set_ui
-#define MHD__gnutls_mpi_set gcry_mpi_set
#define MHD__gnutls_mpi_randomize gcry_mpi_randomize
#define MHD__gnutls_mpi_get_nbits gcry_mpi_get_nbits
#define MHD__gnutls_mpi_powm gcry_mpi_powm
#define MHD__gnutls_mpi_invm gcry_mpi_invm
-#define MHD__gnutls_mpi_addm gcry_mpi_addm
-#define MHD__gnutls_mpi_subm gcry_mpi_subm
-#define MHD__gnutls_mpi_sub_ui gcry_mpi_sub_ui
-#define MHD__gnutls_mpi_mulm gcry_mpi_mulm
-#define MHD__gnutls_mpi_mul gcry_mpi_mul
-#define MHD__gnutls_mpi_add gcry_mpi_add
-#define MHD__gnutls_mpi_add_ui gcry_mpi_add_ui
-#define MHD__gnutls_mpi_sub_ui gcry_mpi_sub_ui
-#define MHD__gnutls_mpi_mul_ui gcry_mpi_mul_ui
-#define MHD__gnutls_prime_check gcry_prime_check
-#define MHD__gnutls_mpi_div gcry_mpi_div
-
#define MHD__gnutls_mpi_alloc_like(x) MHD__gnutls_mpi_new(MHD__gnutls_mpi_get_nbits(x))
-#define MHD__gnutls_mpi_salloc_like(x) MHD__gnutls_mpi_snew(MHD__gnutls_mpi_get_nbits(x))
void MHD_gtls_mpi_release (mpi_t * x);
diff --git a/src/daemon/https/tls/gnutls_num.h b/src/daemon/https/tls/gnutls_num.h
@@ -45,5 +45,5 @@ void MHD_gtls_write_uint16 (uint16_t num, opaque * data);
uint32_t MHD_gtls_uint64touint32 (const uint64 *);
int MHD_gtls_uint64pp (uint64 *);
-# define MHD__gnutls_uint64zero(x) x.i[0] = x.i[1] = x.i[2] = x.i[3] = x.i[4] = x.i[5] = x.i[6] = x.i[7] = 0
-# define UINT64DATA(x) x.i
+#define MHD__gnutls_uint64zero(x) x.i[0] = x.i[1] = x.i[2] = x.i[3] = x.i[4] = x.i[5] = x.i[6] = x.i[7] = 0
+#define UINT64DATA(x) x.i
diff --git a/src/daemon/https/tls/gnutls_priority.c b/src/daemon/https/tls/gnutls_priority.c
@@ -71,8 +71,6 @@ static const int MHD_gtls_comp_priority[] = { MHD_GNUTLS_COMP_NULL,
0
};
-typedef void (rmadd_func) (MHD_gtls_priority_st * priority_list, int alg);
-
/**
* MHD__gnutls_priority_set - Sets priorities for the cipher suites supported by gnutls.
* @session: is a #MHD_gtls_session_t structure.
