[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_11_6-134-ge99c3f1

[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=e99c3f18557da1a30bfc4795f0fc99b7f911f2a5

The branch, gnutls_2_12_x has been updated
       via  e99c3f18557da1a30bfc4795f0fc99b7f911f2a5 (commit)
      from  4ca034dab1e9e6323814da53d0edb4cdabbebb16 (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 e99c3f18557da1a30bfc4795f0fc99b7f911f2a5
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Feb 27 14:26:58 2011 +0100

    corrected finished packet check.

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

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

diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index 5715306..6e78a4d 100644
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -793,12 +793,14 @@ _gnutls_recv_finished (gnutls_session_t session)
       return ret;
     }
 
-  if (memcmp (vrfy, data, data_size) != 0)
+  ret = memcmp (vrfy, data, data_size);
+  gnutls_free (vrfy);
+  
+  if (ret != 0)
     {
       gnutls_assert ();
-      ret = GNUTLS_E_ERROR_IN_FINISHED_PACKET;
+      return GNUTLS_E_ERROR_IN_FINISHED_PACKET;
     }
-  gnutls_free (vrfy);
 
   ret = _gnutls_ext_sr_finished (session, data, data_size, 1);
   if (ret < 0)
@@ -821,7 +823,7 @@ _gnutls_recv_finished (gnutls_session_t session)
 
   session->internals.initial_negotiation_completed = 1;
 
-  return ret;
+  return 0;
 }
 
 /* returns PK_RSA if the given cipher suite list only supports,


hooks/post-receive
-- 
GNU gnutls