[SCM] GNU gnutls branch, master, updated. gnutls_2_11_6-318-ge27c695

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

The branch, master has been updated
       via  e27c6954f248051a8808c568119f4d164921bdc3 (commit)
      from  988e0626e2864ae62e059fcb297b2801669c6bed (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 e27c6954f248051a8808c568119f4d164921bdc3
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Mar 16 23:04:04 2011 +0100

    When sending multiple cookies due to verification errors do not increase 
the handshake sequence
    number only the record sequence.

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

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

diff --git a/lib/gnutls_dtls.c b/lib/gnutls_dtls.c
index 6ecf414..9a5771e 100644
--- a/lib/gnutls_dtls.c
+++ b/lib/gnutls_dtls.c
@@ -563,8 +563,8 @@ uint8_t digest[C_HASH_SIZE];
     return gnutls_assert_val(GNUTLS_E_BAD_COOKIE);
   
   out->record_seq = msg[10]; /* client's record seq */
-  out->hsk_read_seq =  msg[DTLS_RECORD_HEADER_SIZE+5];/* client's hsk seq */
-  out->hsk_write_seq = out->hsk_read_seq;/* client's hsk seq */
+  out->hsk_read_seq =  msg[DTLS_RECORD_HEADER_SIZE+5]; /* client's hsk seq */
+  out->hsk_write_seq = 0;/* we always send zero for this msg */
   
   return 0;
 }
@@ -599,5 +599,5 @@ void gnutls_dtls_prestate_set(gnutls_session_t session, 
gnutls_dtls_prestate_st*
   params->write.sequence_number.i[7] = st->record_seq;
 
   session->internals.dtls.hsk_read_seq = st->hsk_read_seq;
-  session->internals.dtls.hsk_write_seq = st->hsk_write_seq;
+  session->internals.dtls.hsk_write_seq = st->hsk_write_seq + 1;
 }


hooks/post-receive
-- 
GNU gnutls