[SCM] GNU gnutls branch, new, updated. gnutls_2_9_10-42-g32138bf

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=32138bf001b3c8ebd65a8773b03ec4c1b4295961

The branch, new has been updated
       via  32138bf001b3c8ebd65a8773b03ec4c1b4295961 (commit)
       via  4495e9c3feb5869f5b750bf47397845e5d02949f (commit)
      from  9c21137aed2910de498832f598ae49238f40a27b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 32138bf001b3c8ebd65a8773b03ec4c1b4295961
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun May 16 13:54:05 2010 +0200

    Only send termination request to avoid stalling on servers that do not 
reply.

commit 4495e9c3feb5869f5b750bf47397845e5d02949f
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun May 16 13:53:03 2010 +0200

    Corrected issue on the %SSL3_RECORD_VERSION priority string. It now
    works even when resuming a session.

-----------------------------------------------------------------------

Summary of changes:
 lib/gnutls_handshake.c |    9 ++-------
 lib/gnutls_state.c     |    3 ---
 lib/gnutls_state.h     |    3 +++
 src/cli.c              |    2 +-
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index f24fa63..dc1fe3a 100644
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -2020,15 +2020,10 @@ _gnutls_send_client_hello (gnutls_session_t session, 
int again)
        * (RSA uses it).
        */
       _gnutls_set_adv_version (session, hver);
+      _gnutls_set_current_version (session, hver);
 
       if (session->internals.priorities.ssl3_record_version)
        {
-         /* Honor the SSL3_RECORD_VERSION option
-          */
-         _gnutls_set_current_version (session, GNUTLS_SSL3);
-       }
-      else
-       {
          /* Some old implementations do not interoperate if we send a
           * different version in the record layer.
           * It seems they prefer to read the record's version
@@ -2037,7 +2032,7 @@ _gnutls_send_client_hello (gnutls_session_t session, int 
again)
           * handshake packet and ignore the one in the packet's record 
           * header.
           */
-         _gnutls_set_current_version (session, hver);
+         _gnutls_record_set_default_version (session, 3, 0);
        }
 
       /* In order to know when this session was initiated.
diff --git a/lib/gnutls_state.c b/lib/gnutls_state.c
index 46c1a36..356a22e 100644
--- a/lib/gnutls_state.c
+++ b/lib/gnutls_state.c
@@ -48,9 +48,6 @@
 /* These should really be static, but src/tests.c calls them.  Make
    them public functions?  */
 void
-_gnutls_record_set_default_version (gnutls_session_t session,
-                                   unsigned char major, unsigned char minor);
-void
 _gnutls_rsa_pms_set_version (gnutls_session_t session,
                             unsigned char major, unsigned char minor);
 
diff --git a/lib/gnutls_state.h b/lib/gnutls_state.h
index bc69bd3..9e46547 100644
--- a/lib/gnutls_state.h
+++ b/lib/gnutls_state.h
@@ -30,6 +30,9 @@
 
 void _gnutls_session_cert_type_set (gnutls_session_t session,
                                    gnutls_certificate_type_t);
+void
+_gnutls_record_set_default_version (gnutls_session_t session,
+                                   unsigned char major, unsigned char minor);
 
 #include <gnutls_auth.h>
 
diff --git a/src/cli.c b/src/cli.c
index 166af89..cbf9452 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -1364,7 +1364,7 @@ socket_bye (socket_st * socket)
   if (socket->secure)
     {
       do
-       ret = gnutls_bye (socket->session, GNUTLS_SHUT_RDWR);
+       ret = gnutls_bye (socket->session, GNUTLS_SHUT_WR);
       while (ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN);
       if (ret < 0)
        fprintf (stderr, "*** gnutls_bye() error: %s\n",


hooks/post-receive
-- 
GNU gnutls