Corrected issue on the %SSL3_RECORD_VERSION priority string. It now

works even when resuming a session.

diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index d5b8ab18ff8116efe8139155f14a443cd671ff2c..cddeef7f0d1aba5ea6345cc0f160387f7c4b2165 100644 (file)
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -2015,14 +2015,9 @@ _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.
@@ -2032,7 +2027,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 daa25c29a143fde923310e00b0c94664a8c994ba..4dbb8152448d36dda2dea3d631c50fe8e415bbc4 100644 (file)
--- a/lib/gnutls_state.c
+++ b/lib/gnutls_state.c
@@ -49,9 +49,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 8935c7806a2f32077c9c8521b52f1f6133b5157a..b600a2ffeea1ad928f0a7f97fc0488911168c1fb 100644 (file)
--- 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>