summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2001-11-26 10:50:38 +0000
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2001-11-26 10:50:38 +0000
commitd226a5469d1c22ef3067485b62f3a796dba4d312 (patch)
treedd821d96cdd2f670421cbe533bc6ff7b0d15c28e
parente841da1143c9c90bb6a6659c9dc20884b0c9fcba (diff)
downloadgnutls-d226a5469d1c22ef3067485b62f3a796dba4d312.tar.gz
cleanups and some corrections.
-rw-r--r--THANKS2
-rw-r--r--configure.in2
-rw-r--r--doc/README.autoconf2
-rw-r--r--doc/TODO4
-rw-r--r--lib/gnutls.h.in4
-rw-r--r--lib/gnutls_db.c3
-rw-r--r--lib/libgnutls.m41
7 files changed, 10 insertions, 8 deletions
diff --git a/THANKS b/THANKS
index 4359d99e88..7d6832f9ea 100644
--- a/THANKS
+++ b/THANKS
@@ -2,3 +2,5 @@ Tarun Upadhyay <tarun@poboxes.com>
Neil Spring <nspring@saavie.org>
Paul Sheer <psheer@icon.co.za>
Jon Nelson <jnelson@securepipe.com>
+Simon Josefsson <jas@extundo.com>
+Marco d'Itri <md@linux.it>
diff --git a/configure.in b/configure.in
index 19cc3ef489..91d378f031 100644
--- a/configure.in
+++ b/configure.in
@@ -12,7 +12,7 @@ AC_DEFINE_UNQUOTED(T_OS, "$target_os")
GNUTLS_MAJOR_VERSION=0
GNUTLS_MINOR_VERSION=2
-GNUTLS_MICRO_VERSION=11
+GNUTLS_MICRO_VERSION=90
GNUTLS_VERSION=$GNUTLS_MAJOR_VERSION.$GNUTLS_MINOR_VERSION.$GNUTLS_MICRO_VERSION
AC_DEFINE_UNQUOTED(GNUTLS_VERSION, "$GNUTLS_VERSION")
diff --git a/doc/README.autoconf b/doc/README.autoconf
index 4f24e4d517..125cc79155 100644
--- a/doc/README.autoconf
+++ b/doc/README.autoconf
@@ -5,7 +5,7 @@ aclocal.m4:
include(libgnutls.m4)
configure.in:
- AM_PATH_LIBGNUTLS( 0.2.3,, AC_MSG_ERROR[[*** gnutls was not found]]))
+ AM_PATH_LIBGNUTLS( 0.2.3,, AC_MSG_ERROR([[*** gnutls was not found]]))
these macros define LIBGNUTLS_LIBS and LIBGNUTLS_CFLAGS.
diff --git a/doc/TODO b/doc/TODO
index 81e33d199b..6609d189b1 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -5,13 +5,13 @@ in order to avoid having people working on the same thing.
Current list:
+ Make gnutls independent of the Certificate Manager (in order to support
other x.509 certificate managers)
++ Trace memory leaks in libgcrypt
++ Audit the code (we need help. Contact nmav@gnutls.org)
* Add callbacks to get SRP parameters (instead of a reading password file)
-* Trace memory leaks in libgcrypt
* Drop dnsname extension
* Minimize footprint.
* Add support for certificates with DSS parameters
* Add more TLS extensions
-* Audit the code (volunteers?)
* Add support for PKCS8 encrypted private keys
* OpenPGP certificate support
- Add Kerberos support
diff --git a/lib/gnutls.h.in b/lib/gnutls.h.in
index f3871f7acf..9485277de8 100644
--- a/lib/gnutls.h.in
+++ b/lib/gnutls.h.in
@@ -141,8 +141,8 @@ typedef int (*DB_STORE_FUNC)(void*, gnutls_datum key, gnutls_datum data);
typedef int (*DB_REMOVE_FUNC)(void*, gnutls_datum key);
typedef gnutls_datum (*DB_RETR_FUNC)(void*, gnutls_datum key);
-int gnutls_set_lowat( GNUTLS_STATE state, int num);
-int gnutls_set_cache_expiration( GNUTLS_STATE state, int seconds);
+void gnutls_set_lowat( GNUTLS_STATE state, int num);
+void gnutls_set_cache_expiration( GNUTLS_STATE state, int seconds);
int gnutls_set_db_name( GNUTLS_STATE state, char* filename);
int gnutls_clean_db( GNUTLS_STATE state);
void gnutls_set_db_retrieve_func( GNUTLS_STATE, DB_RETR_FUNC);
diff --git a/lib/gnutls_db.c b/lib/gnutls_db.c
index 311b295ba5..88ebc989e9 100644
--- a/lib/gnutls_db.c
+++ b/lib/gnutls_db.c
@@ -112,9 +112,8 @@ void gnutls_set_db_ptr( GNUTLS_STATE state, void* ptr) {
* Sets the expiration time for resumed sessions. The default is 3600 (one hour)
* at the time writing this.
**/
-int gnutls_set_cache_expiration( GNUTLS_STATE state, int seconds) {
+void gnutls_set_cache_expiration( GNUTLS_STATE state, int seconds) {
state->gnutls_internals.expire_time = seconds;
- return 0;
}
/**
diff --git a/lib/libgnutls.m4 b/lib/libgnutls.m4
index 0e569e2713..68701219b5 100644
--- a/lib/libgnutls.m4
+++ b/lib/libgnutls.m4
@@ -152,6 +152,7 @@ main ()
LIBGNUTLS_CFLAGS=""
LIBGNUTLS_LIBS=""
ifelse([$3], , :, [$3])
+ rm -f conf.libngnutlstest
fi
AC_SUBST(LIBGNUTLS_CFLAGS)
AC_SUBST(LIBGNUTLS_LIBS)