Define SEQ_NUM_SIZE

Replace the hard coded value 8 (the size of the sequence number) with a
constant defined in a macro.

Reviewed-by: Richard Levitte <levitte@openssl.org>

diff --git a/ssl/record/dtls1_bitmap.c b/ssl/record/dtls1_bitmap.c
index eef6b246e0185ad5f901c938e650ad516c8a90c6..9d2d681fbf2a7dd4525776f7541997219baf8c7d 100644 (file)
--- a/ssl/record/dtls1_bitmap.c
+++ b/ssl/record/dtls1_bitmap.c
@@ -209,7 +209,7 @@ void dtls1_record_bitmap_update(SSL *s, DTLS1_BITMAP *bitmap)
             bitmap->map <<= shift, bitmap->map |= 1UL;
         else
             bitmap->map = 1UL;
             bitmap->map <<= shift, bitmap->map |= 1UL;
         else
             bitmap->map = 1UL;

-        memcpy(bitmap->max_seq_num, seq, 8);
+        memcpy(bitmap->max_seq_num, seq, SEQ_NUM_SIZE);

     } else {
         shift = -cmp;
         if (shift < sizeof(bitmap->map) * 8)
     } else {
         shift = -cmp;
         if (shift < sizeof(bitmap->map) * 8)

diff --git a/ssl/record/record.h b/ssl/record/record.h
index 29fc752e6a1375d5715393bb36755d2be2f44161..99af914b5bb957f84b251e400be32986085598a7 100644 (file)
--- a/ssl/record/record.h
+++ b/ssl/record/record.h
@@ -127,6 +127,8 @@ typedef struct ssl3_buffer_st {
     int left;
 } SSL3_BUFFER;
 
     int left;
 } SSL3_BUFFER;
 

+#define SEQ_NUM_SIZE                            8
+

 typedef struct ssl3_record_st {
     /* type of record */
     /*
 typedef struct ssl3_record_st {
     /* type of record */
     /*


@@ -166,15 +168,15 @@ typedef struct ssl3_record_st {
     /* sequence number, needed by DTLS1 */
     /*
      * r
     /* sequence number, needed by DTLS1 */
     /*
      * r

-     */ unsigned char seq_num[8];
+     */ unsigned char seq_num[SEQ_NUM_SIZE];

 } SSL3_RECORD;
 
 typedef struct dtls1_bitmap_st {
 } SSL3_RECORD;
 
 typedef struct dtls1_bitmap_st {

-    unsigned long map;          /* track 32 packets on 32-bit systems and 64
-                                 * - on 64-bit systems */
+    /* Track 32 packets on 32-bit systems and 64 - on 64-bit systems */
+    unsigned long map;

 
 

-    unsigned char max_seq_num[8]; /* max record number seen so far, 64-bit
-                                   * value in big-endian encoding */
+    /* Max record number seen so far, 64-bit value in big-endian encoding */
+    unsigned char max_seq_num[SEQ_NUM_SIZE];

 } DTLS1_BITMAP;
 
 typedef struct record_pqueue_st {
 } DTLS1_BITMAP;
 
 typedef struct record_pqueue_st {

diff --git a/ssl/record/ssl3_record.c b/ssl/record/ssl3_record.c
index 8bad12578014d5b52375b9d2f2842ad67fa8fbef..cfd8290d33cf1f3c15e991d685e096ef08dc8f07 100644 (file)
--- a/ssl/record/ssl3_record.c
+++ b/ssl/record/ssl3_record.c
@@ -156,7 +156,7 @@ int SSL3_RECORD_setup(SSL3_RECORD *r)
 
 void SSL3_RECORD_set_seq_num(SSL3_RECORD *r, const unsigned char *seq_num)
 {
 
 void SSL3_RECORD_set_seq_num(SSL3_RECORD *r, const unsigned char *seq_num)
 {

-    memcpy(r->seq_num, seq_num, 8);
+    memcpy(r->seq_num, seq_num, SEQ_NUM_SIZE);

 }
 
 /*
 }
 
 /*