[SCM] GNU gnutls branch, master, updated. gnutls_2_9_9-49-g81b417e

[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=81b417e6ccdd9cc26b69b1d8855ae7bf440eebd9

The branch, master has been updated
       via  81b417e6ccdd9cc26b69b1d8855ae7bf440eebd9 (commit)
      from  24790726540b1389ef39c28c83049dbd6831cb3a (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 81b417e6ccdd9cc26b69b1d8855ae7bf440eebd9
Author: Steve Dispensa <address@hidden>
Date:   Tue Jan 19 20:05:37 2010 +0100

    Here is another patch that fixes an interoperability problem with safe
    renegotiation and resumption. In copying forward the safe renegotiation
    state across resumptions, I got a little carried away and copied too much
    data (new connections should start with empty RI data).
    
    Signed-off-by: Nikos Mavrogiannopoulos <address@hidden>

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

Summary of changes:
 lib/gnutls_handshake.c |   20 --------------------
 1 files changed, 0 insertions(+), 20 deletions(-)

diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index 2575894..b4e8164 100644
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -152,16 +152,6 @@ resume_copy_required_values (gnutls_session_t session)
 
   newext->connection_using_safe_renegotiation = 
          resext->connection_using_safe_renegotiation;
-
-  session->internals.initial_negotiation_completed = TRUE;
-
-  newext->client_verify_data_len = resext->client_verify_data_len;
-  memcpy (newext->client_verify_data, resext->client_verify_data, 
-         resext->client_verify_data_len);
-
-  newext->server_verify_data_len = resext->server_verify_data_len;
-  memcpy (newext->server_verify_data, resext->server_verify_data, 
-         resext->server_verify_data_len);
 }
 
 void
@@ -1709,16 +1699,6 @@ _gnutls_client_check_if_resuming (gnutls_session_t 
session,
       newext->connection_using_safe_renegotiation = 
        resext->connection_using_safe_renegotiation;
 
-      session->internals.initial_negotiation_completed = TRUE;
-
-      newext->client_verify_data_len = resext->client_verify_data_len;
-      memcpy (newext->client_verify_data, resext->client_verify_data, 
-             resext->client_verify_data_len);
-
-      newext->server_verify_data_len = resext->server_verify_data_len;
-      memcpy (newext->server_verify_data, resext->server_verify_data, 
-             resext->server_verify_data_len);
-
       return 0;
     }
   else


hooks/post-receive
-- 
GNU gnutls