generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PR: 2230

Browse Source 
Submitted By: Robin Seggelmann <seggelmann@fh-muenster.de>

Fix bug in bitmask macros and stop warnings.
This commit is contained in:
Dr. Stephen Henson 2010-05-03 13:01:40 +00:00
parent efcf5f1c50
commit 6006ae148c
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ssl/d1_both.c
View File

@ -127,25 +127,26 @@
#define RSMBLY_BITMASK_MARK(bitmask, start, end) { \ #define RSMBLY_BITMASK_MARK(bitmask, start, end) { \
if ((end) - (start) <= 8) { \ if ((end) - (start) <= 8) { \
unsigned long ii; \ long ii; \
for (ii = (start); ii < (end); ii++) bitmask[((ii) >> 3)] |= (1 << ((ii) & 7)); \ for (ii = (start); ii < (end); ii++) bitmask[((ii) >> 3)] |= (1 << ((ii) & 7)); \
} else { \ } else { \
unsigned long ii; \ long ii; \
bitmask[((start) >> 3)] |= bitmask_start_values[((start) & 7)]; \ bitmask[((start) >> 3)] |= bitmask_start_values[((start) & 7)]; \
for (ii = (((start) >> 3) + 1); ii < ((end) >> 3); ii++) bitmask[ii] = 0xff; \ for (ii = (((start) >> 3) + 1); ii < ((((end) - 1)) >> 3); ii++) bitmask[ii] = 0xff; \
bitmask[((end) >> 3)] |= bitmask_end_values[((end) & 7)]; \ bitmask[(((end) - 1) >> 3)] |= bitmask_end_values[((end) & 7)]; \
} } } }
#define RSMBLY_BITMASK_IS_COMPLETE(bitmask, msg_len, is_complete) { \ #define RSMBLY_BITMASK_IS_COMPLETE(bitmask, msg_len, is_complete) { \
unsigned long ii; \ long ii; \
OPENSSL_assert((msg_len) > 0); \
is_complete = 1; \ is_complete = 1; \
if (bitmask[((msg_len) >> 3)] != bitmask_end_values[((msg_len) & 7)]) is_complete = 0; \ if (bitmask[(((msg_len) - 1) >> 3)] != bitmask_end_values[((msg_len) & 7)]) is_complete = 0; \
if (is_complete) for (ii = 0; ii < ((msg_len) >> 3); ii++) \ if (is_complete) for (ii = (((msg_len) - 1) >> 3) - 1; ii >= 0 ; ii--) \
if (bitmask[ii] != 0xff) { is_complete = 0; break; } } if (bitmask[ii] != 0xff) { is_complete = 0; break; } }
#if 0 #if 0
#define RSMBLY_BITMASK_PRINT(bitmask, msg_len) { \ #define RSMBLY_BITMASK_PRINT(bitmask, msg_len) { \
int ii; \ long ii; \
printf("bitmask: "); for (ii = 0; ii < (msg_len); ii++) \ printf("bitmask: "); for (ii = 0; ii < (msg_len); ii++) \
printf("%d ", (bitmask[ii >> 3] & (1 << (ii & 7))) >> (ii & 7)); \ printf("%d ", (bitmask[ii >> 3] & (1 << (ii & 7))) >> (ii & 7)); \
printf("\n"); } printf("\n"); }
@ -658,11 +659,11 @@ dtls1_reassemble_fragment(SSL *s, struct hm_header_st* msg_hdr, int *ok)
if (i<=0 || (unsigned long)i!=frag_len) if (i<=0 || (unsigned long)i!=frag_len)
goto err; goto err;
RSMBLY_BITMASK_MARK(frag->reassembly, msg_hdr->frag_off, RSMBLY_BITMASK_MARK(frag->reassembly, (long)msg_hdr->frag_off,
msg_hdr->frag_off + frag_len); (long)(msg_hdr->frag_off + frag_len));
RSMBLY_BITMASK_IS_COMPLETE(frag->reassembly, msg_hdr->msg_len, RSMBLY_BITMASK_IS_COMPLETE(frag->reassembly, (long)msg_hdr->msg_len,
is_complete) is_complete);
if (is_complete) if (is_complete)
{ {