[SCM] GNU gnutls branch, gnutls_2_8_x, updated. gnutls_2_8_4-13-g6fe6e1d

[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=6fe6e1d8419dec5de8e9883766d58fdf4d12eae3

The branch, gnutls_2_8_x has been updated
       via  6fe6e1d8419dec5de8e9883766d58fdf4d12eae3 (commit)
      from  dd82b3b1f3dd88eb16a0c73a08682e6d14bac0a3 (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 6fe6e1d8419dec5de8e9883766d58fdf4d12eae3
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Oct 28 10:54:26 2009 +0200

    When resuming a session do not overwrite the initial session data with 
resumed
    session data. Discovered on discussion at help-gnutls with Sebastien 
Decugis.

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

Summary of changes:
 NEWS                   |    3 +++
 lib/gnutls_handshake.c |   13 +++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index 78f8554..750be79 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,9 @@ See the end for copying conditions.
 
 * Version 2.8.5 (unreleased)
 
+** libgnutls: In server side when resuming a session do not overwrite the 
+initial session data with the resumed session data.
+
 ** libgnutls: Fix PKCS#12 encoding.
 The error you would get was "The OID is not supported.".  Problem
 introduced for the v2.8.x branch in 2.7.6.
diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index 1ad4f52..a90f2e3 100644
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -2686,6 +2686,13 @@ _gnutls_handshake_common (gnutls_session_t session)
 
       ret = _gnutls_send_handshake_final (session, FALSE);
       IMED_RET ("send handshake final", ret);
+
+      /* only store if we are not resuming */
+      if (session->security_parameters.entity == GNUTLS_SERVER)
+        {
+          /* in order to support session resuming */
+          _gnutls_server_register_current_session (session);
+        }
     }
   else
     {                          /* if we are a client not resuming - or we are 
a server resuming */
@@ -2697,12 +2704,6 @@ _gnutls_handshake_common (gnutls_session_t session)
       IMED_RET ("recv handshake final 2", ret);
     }
 
-  if (session->security_parameters.entity == GNUTLS_SERVER)
-    {
-      /* in order to support session resuming */
-      _gnutls_server_register_current_session (session);
-    }
-
   /* clear handshake buffer */
   _gnutls_handshake_hash_buffers_clear (session);
   return ret;


hooks/post-receive
-- 
GNU gnutls