diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2010-05-03 13:01:50 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2010-05-03 13:01:50 +0000 |
| commit | 8c1e7de6cbc97c55bf25d51923b904809f3426d5 (patch) | |
| tree | 6a27b3dce1ae765de47c07f0b781f076c1db5553 /ssl/d1_both.c | |
| parent | 207886cd3a4ec562d74e2e3e49fa09da27044565 (diff) | |
PR: 2230
Submitted By: Robin Seggelmann <seggelmann@fh-muenster.de>
Fix bug in bitmask macros and stop warnings.
Diffstat (limited to 'ssl/d1_both.c')
| -rw-r--r-- | ssl/d1_both.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/ssl/d1_both.c b/ssl/d1_both.c index 833af45610..4ce4064cc9 100644 --- a/ssl/d1_both.c +++ b/ssl/d1_both.c @@ -127,25 +127,26 @@ #define RSMBLY_BITMASK_MARK(bitmask, start, end) { \ if ((end) - (start) <= 8) { \ - unsigned long ii; \ + long ii; \ for (ii = (start); ii < (end); ii++) bitmask[((ii) >> 3)] |= (1 << ((ii) & 7)); \ } else { \ - unsigned long ii; \ + long ii; \ bitmask[((start) >> 3)] |= bitmask_start_values[((start) & 7)]; \ - for (ii = (((start) >> 3) + 1); ii < ((end) >> 3); ii++) bitmask[ii] = 0xff; \ - bitmask[((end) >> 3)] |= bitmask_end_values[((end) & 7)]; \ + for (ii = (((start) >> 3) + 1); ii < ((((end) - 1)) >> 3); ii++) bitmask[ii] = 0xff; \ + bitmask[(((end) - 1) >> 3)] |= bitmask_end_values[((end) & 7)]; \ } } #define RSMBLY_BITMASK_IS_COMPLETE(bitmask, msg_len, is_complete) { \ - unsigned long ii; \ + long ii; \ + OPENSSL_assert((msg_len) > 0); \ is_complete = 1; \ - if (bitmask[((msg_len) >> 3)] != bitmask_end_values[((msg_len) & 7)]) is_complete = 0; \ - if (is_complete) for (ii = 0; ii < ((msg_len) >> 3); ii++) \ - if (bitmask[ii] != 0xff) { is_complete = 0; break; } } + if (bitmask[(((msg_len) - 1) >> 3)] != bitmask_end_values[((msg_len) & 7)]) is_complete = 0; \ + if (is_complete) for (ii = (((msg_len) - 1) >> 3) - 1; ii >= 0 ; ii--) \ + if (bitmask[ii] != 0xff) { is_complete = 0; break; } } #if 0 #define RSMBLY_BITMASK_PRINT(bitmask, msg_len) { \ - int ii; \ + long ii; \ printf("bitmask: "); for (ii = 0; ii < (msg_len); ii++) \ printf("%d ", (bitmask[ii >> 3] & (1 << (ii & 7))) >> (ii & 7)); \ 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) goto err; - RSMBLY_BITMASK_MARK(frag->reassembly, msg_hdr->frag_off, - msg_hdr->frag_off + frag_len); + RSMBLY_BITMASK_MARK(frag->reassembly, (long)msg_hdr->frag_off, + (long)(msg_hdr->frag_off + frag_len)); - RSMBLY_BITMASK_IS_COMPLETE(frag->reassembly, msg_hdr->msg_len, - is_complete) + RSMBLY_BITMASK_IS_COMPLETE(frag->reassembly, (long)msg_hdr->msg_len, + is_complete); if (is_complete) { |