diff options
| -rw-r--r-- | NEWS | 4 | ||||
| -rwxr-xr-x | buildconf | 2 | ||||
| -rw-r--r-- | configure.in | 30 | ||||
| -rw-r--r-- | lib/gnutls.h.in.in | 3 | ||||
| -rw-r--r-- | lib/gnutls_global.c | 5 | ||||
| -rw-r--r-- | libextra/gnutls_extra.c | 5 | ||||
| -rw-r--r-- | libmcrypt.m4 | 6 |
7 files changed, 25 insertions, 30 deletions
@@ -1,7 +1,7 @@ Version 0.5.7 - Some fixes in the memory allocation functions (realloc). -- Fixes in the string functions used in XML certificate generation. -- Removed gdbm dependency. +- Improved the string functions used in XML certificate generation. +- Removed dependency on libgdbm. Version 0.5.6 (6/09/2002) - Corrected bugs in SRP implementation, which prevented gnutls @@ -3,7 +3,7 @@ aclocal -I . && \ libtoolize -c --force --automake && \ aclocal -I . && \ -autoheader && \ +autoheader -Wall && \ automake -a -c --gnu || automake -a -c --gnu autoconf diff --git a/configure.in b/configure.in index ba6a591488..4af2779783 100644 --- a/configure.in +++ b/configure.in @@ -5,9 +5,9 @@ AC_INIT AC_PREFIX_DEFAULT(/usr/local) AC_CANONICAL_TARGET([]) -AC_DEFINE_UNQUOTED(T_CPU, "$target_cpu") -AC_DEFINE_UNQUOTED(T_VENDOR, "$target_vendor") -AC_DEFINE_UNQUOTED(T_OS, "$target_os") +AC_DEFINE_UNQUOTED(T_CPU, "$target_cpu", [CPU name]) +AC_DEFINE_UNQUOTED(T_VENDOR, "$target_vendor", [Vendor name]) +AC_DEFINE_UNQUOTED(T_OS, "$target_os", [OS name]) dnl Gnutls Version GNUTLS_MAJOR_VERSION=0 @@ -15,9 +15,9 @@ GNUTLS_MINOR_VERSION=5 GNUTLS_MICRO_VERSION=7 GNUTLS_VERSION=$GNUTLS_MAJOR_VERSION.$GNUTLS_MINOR_VERSION.$GNUTLS_MICRO_VERSION -AC_DEFINE_UNQUOTED(GNUTLS_VERSION, "$GNUTLS_VERSION") +AC_DEFINE_UNQUOTED(GNUTLS_VERSION, "$GNUTLS_VERSION", [version of gnutls]) -AM_INIT_AUTOMAKE(gnutls, $GNUTLS_VERSION) +AM_INIT_AUTOMAKE(gnutls, $GNUTLS_VERSION, [version of gnutls]) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE @@ -105,7 +105,7 @@ test_mac(x,y,z); return 0; ], dnl ***** OK -AC_DEFINE(C99_MACROS) +AC_DEFINE(C99_MACROS, 1, [C99 macros are supported]) AC_MSG_RESULT(yes), dnl ***** NOT FOUND AC_MSG_RESULT(no) @@ -124,11 +124,11 @@ if test $ac_cv_c_compiler_gnu != no; then if test x$opt_dmalloc_mode = xyes; then AC_CHECK_LIB( dmalloc, main) - AC_DEFINE(USE_DMALLOC) + AC_DEFINE(USE_DMALLOC, 1, [enable the use of dmalloc]) else if test x$opt_efence_mode = xyes; then AC_CHECK_LIB( efence, main) - AC_DEFINE(USE_EFENCE) + AC_DEFINE(USE_EFENCE, 1, [use electric fence]) fi fi @@ -176,7 +176,7 @@ AC_CHECK_TYPE(size_t, DEFINE_SIZE_T="#include <sys/types.h>" AC_SUBST( DEFINE_SIZE_T) , -AC_DEFINE(NO_SIZE_T) +AC_DEFINE(NO_SIZE_T, 1, [no size_t type was found]) DEFINE_SIZE_T="typedef unsigned int size_t; typedef int ssize_t;" AC_SUBST( DEFINE_SIZE_T) ,[ @@ -199,7 +199,7 @@ AC_CHECK_TYPE(time_t, , DEFINE_TIME_T="typedef unsigned int time_t;" AC_SUBST( DEFINE_TIME_T) - AC_DEFINE(NO_TIME_T), + AC_DEFINE(NO_TIME_T, 1, [no time_t type was found]), [ #include <sys/time.h> ] @@ -225,7 +225,7 @@ AM_PATH_LIBGCRYPT(1.1.8,, *** ]])) dnl Can't disable - gnutls depends on gcrypt -AC_DEFINE(USE_GCRYPT) +AC_DEFINE(USE_GCRYPT, 1, [use gcrypt]) dnl MCRYPT @@ -240,7 +240,7 @@ AC_ARG_WITH( mcrypt, [ --with-mcrypt enable libmcrypt support], LIBS="${LIBS} ${LIBMCRYPT_LIBS}" AC_ARG_WITH( mhash, [ --with-mhash enable libmhash support], - [AC_CHECK_LIB(mhash, mhash_init, AC_DEFINE(USE_MHASH) + [AC_CHECK_LIB(mhash, mhash_init, AC_DEFINE(USE_MHASH, 1, [Whether to use mhash]) LIBS="${LIBS} -lmhash")]) AC_MSG_CHECKING([whether to check for external libraries]) @@ -267,7 +267,7 @@ AC_ARG_ENABLE( srp-authentication, [ --disable-srp-authentication disable t ) if test x$ac_enable_srp != xno; then AC_MSG_RESULT(no) - AC_DEFINE(ENABLE_SRP) + AC_DEFINE(ENABLE_SRP, 1, [enable SRP authentication]) else AC_MSG_RESULT(yes) fi @@ -278,7 +278,7 @@ AC_ARG_ENABLE( anon-authentication, [ --disable-anon-authentication disable ) if test x$ac_enable_anon != xno; then AC_MSG_RESULT(no) - AC_DEFINE(ENABLE_ANON) + AC_DEFINE(ENABLE_ANON, 1, [enable anonymous authentication]) else AC_MSG_RESULT(yes) fi @@ -290,7 +290,7 @@ AC_ARG_ENABLE( openpgp-authentication, [ --disable-openpgp-authentication disab ) if test x$ac_enable_openpgp != xno; then AC_MSG_RESULT(no) - AM_PATH_LIBOPENCDK( 0.2.0, AC_DEFINE(HAVE_LIBOPENCDK), + AM_PATH_LIBOPENCDK( 0.2.0, AC_DEFINE(HAVE_LIBOPENCDK, 1, [have libopencdk]), AC_MSG_WARN([[ *** *** libopencdk 0.2.0 was not found. You will not be able to use OpenPGP keys with gnutls. diff --git a/lib/gnutls.h.in.in b/lib/gnutls.h.in.in index efa8cff3e8..8399759c6e 100644 --- a/lib/gnutls.h.in.in +++ b/lib/gnutls.h.in.in @@ -224,7 +224,8 @@ int gnutls_db_check_entry( gnutls_session session, gnutls_datum session_entry); void gnutls_handshake_set_max_packet_length( gnutls_session session, int max); -/* returns libgnutls version */ +/* returns libgnutls version (call it with a NULL argument) + */ const char* gnutls_check_version( const char*); /* Functions for setting/clearing credentials diff --git a/lib/gnutls_global.c b/lib/gnutls_global.c index aac129ea90..c4041be53b 100644 --- a/lib/gnutls_global.c +++ b/lib/gnutls_global.c @@ -326,8 +326,3 @@ gnutls_check_version( const char *req_version ) return NULL; } -const char * -_gnutls_return_version( void) -{ - return GNUTLS_VERSION; -} diff --git a/libextra/gnutls_extra.c b/libextra/gnutls_extra.c index 65216adcff..674ba0c9a0 100644 --- a/libextra/gnutls_extra.c +++ b/libextra/gnutls_extra.c @@ -97,10 +97,9 @@ static void _gnutls_add_openpgp_functions(void) { return; } +const char* gnutls_check_version( const char*); static int _gnutls_init_extra = 0; -const char* _gnutls_return_version( void); - /** * gnutls_global_init_extra - This function initializes the global state of gnutls-extra * @@ -119,7 +118,7 @@ int ret; * libextra, then do not initialize the library. * This is because it may break things. */ - if (strcmp( _gnutls_return_version(), VERSION)!=0) { + if (strcmp( gnutls_check_version(NULL), GNUTLS_VERSION)!=0) { return GNUTLS_E_LIBRARY_VERSION_MISMATCH; } diff --git a/libmcrypt.m4 b/libmcrypt.m4 index 876f38574c..1f36389d73 100644 --- a/libmcrypt.m4 +++ b/libmcrypt.m4 @@ -60,7 +60,7 @@ main () fi LIBMCRYPT_CFLAGS="${TTINCLUDE}" LIBMCRYPT_LIBS="${TTLIBS} -lmcrypt" - AC_DEFINE(LIBMCRYPT22) + AC_DEFINE(LIBMCRYPT22, 1, [have libmcrypt 2.2]) , libmcrypt_config_version="2.4.0" if test x$libmcrypt_config_prefix != x ; then @@ -69,13 +69,13 @@ main () fi LIBMCRYPT_CFLAGS="${TTINCLUDE}" LIBMCRYPT_LIBS="${TTLIBS} -lmcrypt -lltdl ${LIBADD_DL}" - AC_DEFINE(LIBMCRYPT24)) + AC_DEFINE(LIBMCRYPT24, 1, [have libmcrypt 2.4])) else dnl libmcrypt-config was found LIBMCRYPT_CFLAGS=`$LIBMCRYPT_CONFIG $libmcrypt_config_args --cflags` LIBMCRYPT_LIBS=`$LIBMCRYPT_CONFIG $libmcrypt_config_args --libs` libmcrypt_config_version=`$LIBMCRYPT_CONFIG $libmcrypt_config_args --version` - AC_DEFINE(LIBMCRYPT24) + AC_DEFINE(LIBMCRYPT24, 1, [have libmcrypt 2.4]) fi ac_save_CFLAGS="$CFLAGS" |