*** empty log message ***

diff --git a/NEWS b/NEWS
index bca0fcb615b1aa8cad27ba6088868872f8534f76..5ee51c513a86945e04f95d87c23ff591d60c328c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ Version 1.1.10
 - Corrected bug in TLS renegotiation.
 - Corrected bug in OpenPGP key loading using a callback.
 - gnutls-srpcrypt was renamed to srptool
+- Allow handshake requests by the client.
 
 Version 1.1.9 (14/04/2004)
 - Added support for authority key identifier and the extended key usage

diff --git a/configure.in b/configure.in
index d2e179359661d58e8a0301a0470c2be556ddc765..42920f7deacccbdf56ded1f57970aa64f3e64bfa 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -12,7 +12,7 @@ AC_DEFINE_UNQUOTED(T_OS, "$target_os", [OS name])
 dnl Gnutls Version
 GNUTLS_MAJOR_VERSION=1
 GNUTLS_MINOR_VERSION=1
-GNUTLS_MICRO_VERSION=8
+GNUTLS_MICRO_VERSION=10
 GNUTLS_VERSION=$GNUTLS_MAJOR_VERSION.$GNUTLS_MINOR_VERSION.$GNUTLS_MICRO_VERSION
 
 AC_DEFINE_UNQUOTED(GNUTLS_VERSION, "$GNUTLS_VERSION", [version of gnutls])

diff --git a/doc/TODO b/doc/TODO
index ff7cc867bf7ef029d36bb5d02862f485194b75d3..d9988a97349cbc48c7ac37b0339d640d8db55213 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -21,7 +21,6 @@ Current list:
 - Convert documentation to texinfo format
 - Allow sending V2 Hello messages. It seems that some (old) broken 
   implementations require that.
-- Allow unexpected Client Hello messages
 - Add Kerberos support
 
 (+) Means high priority 

diff --git a/lib/gnutls_global.c b/lib/gnutls_global.c
index 40c154bf3e495e34d04edd8b17e8954ac8cc45a8..ccb37bafc1d7744fbfac9f410c2a1762f879197b 100644 (file)
--- a/lib/gnutls_global.c
+++ b/lib/gnutls_global.c
@@ -162,7 +162,6 @@ int gnutls_global_init( void)
 {
        int result = 0;
        int res;
-       char c;
 
        if (_gnutls_init) goto out;
        _gnutls_init++;

diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c
index b6d005147221389c62549b77bc97c72721687def..1691e7e236863b93d241da6b070206a82ab56a4f 100644 (file)
--- a/lib/gnutls_record.c
+++ b/lib/gnutls_record.c
@@ -594,8 +594,8 @@ static int _gnutls_record_check_type( gnutls_session session, ContentType recv_t
                        
                        break;
                case GNUTLS_HANDSHAKE:
-                       /* This is legal if HELLO_REQUEST is received - and we are a client,
-                        * or we are a server. A client may initiate a renegotiation at any time.
+                       /* This is legal if HELLO_REQUEST is received - and we are a client.
+                        * If we are a server, a client may initiate a renegotiation at any time.
                         */
                        if ( session->security_parameters.entity==GNUTLS_SERVER) {
                                gnutls_assert();