[SCM] GNU gnutls branch, gnutls_3_0_x, updated. gnutls_3_0_1-28-gd00daee

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

The branch, gnutls_3_0_x has been updated
       via  d00daeea289dc9b9a0e4dbfc6c6301f9521427f3 (commit)
       via  407c53056f717a3ef385d6e5fed6cb9cb7efacf4 (commit)
      from  779ef909ed68d1ffb60ed8a83cf2b8e3d7f44222 (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 d00daeea289dc9b9a0e4dbfc6c6301f9521427f3
Merge: 779ef90 407c530
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Aug 26 18:17:30 2011 +0200

    Merge branch 'master' into gnutls_3_0_x

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

Summary of changes:
 lib/gnutls_record.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c
index 1cd87a4..c0806ab 100644
--- a/lib/gnutls_record.c
+++ b/lib/gnutls_record.c
@@ -657,13 +657,12 @@ record_add_to_buffers (gnutls_session_t session,
           break;
 
         case GNUTLS_CHANGE_CIPHER_SPEC:
-          /* this packet is now handled in the recv_int()
-           * function
-           */
-          gnutls_assert ();
-
-          return GNUTLS_E_UNEXPECTED_PACKET;
+          if (!(IS_DTLS(session)))
+            return gnutls_assert_val(GNUTLS_E_UNEXPECTED_PACKET);
+            
+          _gnutls_record_buffer_put (session, type, seq, bufel);
 
+          break;
         case GNUTLS_APPLICATION_DATA:
           if (session->internals.initial_negotiation_completed == 0)
             {


hooks/post-receive
-- 
GNU gnutls