From: Jonathan Bastien-Filiatrault <joe@x2a.org>
Date: Sun, 5 Sep 2010 05:33:01 +0000 (-0400)
Subject: Decrypt using the proper sequence number.
X-Git-Tag: gnutls_2_99_0~238
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df20b0001d43b2f552858b47ef059af61aea6c45;p=thirdparty%2Fgnutls.git

Decrypt using the proper sequence number.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
---

diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c
index 3186690c70..c831c1872e 100644
--- a/lib/gnutls_record.c
+++ b/lib/gnutls_record.c
@@ -920,7 +920,8 @@ _gnutls_recv_int (gnutls_session_t session, content_type_t type,
 {
   int decrypted_length;
   opaque version[2];
-  uint64 sequence;
+  uint64 dtls_sequence;
+  uint64 *decrypt_sequence;
   content_type_t recv_type;
   uint16_t length;
   uint8_t *ciphertext;
@@ -1017,7 +1018,7 @@ begin:
 
   if ((ret =
        record_check_headers (session, data_enc.data, type, htype, &recv_type,
-                             version, &sequence, &length, &header_size)) < 0)
+			     version, &dtls_sequence, &length, &header_size)) < 0)
     {
       gnutls_assert ();
       return ret;
@@ -1099,11 +1100,14 @@ begin:
       return ret;
     }
 
+  decrypt_sequence =
+    _gnutls_is_dtls(session) ? &dtls_sequence : &record_state->sequence_number;
+
 /* decrypt the data we got. 
  */
   ret =
     _gnutls_decrypt (session, ciphertext, length, tmp.data, tmp.size,
-                     recv_type, record_params);
+		     recv_type, record_params, decrypt_sequence);
   if (ret < 0)
     {
       session_unresumable (session);