141,142c141
< long max, int *ok);
< static void dtls1_process_handshake_fragment(SSL *s, int frag_len);
---
> long max, int *ok);
146,148c145,147
< {
< hm_fragment *frag = NULL;
< unsigned char *buf = NULL;
---
> {
> hm_fragment *frag = NULL;
> unsigned char *buf = NULL;
150,152c149,151
< frag = (hm_fragment *)OPENSSL_malloc(sizeof(hm_fragment));
< if ( frag == NULL)
< return NULL;
---
> frag = (hm_fragment *)OPENSSL_malloc(sizeof(hm_fragment));
> if ( frag == NULL)
> return NULL;
154,162c153,161
< buf = (unsigned char *)OPENSSL_malloc(frag_len
< + DTLS1_HM_HEADER_LENGTH);
< if ( buf == NULL)
< {
< OPENSSL_free(frag);
< return NULL;
< }
<
< frag->fragment = buf;
---
> if (frag_len)
> {
> buf = (unsigned char *)OPENSSL_malloc(frag_len);
> if ( buf == NULL)
> {
> OPENSSL_free(frag);
> return NULL;
> }
> }
164,165c163,164
< return frag;
< }
---
> /* zero length fragment gets zero frag->fragment */
> frag->fragment = buf;
166a166,168
> return frag;
> }
>
169,172c171,174
< {
< OPENSSL_free(frag->fragment);
< OPENSSL_free(frag);
< }
---
> {
> if (frag->fragment) OPENSSL_free(frag->fragment);
> OPENSSL_free(frag);
> }
183c185
< {
---
> {
210c212
<
---
>
257c259
< /* write atleast DTLS1_HM_HEADER_LENGTH bytes */
---
> /* write atleast DTLS1_HM_HEADER_LENGTH bytes */
261c263
<
---
>
289c291
<
---
>
292,293c294,295
< OPENSSL_assert(len == (unsigned int)ret);
<
---
> OPENSSL_assert(len == (unsigned int)ret);
>
294a297
> {
297,300c300,324
< ssl3_finish_mac(s,
< (unsigned char *)&s->init_buf->data[s->init_off +
< DTLS1_HM_HEADER_LENGTH], ret - DTLS1_HM_HEADER_LENGTH);
<
---
> unsigned char *p = &s->init_buf->data[s->init_off];
> const struct hm_header_st *msg_hdr = &s->d1->w_msg_hdr;
> int len;
>
> if (frag_off == 0 && s->client_version != DTLS1_BAD_VER)
> {
> /* reconstruct message header is if it
> * is being sent in single fragment */
> *p++ = msg_hdr->type;
> l2n3(msg_hdr->msg_len,p);
> s2n (msg_hdr->seq,p);
> l2n3(0,p);
> l2n3(msg_hdr->msg_len,p);
> p -= DTLS1_HM_HEADER_LENGTH;
> len = ret;
> }
> else
> {
> p += DTLS1_HM_HEADER_LENGTH;
> len = ret - DTLS1_HM_HEADER_LENGTH;
> }
>
> ssl3_finish_mac(s, p, len);
> }
>
310c334
<
---
>
329a354
> struct hm_header_st *msg_hdr;
347c372,373
<
---
>
> msg_hdr = &s->d1->r_msg_hdr;
350c376
< if ( s->d1->r_msg_hdr.frag_off == 0)
---
> if ( msg_hdr->frag_off == 0)
353c379
< memset(&(s->d1->r_msg_hdr), 0x00, sizeof(struct hm_header_st));
---
> memset(msg_hdr, 0x00, sizeof(struct hm_header_st));
358c384
< i == DTLS1_HM_FRAGMENT_RETRY) /* bad fragment received */
---
> i == DTLS1_HM_FRAGMENT_RETRY) /* bad fragment received */
363c389,399
< if (s->d1->r_msg_hdr.msg_len == (unsigned int)s->init_num - DTLS1_HM_HEADER_LENGTH)
---
> /* Note that s->init_sum is used as a counter summing
> * up fragments' lengths: as soon as they sum up to
> * handshake packet length, we assume we have got all
> * the fragments. Overlapping fragments would cause
> * premature termination, so we don't expect overlaps.
> * Well, handling overlaps would require something more
> * drastic. Indeed, as it is now there is no way to
> * tell if out-of-order fragment from the middle was
> * the last. '>=' is the best/least we can do to control
> * the potential damage caused by malformed overlaps. */
> if ((unsigned int)s->init_num >= msg_hdr->msg_len)
365c401,402
< memset(&(s->d1->r_msg_hdr), 0x00, sizeof(struct hm_header_st));
---
> unsigned char *p = s->init_buf->data;
> unsigned long msg_len = msg_hdr->msg_len;
366a404,422
> /* reconstruct message header as if it was
> * sent in single fragment */
> *(p++) = msg_hdr->type;
> l2n3(msg_len,p);
> s2n (msg_hdr->seq,p);
> l2n3(0,p);
> l2n3(msg_len,p);
> if (s->client_version != DTLS1_BAD_VER)
> p -= DTLS1_HM_HEADER_LENGTH,
> msg_len += DTLS1_HM_HEADER_LENGTH;
>
> ssl3_finish_mac(s, p, msg_len);
> if (s->msg_callback)
> s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE,
> p, msg_len,
> s, s->msg_callback_arg);
>
> memset(msg_hdr, 0x00, sizeof(struct hm_header_st));
>
382,383c438,439
< s->init_msg = s->init_buf->data + DTLS1_HM_HEADER_LENGTH;
< return s->init_num - DTLS1_HM_HEADER_LENGTH;
---
> s->init_msg = s->init_buf->data + DTLS1_HM_HEADER_LENGTH;
> return s->init_num;
386c442
< s->d1->r_msg_hdr.frag_off = i;
---
> msg_hdr->frag_off = i;
396,407c452,454
< static int
< dtls1_retrieve_buffered_fragment(SSL *s, unsigned long *copied)
< {
< /* (0) check whether the desired fragment is available
< * if so:
< * (1) copy over the fragment to s->init_buf->data[]
< * (2) update s->init_num
< */
< pitem *item;
< hm_fragment *frag;
< unsigned long overlap;
< unsigned char *p;
---
> static int dtls1_preprocess_fragment(SSL *s,struct hm_header_st *msg_hdr,int max)
> {
> size_t frag_off,frag_len,msg_len;
409,411c456,458
< item = pqueue_peek(s->d1->buffered_messages);
< if ( item == NULL)
< return 0;
---
> msg_len = msg_hdr->msg_len;
> frag_off = msg_hdr->frag_off;
> frag_len = msg_hdr->frag_len;
413,420c460,465
< frag = (hm_fragment *)item->data;
<
< if ( s->d1->handshake_read_seq == frag->msg_header.seq &&
< frag->msg_header.frag_off <= (unsigned int)s->init_num - DTLS1_HM_HEADER_LENGTH)
< {
< pqueue_pop(s->d1->buffered_messages);
< overlap = s->init_num - DTLS1_HM_HEADER_LENGTH
< - frag->msg_header.frag_off;
---
> /* sanity checking */
> if ( (frag_off+frag_len) > msg_len)
> {
> SSLerr(SSL_F_DTLS1_PREPROCESS_FRAGMENT,SSL_R_EXCESSIVE_MESSAGE_SIZE);
> return SSL_AD_ILLEGAL_PARAMETER;
> }
422c467,471
< p = frag->fragment;
---
> if ( (frag_off+frag_len) > (unsigned long)max)
> {
> SSLerr(SSL_F_DTLS1_PREPROCESS_FRAGMENT,SSL_R_EXCESSIVE_MESSAGE_SIZE);
> return SSL_AD_ILLEGAL_PARAMETER;
> }
424,430c473,481
< memcpy(&s->init_buf->data[s->init_num],
< p + DTLS1_HM_HEADER_LENGTH + overlap,
< frag->msg_header.frag_len - overlap);
<
< OPENSSL_free(frag->fragment);
< OPENSSL_free(frag);
< pitem_free(item);
---
> if ( s->d1->r_msg_hdr.frag_off == 0) /* first fragment */
> {
> /* msg_len is limited to 2^24, but is effectively checked
> * against max above */
> if (!BUF_MEM_grow_clean(s->init_buf,(int)msg_len+DTLS1_HM_HEADER_LENGTH))
> {
> SSLerr(SSL_F_DTLS1_PREPROCESS_FRAGMENT,ERR_R_BUF_LIB);
> return SSL_AD_INTERNAL_ERROR;
> }
432,437c483,495
< *copied = frag->msg_header.frag_len - overlap;
< return *copied;
< }
< else
< return 0;
< }
---
> s->s3->tmp.message_size = msg_len;
> s->d1->r_msg_hdr.msg_len = msg_len;
> s->s3->tmp.message_type = msg_hdr->type;
> s->d1->r_msg_hdr.type = msg_hdr->type;
> s->d1->r_msg_hdr.seq = msg_hdr->seq;
> }
> else if (msg_len != s->d1->r_msg_hdr.msg_len)
> {
> /* They must be playing with us! BTW, failure to enforce
> * upper limit would open possibility for buffer overrun. */
> SSLerr(SSL_F_DTLS1_PREPROCESS_FRAGMENT,SSL_R_EXCESSIVE_MESSAGE_SIZE);
> return SSL_AD_ILLEGAL_PARAMETER;
> }
438a497,498
> return 0; /* no error */
> }
439a500
>
441,445c502,511
< dtls1_buffer_handshake_fragment(SSL *s, struct hm_header_st* msg_hdr)
< {
< hm_fragment *frag = NULL;
< pitem *item = NULL;
< PQ_64BIT seq64;
---
> dtls1_retrieve_buffered_fragment(SSL *s, long max, int *ok)
> {
> /* (0) check whether the desired fragment is available
> * if so:
> * (1) copy over the fragment to s->init_buf->data[]
> * (2) update s->init_num
> */
> pitem *item;
> hm_fragment *frag;
> int al;
447,449c513,516
< frag = dtls1_hm_fragment_new(msg_hdr->frag_len);
< if ( frag == NULL)
< goto err;
---
> *ok = 0;
> item = pqueue_peek(s->d1->buffered_messages);
> if ( item == NULL)
> return 0;
451,452c518
< memcpy(frag->fragment, &(s->init_buf->data[s->init_num]),
< msg_hdr->frag_len + DTLS1_HM_HEADER_LENGTH);
---
> frag = (hm_fragment *)item->data;
454c520,522
< memcpy(&(frag->msg_header), msg_hdr, sizeof(*msg_hdr));
---
> if ( s->d1->handshake_read_seq == frag->msg_header.seq)
> {
> pqueue_pop(s->d1->buffered_messages);
456,457c524
< pq_64bit_init(&seq64);
< pq_64bit_assign_word(&seq64, msg_hdr->seq);
---
> al=dtls1_preprocess_fragment(s,&frag->msg_header,max);
459,461c526,531
< item = pitem_new(seq64, frag);
< if ( item == NULL)
< goto err;
---
> if (al==0) /* no alert */
> {
> unsigned char *p = s->init_buf->data+DTLS1_HM_HEADER_LENGTH;
> memcpy(&p[frag->msg_header.frag_off],
> frag->fragment,frag->msg_header.frag_len);
> }
463c533,534
< pq_64bit_free(&seq64);
---
> dtls1_hm_fragment_free(frag);
> pitem_free(item);
465,466c536,540
< pqueue_insert(s->d1->buffered_messages, item);
< return 1;
---
> if (al==0)
> {
> *ok = 1;
> return frag->msg_header.frag_len;
> }
468,472c542,549
< err:
< if ( frag != NULL) dtls1_hm_fragment_free(frag);
< if ( item != NULL) OPENSSL_free(item);
< return 0;
< }
---
> ssl3_send_alert(s,SSL3_AL_FATAL,al);
> s->init_num = 0;
> *ok = 0;
> return -1;
> }
> else
> return 0;
> }
475,478c552,559
< static void
< dtls1_process_handshake_fragment(SSL *s, int frag_len)
< {
< unsigned char *p;
---
> static int
> dtls1_process_out_of_seq_message(SSL *s, struct hm_header_st* msg_hdr, int *ok)
> {
> int i=-1;
> hm_fragment *frag = NULL;
> pitem *item = NULL;
> PQ_64BIT seq64;
> unsigned long frag_len = msg_hdr->frag_len;
480c561,562
< p = (unsigned char *)s->init_buf->data;
---
> if ((msg_hdr->frag_off+frag_len) > msg_hdr->msg_len)
> goto err;
482,483c564,566
< ssl3_finish_mac(s, &p[s->init_num - frag_len], frag_len);
< }
---
> if (msg_hdr->seq <= s->d1->handshake_read_seq)
> {
> unsigned char devnull [256];
484a568,576
> while (frag_len)
> {
> i = s->method->ssl_read_bytes(s,SSL3_RT_HANDSHAKE,
> devnull,
> frag_len>sizeof(devnull)?sizeof(devnull):frag_len,0);
> if (i<=0) goto err;
> frag_len -= i;
> }
> }
486,490c578,580
< static int
< dtls1_process_out_of_seq_message(SSL *s, struct hm_header_st *msg_hdr, int *ok)
< {
< int i;
< unsigned char *p;
---
> frag = dtls1_hm_fragment_new(frag_len);
> if ( frag == NULL)
> goto err;
492,498c582
< /* make sure there's enough room to read this fragment */
< if ( (int)msg_hdr->frag_len && !BUF_MEM_grow_clean(s->init_buf,
< (int)msg_hdr->frag_len + DTLS1_HM_HEADER_LENGTH + s->init_num))
< {
< SSLerr(SSL_F_DTLS1_PROCESS_OUT_OF_SEQ_MESSAGE,ERR_R_BUF_LIB);
< goto err;
< }
---
> memcpy(&(frag->msg_header), msg_hdr, sizeof(*msg_hdr));
500,503c584
< p = (unsigned char *)s->init_buf->data;
<
< /* read the body of the fragment (header has already been read */
< if ( msg_hdr->frag_len > 0)
---
> if (frag_len)
505,512c586,590
< i=s->method->ssl_read_bytes(s,SSL3_RT_HANDSHAKE,
< &p[s->init_num],
< msg_hdr->frag_len,0);
< if (i <= 0)
< {
< *ok = 0;
< return i;
< }
---
> /* read the body of the fragment (header has already been read */
> i = s->method->ssl_read_bytes(s,SSL3_RT_HANDSHAKE,
> frag->fragment,frag_len,0);
> if (i<=0 || (unsigned long)i!=frag_len)
> goto err;
515,518c593,594
< if ( msg_hdr->seq > s->d1->handshake_read_seq)
< dtls1_buffer_handshake_fragment(s, msg_hdr);
< else
< OPENSSL_assert(msg_hdr->seq < s->d1->handshake_read_seq);
---
> pq_64bit_init(&seq64);
> pq_64bit_assign_word(&seq64, msg_hdr->seq);
520c596,603
< return DTLS1_HM_FRAGMENT_RETRY;
---
> item = pitem_new(seq64, frag);
> pq_64bit_free(&seq64);
> if ( item == NULL)
> goto err;
>
> pqueue_insert(s->d1->buffered_messages, item);
> return DTLS1_HM_FRAGMENT_RETRY;
>
522,524c605,609
< *ok = 0;
< return -1;
< }
---
> if ( frag != NULL) dtls1_hm_fragment_free(frag);
> if ( item != NULL) OPENSSL_free(item);
> *ok = 0;
> return i;
> }
530c615
< unsigned char *p;
---
> unsigned char wire[DTLS1_HM_HEADER_LENGTH];
534,544d618
< unsigned long overlap;
<
< /* see if we have the required fragment already */
< if (dtls1_retrieve_buffered_fragment(s, &l))
< {
< /* compute MAC, remove fragment headers */
< dtls1_process_handshake_fragment(s, l);
< s->init_msg = s->init_buf->data + DTLS1_HM_HEADER_LENGTH;
< s->state = stn;
< return 1;
< }
546,547c620,625
< /* get a handshake fragment from the record layer */
< p = (unsigned char *)s->init_buf->data;
---
> /* see if we have the required fragment already */
> if ((frag_len = dtls1_retrieve_buffered_fragment(s,max,ok)) || *ok)
> {
> if (*ok) s->init_num += frag_len;
> return frag_len;
> }
549,550c627,628
< /* read handshake message header */
< i=s->method->ssl_read_bytes(s,SSL3_RT_HANDSHAKE,&p[s->init_num],
---
> /* read handshake message header */
> i=s->method->ssl_read_bytes(s,SSL3_RT_HANDSHAKE,wire,
558d635
<
561,564c638,639
< p += s->init_num;
< /* parse the message fragment header */
<
< dtls1_get_message_header(p, &msg_hdr);
---
> /* parse the message fragment header */
> dtls1_get_message_header(wire, &msg_hdr);
566,571c641,646
< /*
< * if this is a future (or stale) message it gets buffered
< * (or dropped)--no further processing at this time
< */
< if ( msg_hdr.seq != s->d1->handshake_read_seq)
< return dtls1_process_out_of_seq_message(s, &msg_hdr, ok);
---
> /*
> * if this is a future (or stale) message it gets buffered
> * (or dropped)--no further processing at this time
> */
> if ( msg_hdr.seq != s->d1->handshake_read_seq)
> return dtls1_process_out_of_seq_message(s, &msg_hdr, ok);
573,574c648,649
< l = msg_hdr.msg_len;
< frag_off = msg_hdr.frag_off;
---
> l = msg_hdr.msg_len;
> frag_off = msg_hdr.frag_off;
577,584d651
< /* sanity checking */
< if ( frag_off + frag_len > l)
< {
< al=SSL_AD_ILLEGAL_PARAMETER;
< SSLerr(SSL_F_DTLS1_GET_MESSAGE_FRAGMENT,SSL_R_EXCESSIVE_MESSAGE_SIZE);
< goto f_err;
< }
<
586,615c653
< p[0] == SSL3_MT_HELLO_REQUEST)
< {
< /* The server may always send 'Hello Request' messages --
< * we are doing a handshake anyway now, so ignore them
< * if their format is correct. Does not count for
< * 'Finished' MAC. */
< if (p[1] == 0 && p[2] == 0 &&p[3] == 0)
< {
< if (s->msg_callback)
< s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE,
< p, DTLS1_HM_HEADER_LENGTH, s,
< s->msg_callback_arg);
<
< s->init_num = 0;
< return dtls1_get_message_fragment(s, st1, stn,
< max, ok);
< }
< else /* Incorrectly formated Hello request */
< {
< al=SSL_AD_UNEXPECTED_MESSAGE;
< SSLerr(SSL_F_DTLS1_GET_MESSAGE_FRAGMENT,SSL_R_UNEXPECTED_MESSAGE);
< goto f_err;
< }
< }
<
< /* XDTLS: do a sanity check on the fragment */
<
< s->init_num += i;
<
< if ( s->d1->r_msg_hdr.frag_off == 0) /* first fragment */
---
> wire[0] == SSL3_MT_HELLO_REQUEST)
617,618c655,659
< /* BUF_MEM_grow takes an 'int' parameter */
< if (l > (INT_MAX-DTLS1_HM_HEADER_LENGTH))
---
> /* The server may always send 'Hello Request' messages --
> * we are doing a handshake anyway now, so ignore them
> * if their format is correct. Does not count for
> * 'Finished' MAC. */
> if (wire[1] == 0 && wire[2] == 0 && wire[3] == 0)
620,622c661,668
< al=SSL_AD_ILLEGAL_PARAMETER;
< SSLerr(SSL_F_DTLS1_GET_MESSAGE_FRAGMENT,SSL_R_EXCESSIVE_MESSAGE_SIZE);
< goto f_err;
---
> if (s->msg_callback)
> s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE,
> wire, DTLS1_HM_HEADER_LENGTH, s,
> s->msg_callback_arg);
>
> s->init_num = 0;
> return dtls1_get_message_fragment(s, st1, stn,
> max, ok);
624,625c670
< if (l && !BUF_MEM_grow_clean(s->init_buf,(int)l
< + DTLS1_HM_HEADER_LENGTH))
---
> else /* Incorrectly formated Hello request */
627,635c672,673
< SSLerr(SSL_F_DTLS1_GET_MESSAGE_FRAGMENT,ERR_R_BUF_LIB);
< goto err;
< }
< /* Only do this test when we're reading the expected message.
< * Stale messages will be dropped and future messages will be buffered */
< if ( l > (unsigned long)max)
< {
< al=SSL_AD_ILLEGAL_PARAMETER;
< SSLerr(SSL_F_DTLS1_GET_MESSAGE_FRAGMENT,SSL_R_EXCESSIVE_MESSAGE_SIZE);
---
> al=SSL_AD_UNEXPECTED_MESSAGE;
> SSLerr(SSL_F_DTLS1_GET_MESSAGE_FRAGMENT,SSL_R_UNEXPECTED_MESSAGE);
638,639d675
<
< s->s3->tmp.message_size=l;
642,653c678,679
< if ( frag_len > (unsigned long)max)
< {
< al=SSL_AD_ILLEGAL_PARAMETER;
< SSLerr(SSL_F_DTLS1_GET_MESSAGE_FRAGMENT,SSL_R_EXCESSIVE_MESSAGE_SIZE);
< goto f_err;
< }
< if ( frag_len + s->init_num > (INT_MAX - DTLS1_HM_HEADER_LENGTH))
< {
< al=SSL_AD_ILLEGAL_PARAMETER;
< SSLerr(SSL_F_DTLS1_GET_MESSAGE_FRAGMENT,SSL_R_EXCESSIVE_MESSAGE_SIZE);
< goto f_err;
< }
---
> if ((al=dtls1_preprocess_fragment(s,&msg_hdr,max)))
> goto f_err;
655,669d680
< if ( frag_len & !BUF_MEM_grow_clean(s->init_buf, (int)frag_len
< + DTLS1_HM_HEADER_LENGTH + s->init_num))
< {
< SSLerr(SSL_F_DTLS1_GET_MESSAGE_FRAGMENT,ERR_R_BUF_LIB);
< goto err;
< }
<
< if ( s->d1->r_msg_hdr.frag_off == 0)
< {
< s->s3->tmp.message_type = msg_hdr.type;
< s->d1->r_msg_hdr.type = msg_hdr.type;
< s->d1->r_msg_hdr.msg_len = l;
< /* s->d1->r_msg_hdr.seq = seq_num; */
< }
<
672,674d682
<
< /* next state (stn) */
< p = (unsigned char *)s->init_buf->data;
677a686,687
> unsigned char *p=s->init_buf->data+DTLS1_HM_HEADER_LENGTH;
>
679,681c689,690
< &p[s->init_num],
< frag_len,0);
< /* XDTLS: fix this--message fragments cannot span multiple packets */
---
> &p[frag_off],frag_len,0);
> /* XDTLS: fix this--message fragments cannot span multiple packets */
692,693c701,702
< /* XDTLS: an incorrectly formatted fragment should cause the
< * handshake to fail */
---
> /* XDTLS: an incorrectly formatted fragment should cause the
> * handshake to fail */
696,702c705
< #if 0
< /* Successfully read a fragment.
< * It may be (1) out of order, or
< * (2) it's a repeat, in which case we dump it
< * (3) the one we are expecting next (maybe with overlap)
< * If it is next one, it may overlap with previously read bytes
< */
---
> *ok = 1;
704,714c707,712
< /* case (1): buffer the future fragment
< * (we can treat fragments from a future message the same
< * as future fragments from the message being currently read, since
< * they are sematically simply out of order.
< */
< if ( msg_hdr.seq > s->d1->handshake_read_seq ||
< frag_off > s->init_num - DTLS1_HM_HEADER_LENGTH)
< {
< dtls1_buffer_handshake_fragment(s, &msg_hdr);
< return DTLS1_HM_FRAGMENT_RETRY;
< }
---
> /* Note that s->init_num is *not* used as current offset in
> * s->init_buf->data, but as a counter summing up fragments'
> * lengths: as soon as they sum up to handshake packet
> * length, we assume we have got all the fragments. */
> s->init_num += frag_len;
> return frag_len;
716,751d713
< /* case (2): drop the entire fragment, and try again */
< if ( msg_hdr.seq < s->d1->handshake_read_seq ||
< frag_off + frag_len < s->init_num - DTLS1_HM_HEADER_LENGTH)
< {
< s->init_num -= DTLS1_HM_HEADER_LENGTH;
< return DTLS1_HM_FRAGMENT_RETRY;
< }
< #endif
<
< /* case (3): received a immediately useful fragment. Determine the
< * possible overlap and copy the fragment.
< */
< overlap = (s->init_num - DTLS1_HM_HEADER_LENGTH) - frag_off;
<
< /* retain the header for the first fragment */
< if ( s->init_num > DTLS1_HM_HEADER_LENGTH)
< {
< memmove(&(s->init_buf->data[s->init_num]),
< &(s->init_buf->data[s->init_num + DTLS1_HM_HEADER_LENGTH + overlap]),
< frag_len - overlap);
<
< s->init_num += frag_len - overlap;
< }
< else
< s->init_num += frag_len;
<
< dtls1_process_handshake_fragment(s, frag_len - overlap);
<
< if (s->msg_callback)
< s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, s->init_buf->data,
< (size_t)s->init_num, s,
< s->msg_callback_arg);
< *ok=1;
<
< return s->init_num;
<
754,755c716,717
< s->init_num = 0;
< err:
---
> s->init_num = 0;
>
793c755
<
---
>
819,820d780
< s2n(s->d1->handshake_write_seq,p);
<
821a782,788
>
> if (s->client_version == DTLS1_BAD_VER)
> {
> s2n(s->d1->handshake_write_seq,p);
> s->init_num+=2;
> }
>
918,921c885,888
< {
< DTLS1_STATE *state;
< BIO *bio;
< int send_alert = 0;
---
> {
> DTLS1_STATE *state;
> BIO *bio;
> int send_alert = 0;
923,927c890,894
< if ( code > 0)
< {
< fprintf( stderr, "invalid state reached %s:%d", __FILE__, __LINE__);
< return 1;
< }
---
> if ( code > 0)
> {
> fprintf( stderr, "invalid state reached %s:%d", __FILE__, __LINE__);
> return 1;
> }
929,935c896,902
< bio = SSL_get_rbio(s);
< if ( ! BIO_dgram_recv_timedout(bio))
< {
< /* not a timeout, none of our business,
< let higher layers handle this. in fact it's probably an error */
< return code;
< }
---
> bio = SSL_get_rbio(s);
> if ( ! BIO_dgram_recv_timedout(bio))
> {
> /* not a timeout, none of our business,
> let higher layers handle this. in fact it's probably an error */
> return code;
> }
937,941c904,908
< if ( ! SSL_in_init(s)) /* done, no need to send a retransmit */
< {
< BIO_set_flags(SSL_get_rbio(s), BIO_FLAGS_READ);
< return code;
< }
---
> if ( ! SSL_in_init(s)) /* done, no need to send a retransmit */
> {
> BIO_set_flags(SSL_get_rbio(s), BIO_FLAGS_READ);
> return code;
> }
943,957c910,917
< state = s->d1;
< state->timeout.num_alerts++;
< if ( state->timeout.num_alerts > DTLS1_TMO_ALERT_COUNT)
< {
< /* fail the connection, enough alerts have been sent */
< SSLerr(SSL_F_DTLS1_READ_FAILED,SSL_R_READ_TIMEOUT_EXPIRED);
< return 0;
< }
<
< state->timeout.read_timeouts++;
< if ( state->timeout.read_timeouts > DTLS1_TMO_READ_COUNT)
< {
< send_alert = 1;
< state->timeout.read_timeouts = 1;
< }
---
> state = s->d1;
> state->timeout.num_alerts++;
> if ( state->timeout.num_alerts > DTLS1_TMO_ALERT_COUNT)
> {
> /* fail the connection, enough alerts have been sent */
> SSLerr(SSL_F_DTLS1_READ_FAILED,SSL_R_READ_TIMEOUT_EXPIRED);
> return 0;
> }
959c919,926
<
---
> state->timeout.read_timeouts++;
> if ( state->timeout.read_timeouts > DTLS1_TMO_READ_COUNT)
> {
> send_alert = 1;
> state->timeout.read_timeouts = 1;
> }
>
>
961,966c928,933
< item = pqueue_peek(state->rcvd_records);
< if ( item )
< {
< /* send an alert immediately for all the missing records */
< }
< else
---
> item = pqueue_peek(state->rcvd_records);
> if ( item )
> {
> /* send an alert immediately for all the missing records */
> }
> else
970,972c937,939
< if ( send_alert)
< ssl3_send_alert(s,SSL3_AL_WARNING,
< DTLS1_AD_MISSING_HANDSHAKE_MESSAGE);
---
> if ( send_alert)
> ssl3_send_alert(s,SSL3_AL_WARNING,
> DTLS1_AD_MISSING_HANDSHAKE_MESSAGE);
975,976c942,943
< return dtls1_retransmit_buffered_messages(s) ;
< }
---
> return dtls1_retransmit_buffered_messages(s) ;
> }
981,986c948,953
< {
< pqueue sent = s->d1->sent_messages;
< piterator iter;
< pitem *item;
< hm_fragment *frag;
< int found = 0;
---
> {
> pqueue sent = s->d1->sent_messages;
> piterator iter;
> pitem *item;
> hm_fragment *frag;
> int found = 0;
988c955
< iter = pqueue_iterator(sent);
---
> iter = pqueue_iterator(sent);
990,999c957,966
< for ( item = pqueue_next(&iter); item != NULL; item = pqueue_next(&iter))
< {
< frag = (hm_fragment *)item->data;
< if ( dtls1_retransmit_message(s, frag->msg_header.seq, 0, &found) <= 0 &&
< found)
< {
< fprintf(stderr, "dtls1_retransmit_message() failed\n");
< return -1;
< }
< }
---
> for ( item = pqueue_next(&iter); item != NULL; item = pqueue_next(&iter))
> {
> frag = (hm_fragment *)item->data;
> if ( dtls1_retransmit_message(s, frag->msg_header.seq, 0, &found) <= 0 &&
> found)
> {
> fprintf(stderr, "dtls1_retransmit_message() failed\n");
> return -1;
> }
> }
1001,1002c968,969
< return 1;
< }
---
> return 1;
> }
1004,1040d970
< #if 0
< static dtls1_message_buffer *
< dtls1_message_buffer_new(unsigned int len)
< {
< dtls1_message_buffer *msg_buf;
<
< msg_buf = (dtls1_message_buffer *)
< OPENSSL_malloc(sizeof(dtls1_message_buffer));
< if ( msg_buf == NULL)
< return NULL;
<
< memset(msg_buf, 0x00, sizeof(dtls1_message_buffer));
<
< msg_buf->data = (unsigned char *) OPENSSL_malloc(len);
< if ( msg_buf->data == NULL)
< {
< OPENSSL_free(msg_buf);
< return NULL;
< }
<
< memset(msg_buf->data, 0x00, len);
< return msg_buf;
< }
< #endif
<
< #if 0
< static void
< dtls1_message_buffer_free(dtls1_message_buffer *msg_buf)
< {
< if (msg_buf != NULL)
< {
< OPENSSL_free(msg_buf->data);
< OPENSSL_free(msg_buf);
< }
< }
< #endif
<
1043,1045c973,975
< {
< pitem *item;
< hm_fragment *frag;
---
> {
> pitem *item;
> hm_fragment *frag;
1048,1050c978,980
< /* this function is called immediately after a message has
< * been serialized */
< OPENSSL_assert(s->init_off == 0);
---
> /* this function is called immediately after a message has
> * been serialized */
> OPENSSL_assert(s->init_off == 0);
1052c982
< frag = dtls1_hm_fragment_new(s->init_num);
---
> frag = dtls1_hm_fragment_new(s->init_num);
1054c984
< memcpy(frag->fragment, s->init_buf->data, s->init_num);
---
> memcpy(frag->fragment, s->init_buf->data, s->init_num);
1056,1065c986,995
< if ( is_ccs)
< {
< OPENSSL_assert(s->d1->w_msg_hdr.msg_len +
< DTLS1_CCS_HEADER_LENGTH == (unsigned int)s->init_num);
< }
< else
< {
< OPENSSL_assert(s->d1->w_msg_hdr.msg_len +
< DTLS1_HM_HEADER_LENGTH == (unsigned int)s->init_num);
< }
---
> if ( is_ccs)
> {
> OPENSSL_assert(s->d1->w_msg_hdr.msg_len +
> DTLS1_CCS_HEADER_LENGTH <= (unsigned int)s->init_num);
> }
> else
> {
> OPENSSL_assert(s->d1->w_msg_hdr.msg_len +
> DTLS1_HM_HEADER_LENGTH == (unsigned int)s->init_num);
> }
1067,1072c997,1002
< frag->msg_header.msg_len = s->d1->w_msg_hdr.msg_len;
< frag->msg_header.seq = s->d1->w_msg_hdr.seq;
< frag->msg_header.type = s->d1->w_msg_hdr.type;
< frag->msg_header.frag_off = 0;
< frag->msg_header.frag_len = s->d1->w_msg_hdr.msg_len;
< frag->msg_header.is_ccs = is_ccs;
---
> frag->msg_header.msg_len = s->d1->w_msg_hdr.msg_len;
> frag->msg_header.seq = s->d1->w_msg_hdr.seq;
> frag->msg_header.type = s->d1->w_msg_hdr.type;
> frag->msg_header.frag_off = 0;
> frag->msg_header.frag_len = s->d1->w_msg_hdr.msg_len;
> frag->msg_header.is_ccs = is_ccs;
1074,1075c1004,1005
< pq_64bit_init(&seq64);
< pq_64bit_assign_word(&seq64, frag->msg_header.seq);
---
> pq_64bit_init(&seq64);
> pq_64bit_assign_word(&seq64, frag->msg_header.seq);
1077,1083c1007,1013
< item = pitem_new(seq64, frag);
< pq_64bit_free(&seq64);
< if ( item == NULL)
< {
< dtls1_hm_fragment_free(frag);
< return 0;
< }
---
> item = pitem_new(seq64, frag);
> pq_64bit_free(&seq64);
> if ( item == NULL)
> {
> dtls1_hm_fragment_free(frag);
> return 0;
> }
1086,1088c1016,1018
< fprintf( stderr, "buffered messge: \ttype = %xx\n", msg_buf->type);
< fprintf( stderr, "\t\t\t\t\tlen = %d\n", msg_buf->len);
< fprintf( stderr, "\t\t\t\t\tseq_num = %d\n", msg_buf->seq_num);
---
> fprintf( stderr, "buffered messge: \ttype = %xx\n", msg_buf->type);
> fprintf( stderr, "\t\t\t\t\tlen = %d\n", msg_buf->len);
> fprintf( stderr, "\t\t\t\t\tseq_num = %d\n", msg_buf->seq_num);
1091,1093c1021,1023
< pqueue_insert(s->d1->sent_messages, item);
< return 1;
< }
---
> pqueue_insert(s->d1->sent_messages, item);
> return 1;
> }
1097,1103c1027,1033
< int *found)
< {
< int ret;
< /* XDTLS: for now assuming that read/writes are blocking */
< pitem *item;
< hm_fragment *frag ;
< unsigned long header_length;
---
> int *found)
> {
> int ret;
> /* XDTLS: for now assuming that read/writes are blocking */
> pitem *item;
> hm_fragment *frag ;
> unsigned long header_length;
1106,1109c1036,1039
< /*
< OPENSSL_assert(s->init_num == 0);
< OPENSSL_assert(s->init_off == 0);
< */
---
> /*
> OPENSSL_assert(s->init_num == 0);
> OPENSSL_assert(s->init_off == 0);
> */
1111,1113c1041,1043
< /* XDTLS: the requested message ought to be found, otherwise error */
< pq_64bit_init(&seq64);
< pq_64bit_assign_word(&seq64, seq);
---
> /* XDTLS: the requested message ought to be found, otherwise error */
> pq_64bit_init(&seq64);
> pq_64bit_assign_word(&seq64, seq);
1115,1122c1045,1052
< item = pqueue_find(s->d1->sent_messages, seq64);
< pq_64bit_free(&seq64);
< if ( item == NULL)
< {
< fprintf(stderr, "retransmit: message %d non-existant\n", seq);
< *found = 0;
< return 0;
< }
---
> item = pqueue_find(s->d1->sent_messages, seq64);
> pq_64bit_free(&seq64);
> if ( item == NULL)
> {
> fprintf(stderr, "retransmit: message %d non-existant\n", seq);
> *found = 0;
> return 0;
> }
1124,1125c1054,1055
< *found = 1;
< frag = (hm_fragment *)item->data;
---
> *found = 1;
> frag = (hm_fragment *)item->data;
1127,1130c1057,1060
< if ( frag->msg_header.is_ccs)
< header_length = DTLS1_CCS_HEADER_LENGTH;
< else
< header_length = DTLS1_HM_HEADER_LENGTH;
---
> if ( frag->msg_header.is_ccs)
> header_length = DTLS1_CCS_HEADER_LENGTH;
> else
> header_length = DTLS1_HM_HEADER_LENGTH;
1132,1138c1062,1064
< memcpy(s->init_buf->data, frag->fragment,
< frag->msg_header.msg_len + header_length);
< s->init_num = frag->msg_header.msg_len + header_length;
<
< dtls1_set_message_header_int(s, frag->msg_header.type,
< frag->msg_header.msg_len, frag->msg_header.seq, 0,
< frag->msg_header.frag_len);
---
> memcpy(s->init_buf->data, frag->fragment,
> frag->msg_header.msg_len + header_length);
> s->init_num = frag->msg_header.msg_len + header_length;
1140,1143c1066,1068
< s->d1->retransmitting = 1;
< ret = dtls1_do_write(s, frag->msg_header.is_ccs ?
< SSL3_RT_CHANGE_CIPHER_SPEC : SSL3_RT_HANDSHAKE);
< s->d1->retransmitting = 0;
---
> dtls1_set_message_header_int(s, frag->msg_header.type,
> frag->msg_header.msg_len, frag->msg_header.seq, 0,
> frag->msg_header.frag_len);
1145,1147c1070,1073
< BIO_flush(SSL_get_wbio(s));
< return ret;
< }
---
> s->d1->retransmitting = 1;
> ret = dtls1_do_write(s, frag->msg_header.is_ccs ?
> SSL3_RT_CHANGE_CIPHER_SPEC : SSL3_RT_HANDSHAKE);
> s->d1->retransmitting = 0;
1148a1075,1078
> (void)BIO_flush(SSL_get_wbio(s));
> return ret;
> }
>
1152,1161c1082,1083
< {
< pitem *item;
<
< for(item = pqueue_pop(s->d1->sent_messages);
< item != NULL; item = pqueue_pop(s->d1->sent_messages))
< {
< dtls1_hm_fragment_free((hm_fragment *)item->data);
< pitem_free(item);
< }
< }
---
> {
> pitem *item;
1162a1085,1091
> for(item = pqueue_pop(s->d1->sent_messages);
> item != NULL; item = pqueue_pop(s->d1->sent_messages))
> {
> dtls1_hm_fragment_free((hm_fragment *)item->data);
> pitem_free(item);
> }
> }
1163a1093
>
1166,1178c1096,1102
< unsigned long len, unsigned long frag_off, unsigned long frag_len)
< {
< if ( frag_off == 0)
< {
< s->d1->handshake_write_seq = s->d1->next_handshake_write_seq;
< s->d1->next_handshake_write_seq++;
< }
<
< dtls1_set_message_header_int(s, mt, len, s->d1->handshake_write_seq,
< frag_off, frag_len);
<
< return p += DTLS1_HM_HEADER_LENGTH;
< }
---
> unsigned long len, unsigned long frag_off, unsigned long frag_len)
> {
> if ( frag_off == 0)
> {
> s->d1->handshake_write_seq = s->d1->next_handshake_write_seq;
> s->d1->next_handshake_write_seq++;
> }
1179a1104,1105
> dtls1_set_message_header_int(s, mt, len, s->d1->handshake_write_seq,
> frag_off, frag_len);
1180a1107,1110
> return p += DTLS1_HM_HEADER_LENGTH;
> }
>
>
1184,1194c1114,1117
< unsigned long len, unsigned short seq_num, unsigned long frag_off,
< unsigned long frag_len)
< {
< struct hm_header_st *msg_hdr = &s->d1->w_msg_hdr;
<
< msg_hdr->type = mt;
< msg_hdr->msg_len = len;
< msg_hdr->seq = seq_num;
< msg_hdr->frag_off = frag_off;
< msg_hdr->frag_len = frag_len;
< }
---
> unsigned long len, unsigned short seq_num, unsigned long frag_off,
> unsigned long frag_len)
> {
> struct hm_header_st *msg_hdr = &s->d1->w_msg_hdr;
1195a1119,1125
> msg_hdr->type = mt;
> msg_hdr->msg_len = len;
> msg_hdr->seq = seq_num;
> msg_hdr->frag_off = frag_off;
> msg_hdr->frag_len = frag_len;
> }
>
1198,1204c1128,1130
< unsigned long frag_len)
< {
< struct hm_header_st *msg_hdr = &s->d1->w_msg_hdr;
<
< msg_hdr->frag_off = frag_off;
< msg_hdr->frag_len = frag_len;
< }
---
> unsigned long frag_len)
> {
> struct hm_header_st *msg_hdr = &s->d1->w_msg_hdr;
1205a1132,1135
> msg_hdr->frag_off = frag_off;
> msg_hdr->frag_len = frag_len;
> }
>
1208,1219c1138,1139
< {
< struct hm_header_st *msg_hdr = &s->d1->w_msg_hdr;
<
< *p++ = msg_hdr->type;
< l2n3(msg_hdr->msg_len, p);
<
< s2n(msg_hdr->seq, p);
< l2n3(msg_hdr->frag_off, p);
< l2n3(msg_hdr->frag_len, p);
<
< return p;
< }
---
> {
> struct hm_header_st *msg_hdr = &s->d1->w_msg_hdr;
1220a1141,1150
> *p++ = msg_hdr->type;
> l2n3(msg_hdr->msg_len, p);
>
> s2n(msg_hdr->seq, p);
> l2n3(msg_hdr->frag_off, p);
> l2n3(msg_hdr->frag_len, p);
>
> return p;
> }
>
1223,1227c1153,1156
< {
< return
< g_probable_mtu[(sizeof(g_probable_mtu) /
< sizeof(g_probable_mtu[0])) - 1];
< }
---
> {
> return (g_probable_mtu[(sizeof(g_probable_mtu) /
> sizeof(g_probable_mtu[0])) - 1]);
> }
1240c1169
<
---
>
1246,1254c1175,1178
< {
< memset(msg_hdr, 0x00, sizeof(struct hm_header_st));
< msg_hdr->type = *(data++);
< n2l3(data, msg_hdr->msg_len);
<
< n2s(data, msg_hdr->seq);
< n2l3(data, msg_hdr->frag_off);
< n2l3(data, msg_hdr->frag_len);
< }
---
> {
> memset(msg_hdr, 0x00, sizeof(struct hm_header_st));
> msg_hdr->type = *(data++);
> n2l3(data, msg_hdr->msg_len);
1255a1180,1184
> n2s(data, msg_hdr->seq);
> n2l3(data, msg_hdr->frag_off);
> n2l3(data, msg_hdr->frag_len);
> }
>
1258,1263c1187,1191
< {
< memset(ccs_hdr, 0x00, sizeof(struct ccs_header_st));
<
< ccs_hdr->type = *(data++);
< n2s(data, ccs_hdr->seq);
< }
---
> {
> memset(ccs_hdr, 0x00, sizeof(struct ccs_header_st));
>
> ccs_hdr->type = *(data++);
> }
< long max, int *ok);
< static void dtls1_process_handshake_fragment(SSL *s, int frag_len);
---
> long max, int *ok);
146,148c145,147
< {
< hm_fragment *frag = NULL;
< unsigned char *buf = NULL;
---
> {
> hm_fragment *frag = NULL;
> unsigned char *buf = NULL;
150,152c149,151
< frag = (hm_fragment *)OPENSSL_malloc(sizeof(hm_fragment));
< if ( frag == NULL)
< return NULL;
---
> frag = (hm_fragment *)OPENSSL_malloc(sizeof(hm_fragment));
> if ( frag == NULL)
> return NULL;
154,162c153,161
< buf = (unsigned char *)OPENSSL_malloc(frag_len
< + DTLS1_HM_HEADER_LENGTH);
< if ( buf == NULL)
< {
< OPENSSL_free(frag);
< return NULL;
< }
<
< frag->fragment = buf;
---
> if (frag_len)
> {
> buf = (unsigned char *)OPENSSL_malloc(frag_len);
> if ( buf == NULL)
> {
> OPENSSL_free(frag);
> return NULL;
> }
> }
164,165c163,164
< return frag;
< }
---
> /* zero length fragment gets zero frag->fragment */
> frag->fragment = buf;
166a166,168
> return frag;
> }
>
169,172c171,174
< {
< OPENSSL_free(frag->fragment);
< OPENSSL_free(frag);
< }
---
> {
> if (frag->fragment) OPENSSL_free(frag->fragment);
> OPENSSL_free(frag);
> }
183c185
< {
---
> {
210c212
<
---
>
257c259
< /* write atleast DTLS1_HM_HEADER_LENGTH bytes */
---
> /* write atleast DTLS1_HM_HEADER_LENGTH bytes */
261c263
<
---
>
289c291
<
---
>
292,293c294,295
< OPENSSL_assert(len == (unsigned int)ret);
<
---
> OPENSSL_assert(len == (unsigned int)ret);
>
294a297
> {
297,300c300,324
< ssl3_finish_mac(s,
< (unsigned char *)&s->init_buf->data[s->init_off +
< DTLS1_HM_HEADER_LENGTH], ret - DTLS1_HM_HEADER_LENGTH);
<
---
> unsigned char *p = &s->init_buf->data[s->init_off];
> const struct hm_header_st *msg_hdr = &s->d1->w_msg_hdr;
> int len;
>
> if (frag_off == 0 && s->client_version != DTLS1_BAD_VER)
> {
> /* reconstruct message header is if it
> * is being sent in single fragment */
> *p++ = msg_hdr->type;
> l2n3(msg_hdr->msg_len,p);
> s2n (msg_hdr->seq,p);
> l2n3(0,p);
> l2n3(msg_hdr->msg_len,p);
> p -= DTLS1_HM_HEADER_LENGTH;
> len = ret;
> }
> else
> {
> p += DTLS1_HM_HEADER_LENGTH;
> len = ret - DTLS1_HM_HEADER_LENGTH;
> }
>
> ssl3_finish_mac(s, p, len);
> }
>
310c334
<
---
>
329a354
> struct hm_header_st *msg_hdr;
347c372,373
<
---
>
> msg_hdr = &s->d1->r_msg_hdr;
350c376
< if ( s->d1->r_msg_hdr.frag_off == 0)
---
> if ( msg_hdr->frag_off == 0)
353c379
< memset(&(s->d1->r_msg_hdr), 0x00, sizeof(struct hm_header_st));
---
> memset(msg_hdr, 0x00, sizeof(struct hm_header_st));
358c384
< i == DTLS1_HM_FRAGMENT_RETRY) /* bad fragment received */
---
> i == DTLS1_HM_FRAGMENT_RETRY) /* bad fragment received */
363c389,399
< if (s->d1->r_msg_hdr.msg_len == (unsigned int)s->init_num - DTLS1_HM_HEADER_LENGTH)
---
> /* Note that s->init_sum is used as a counter summing
> * up fragments' lengths: as soon as they sum up to
> * handshake packet length, we assume we have got all
> * the fragments. Overlapping fragments would cause
> * premature termination, so we don't expect overlaps.
> * Well, handling overlaps would require something more
> * drastic. Indeed, as it is now there is no way to
> * tell if out-of-order fragment from the middle was
> * the last. '>=' is the best/least we can do to control
> * the potential damage caused by malformed overlaps. */
> if ((unsigned int)s->init_num >= msg_hdr->msg_len)
365c401,402
< memset(&(s->d1->r_msg_hdr), 0x00, sizeof(struct hm_header_st));
---
> unsigned char *p = s->init_buf->data;
> unsigned long msg_len = msg_hdr->msg_len;
366a404,422
> /* reconstruct message header as if it was
> * sent in single fragment */
> *(p++) = msg_hdr->type;
> l2n3(msg_len,p);
> s2n (msg_hdr->seq,p);
> l2n3(0,p);
> l2n3(msg_len,p);
> if (s->client_version != DTLS1_BAD_VER)
> p -= DTLS1_HM_HEADER_LENGTH,
> msg_len += DTLS1_HM_HEADER_LENGTH;
>
> ssl3_finish_mac(s, p, msg_len);
> if (s->msg_callback)
> s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE,
> p, msg_len,
> s, s->msg_callback_arg);
>
> memset(msg_hdr, 0x00, sizeof(struct hm_header_st));
>
382,383c438,439
< s->init_msg = s->init_buf->data + DTLS1_HM_HEADER_LENGTH;
< return s->init_num - DTLS1_HM_HEADER_LENGTH;
---
> s->init_msg = s->init_buf->data + DTLS1_HM_HEADER_LENGTH;
> return s->init_num;
386c442
< s->d1->r_msg_hdr.frag_off = i;
---
> msg_hdr->frag_off = i;
396,407c452,454
< static int
< dtls1_retrieve_buffered_fragment(SSL *s, unsigned long *copied)
< {
< /* (0) check whether the desired fragment is available
< * if so:
< * (1) copy over the fragment to s->init_buf->data[]
< * (2) update s->init_num
< */
< pitem *item;
< hm_fragment *frag;
< unsigned long overlap;
< unsigned char *p;
---
> static int dtls1_preprocess_fragment(SSL *s,struct hm_header_st *msg_hdr,int max)
> {
> size_t frag_off,frag_len,msg_len;
409,411c456,458
< item = pqueue_peek(s->d1->buffered_messages);
< if ( item == NULL)
< return 0;
---
> msg_len = msg_hdr->msg_len;
> frag_off = msg_hdr->frag_off;
> frag_len = msg_hdr->frag_len;
413,420c460,465
< frag = (hm_fragment *)item->data;
<
< if ( s->d1->handshake_read_seq == frag->msg_header.seq &&
< frag->msg_header.frag_off <= (unsigned int)s->init_num - DTLS1_HM_HEADER_LENGTH)
< {
< pqueue_pop(s->d1->buffered_messages);
< overlap = s->init_num - DTLS1_HM_HEADER_LENGTH
< - frag->msg_header.frag_off;
---
> /* sanity checking */
> if ( (frag_off+frag_len) > msg_len)
> {
> SSLerr(SSL_F_DTLS1_PREPROCESS_FRAGMENT,SSL_R_EXCESSIVE_MESSAGE_SIZE);
> return SSL_AD_ILLEGAL_PARAMETER;
> }
422c467,471
< p = frag->fragment;
---
> if ( (frag_off+frag_len) > (unsigned long)max)
> {
> SSLerr(SSL_F_DTLS1_PREPROCESS_FRAGMENT,SSL_R_EXCESSIVE_MESSAGE_SIZE);
> return SSL_AD_ILLEGAL_PARAMETER;
> }
424,430c473,481
< memcpy(&s->init_buf->data[s->init_num],
< p + DTLS1_HM_HEADER_LENGTH + overlap,
< frag->msg_header.frag_len - overlap);
<
< OPENSSL_free(frag->fragment);
< OPENSSL_free(frag);
< pitem_free(item);
---
> if ( s->d1->r_msg_hdr.frag_off == 0) /* first fragment */
> {
> /* msg_len is limited to 2^24, but is effectively checked
> * against max above */
> if (!BUF_MEM_grow_clean(s->init_buf,(int)msg_len+DTLS1_HM_HEADER_LENGTH))
> {
> SSLerr(SSL_F_DTLS1_PREPROCESS_FRAGMENT,ERR_R_BUF_LIB);
> return SSL_AD_INTERNAL_ERROR;
> }
432,437c483,495
< *copied = frag->msg_header.frag_len - overlap;
< return *copied;
< }
< else
< return 0;
< }
---
> s->s3->tmp.message_size = msg_len;
> s->d1->r_msg_hdr.msg_len = msg_len;
> s->s3->tmp.message_type = msg_hdr->type;
> s->d1->r_msg_hdr.type = msg_hdr->type;
> s->d1->r_msg_hdr.seq = msg_hdr->seq;
> }
> else if (msg_len != s->d1->r_msg_hdr.msg_len)
> {
> /* They must be playing with us! BTW, failure to enforce
> * upper limit would open possibility for buffer overrun. */
> SSLerr(SSL_F_DTLS1_PREPROCESS_FRAGMENT,SSL_R_EXCESSIVE_MESSAGE_SIZE);
> return SSL_AD_ILLEGAL_PARAMETER;
> }
438a497,498
> return 0; /* no error */
> }
439a500
>
441,445c502,511
< dtls1_buffer_handshake_fragment(SSL *s, struct hm_header_st* msg_hdr)
< {
< hm_fragment *frag = NULL;
< pitem *item = NULL;
< PQ_64BIT seq64;
---
> dtls1_retrieve_buffered_fragment(SSL *s, long max, int *ok)
> {
> /* (0) check whether the desired fragment is available
> * if so:
> * (1) copy over the fragment to s->init_buf->data[]
> * (2) update s->init_num
> */
> pitem *item;
> hm_fragment *frag;
> int al;
447,449c513,516
< frag = dtls1_hm_fragment_new(msg_hdr->frag_len);
< if ( frag == NULL)
< goto err;
---
> *ok = 0;
> item = pqueue_peek(s->d1->buffered_messages);
> if ( item == NULL)
> return 0;
451,452c518
< memcpy(frag->fragment, &(s->init_buf->data[s->init_num]),
< msg_hdr->frag_len + DTLS1_HM_HEADER_LENGTH);
---
> frag = (hm_fragment *)item->data;
454c520,522
< memcpy(&(frag->msg_header), msg_hdr, sizeof(*msg_hdr));
---
> if ( s->d1->handshake_read_seq == frag->msg_header.seq)
> {
> pqueue_pop(s->d1->buffered_messages);
456,457c524
< pq_64bit_init(&seq64);
< pq_64bit_assign_word(&seq64, msg_hdr->seq);
---
> al=dtls1_preprocess_fragment(s,&frag->msg_header,max);
459,461c526,531
< item = pitem_new(seq64, frag);
< if ( item == NULL)
< goto err;
---
> if (al==0) /* no alert */
> {
> unsigned char *p = s->init_buf->data+DTLS1_HM_HEADER_LENGTH;
> memcpy(&p[frag->msg_header.frag_off],
> frag->fragment,frag->msg_header.frag_len);
> }
463c533,534
< pq_64bit_free(&seq64);
---
> dtls1_hm_fragment_free(frag);
> pitem_free(item);
465,466c536,540
< pqueue_insert(s->d1->buffered_messages, item);
< return 1;
---
> if (al==0)
> {
> *ok = 1;
> return frag->msg_header.frag_len;
> }
468,472c542,549
< err:
< if ( frag != NULL) dtls1_hm_fragment_free(frag);
< if ( item != NULL) OPENSSL_free(item);
< return 0;
< }
---
> ssl3_send_alert(s,SSL3_AL_FATAL,al);
> s->init_num = 0;
> *ok = 0;
> return -1;
> }
> else
> return 0;
> }
475,478c552,559
< static void
< dtls1_process_handshake_fragment(SSL *s, int frag_len)
< {
< unsigned char *p;
---
> static int
> dtls1_process_out_of_seq_message(SSL *s, struct hm_header_st* msg_hdr, int *ok)
> {
> int i=-1;
> hm_fragment *frag = NULL;
> pitem *item = NULL;
> PQ_64BIT seq64;
> unsigned long frag_len = msg_hdr->frag_len;
480c561,562
< p = (unsigned char *)s->init_buf->data;
---
> if ((msg_hdr->frag_off+frag_len) > msg_hdr->msg_len)
> goto err;
482,483c564,566
< ssl3_finish_mac(s, &p[s->init_num - frag_len], frag_len);
< }
---
> if (msg_hdr->seq <= s->d1->handshake_read_seq)
> {
> unsigned char devnull [256];
484a568,576
> while (frag_len)
> {
> i = s->method->ssl_read_bytes(s,SSL3_RT_HANDSHAKE,
> devnull,
> frag_len>sizeof(devnull)?sizeof(devnull):frag_len,0);
> if (i<=0) goto err;
> frag_len -= i;
> }
> }
486,490c578,580
< static int
< dtls1_process_out_of_seq_message(SSL *s, struct hm_header_st *msg_hdr, int *ok)
< {
< int i;
< unsigned char *p;
---
> frag = dtls1_hm_fragment_new(frag_len);
> if ( frag == NULL)
> goto err;
492,498c582
< /* make sure there's enough room to read this fragment */
< if ( (int)msg_hdr->frag_len && !BUF_MEM_grow_clean(s->init_buf,
< (int)msg_hdr->frag_len + DTLS1_HM_HEADER_LENGTH + s->init_num))
< {
< SSLerr(SSL_F_DTLS1_PROCESS_OUT_OF_SEQ_MESSAGE,ERR_R_BUF_LIB);
< goto err;
< }
---
> memcpy(&(frag->msg_header), msg_hdr, sizeof(*msg_hdr));
500,503c584
< p = (unsigned char *)s->init_buf->data;
<
< /* read the body of the fragment (header has already been read */
< if ( msg_hdr->frag_len > 0)
---
> if (frag_len)
505,512c586,590
< i=s->method->ssl_read_bytes(s,SSL3_RT_HANDSHAKE,
< &p[s->init_num],
< msg_hdr->frag_len,0);
< if (i <= 0)
< {
< *ok = 0;
< return i;
< }
---
> /* read the body of the fragment (header has already been read */
> i = s->method->ssl_read_bytes(s,SSL3_RT_HANDSHAKE,
> frag->fragment,frag_len,0);
> if (i<=0 || (unsigned long)i!=frag_len)
> goto err;
515,518c593,594
< if ( msg_hdr->seq > s->d1->handshake_read_seq)
< dtls1_buffer_handshake_fragment(s, msg_hdr);
< else
< OPENSSL_assert(msg_hdr->seq < s->d1->handshake_read_seq);
---
> pq_64bit_init(&seq64);
> pq_64bit_assign_word(&seq64, msg_hdr->seq);
520c596,603
< return DTLS1_HM_FRAGMENT_RETRY;
---
> item = pitem_new(seq64, frag);
> pq_64bit_free(&seq64);
> if ( item == NULL)
> goto err;
>
> pqueue_insert(s->d1->buffered_messages, item);
> return DTLS1_HM_FRAGMENT_RETRY;
>
522,524c605,609
< *ok = 0;
< return -1;
< }
---
> if ( frag != NULL) dtls1_hm_fragment_free(frag);
> if ( item != NULL) OPENSSL_free(item);
> *ok = 0;
> return i;
> }
530c615
< unsigned char *p;
---
> unsigned char wire[DTLS1_HM_HEADER_LENGTH];
534,544d618
< unsigned long overlap;
<
< /* see if we have the required fragment already */
< if (dtls1_retrieve_buffered_fragment(s, &l))
< {
< /* compute MAC, remove fragment headers */
< dtls1_process_handshake_fragment(s, l);
< s->init_msg = s->init_buf->data + DTLS1_HM_HEADER_LENGTH;
< s->state = stn;
< return 1;
< }
546,547c620,625
< /* get a handshake fragment from the record layer */
< p = (unsigned char *)s->init_buf->data;
---
> /* see if we have the required fragment already */
> if ((frag_len = dtls1_retrieve_buffered_fragment(s,max,ok)) || *ok)
> {
> if (*ok) s->init_num += frag_len;
> return frag_len;
> }
549,550c627,628
< /* read handshake message header */
< i=s->method->ssl_read_bytes(s,SSL3_RT_HANDSHAKE,&p[s->init_num],
---
> /* read handshake message header */
> i=s->method->ssl_read_bytes(s,SSL3_RT_HANDSHAKE,wire,
558d635
<
561,564c638,639
< p += s->init_num;
< /* parse the message fragment header */
<
< dtls1_get_message_header(p, &msg_hdr);
---
> /* parse the message fragment header */
> dtls1_get_message_header(wire, &msg_hdr);
566,571c641,646
< /*
< * if this is a future (or stale) message it gets buffered
< * (or dropped)--no further processing at this time
< */
< if ( msg_hdr.seq != s->d1->handshake_read_seq)
< return dtls1_process_out_of_seq_message(s, &msg_hdr, ok);
---
> /*
> * if this is a future (or stale) message it gets buffered
> * (or dropped)--no further processing at this time
> */
> if ( msg_hdr.seq != s->d1->handshake_read_seq)
> return dtls1_process_out_of_seq_message(s, &msg_hdr, ok);
573,574c648,649
< l = msg_hdr.msg_len;
< frag_off = msg_hdr.frag_off;
---
> l = msg_hdr.msg_len;
> frag_off = msg_hdr.frag_off;
577,584d651
< /* sanity checking */
< if ( frag_off + frag_len > l)
< {
< al=SSL_AD_ILLEGAL_PARAMETER;
< SSLerr(SSL_F_DTLS1_GET_MESSAGE_FRAGMENT,SSL_R_EXCESSIVE_MESSAGE_SIZE);
< goto f_err;
< }
<
586,615c653
< p[0] == SSL3_MT_HELLO_REQUEST)
< {
< /* The server may always send 'Hello Request' messages --
< * we are doing a handshake anyway now, so ignore them
< * if their format is correct. Does not count for
< * 'Finished' MAC. */
< if (p[1] == 0 && p[2] == 0 &&p[3] == 0)
< {
< if (s->msg_callback)
< s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE,
< p, DTLS1_HM_HEADER_LENGTH, s,
< s->msg_callback_arg);
<
< s->init_num = 0;
< return dtls1_get_message_fragment(s, st1, stn,
< max, ok);
< }
< else /* Incorrectly formated Hello request */
< {
< al=SSL_AD_UNEXPECTED_MESSAGE;
< SSLerr(SSL_F_DTLS1_GET_MESSAGE_FRAGMENT,SSL_R_UNEXPECTED_MESSAGE);
< goto f_err;
< }
< }
<
< /* XDTLS: do a sanity check on the fragment */
<
< s->init_num += i;
<
< if ( s->d1->r_msg_hdr.frag_off == 0) /* first fragment */
---
> wire[0] == SSL3_MT_HELLO_REQUEST)
617,618c655,659
< /* BUF_MEM_grow takes an 'int' parameter */
< if (l > (INT_MAX-DTLS1_HM_HEADER_LENGTH))
---
> /* The server may always send 'Hello Request' messages --
> * we are doing a handshake anyway now, so ignore them
> * if their format is correct. Does not count for
> * 'Finished' MAC. */
> if (wire[1] == 0 && wire[2] == 0 && wire[3] == 0)
620,622c661,668
< al=SSL_AD_ILLEGAL_PARAMETER;
< SSLerr(SSL_F_DTLS1_GET_MESSAGE_FRAGMENT,SSL_R_EXCESSIVE_MESSAGE_SIZE);
< goto f_err;
---
> if (s->msg_callback)
> s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE,
> wire, DTLS1_HM_HEADER_LENGTH, s,
> s->msg_callback_arg);
>
> s->init_num = 0;
> return dtls1_get_message_fragment(s, st1, stn,
> max, ok);
624,625c670
< if (l && !BUF_MEM_grow_clean(s->init_buf,(int)l
< + DTLS1_HM_HEADER_LENGTH))
---
> else /* Incorrectly formated Hello request */
627,635c672,673
< SSLerr(SSL_F_DTLS1_GET_MESSAGE_FRAGMENT,ERR_R_BUF_LIB);
< goto err;
< }
< /* Only do this test when we're reading the expected message.
< * Stale messages will be dropped and future messages will be buffered */
< if ( l > (unsigned long)max)
< {
< al=SSL_AD_ILLEGAL_PARAMETER;
< SSLerr(SSL_F_DTLS1_GET_MESSAGE_FRAGMENT,SSL_R_EXCESSIVE_MESSAGE_SIZE);
---
> al=SSL_AD_UNEXPECTED_MESSAGE;
> SSLerr(SSL_F_DTLS1_GET_MESSAGE_FRAGMENT,SSL_R_UNEXPECTED_MESSAGE);
638,639d675
<
< s->s3->tmp.message_size=l;
642,653c678,679
< if ( frag_len > (unsigned long)max)
< {
< al=SSL_AD_ILLEGAL_PARAMETER;
< SSLerr(SSL_F_DTLS1_GET_MESSAGE_FRAGMENT,SSL_R_EXCESSIVE_MESSAGE_SIZE);
< goto f_err;
< }
< if ( frag_len + s->init_num > (INT_MAX - DTLS1_HM_HEADER_LENGTH))
< {
< al=SSL_AD_ILLEGAL_PARAMETER;
< SSLerr(SSL_F_DTLS1_GET_MESSAGE_FRAGMENT,SSL_R_EXCESSIVE_MESSAGE_SIZE);
< goto f_err;
< }
---
> if ((al=dtls1_preprocess_fragment(s,&msg_hdr,max)))
> goto f_err;
655,669d680
< if ( frag_len & !BUF_MEM_grow_clean(s->init_buf, (int)frag_len
< + DTLS1_HM_HEADER_LENGTH + s->init_num))
< {
< SSLerr(SSL_F_DTLS1_GET_MESSAGE_FRAGMENT,ERR_R_BUF_LIB);
< goto err;
< }
<
< if ( s->d1->r_msg_hdr.frag_off == 0)
< {
< s->s3->tmp.message_type = msg_hdr.type;
< s->d1->r_msg_hdr.type = msg_hdr.type;
< s->d1->r_msg_hdr.msg_len = l;
< /* s->d1->r_msg_hdr.seq = seq_num; */
< }
<
672,674d682
<
< /* next state (stn) */
< p = (unsigned char *)s->init_buf->data;
677a686,687
> unsigned char *p=s->init_buf->data+DTLS1_HM_HEADER_LENGTH;
>
679,681c689,690
< &p[s->init_num],
< frag_len,0);
< /* XDTLS: fix this--message fragments cannot span multiple packets */
---
> &p[frag_off],frag_len,0);
> /* XDTLS: fix this--message fragments cannot span multiple packets */
692,693c701,702
< /* XDTLS: an incorrectly formatted fragment should cause the
< * handshake to fail */
---
> /* XDTLS: an incorrectly formatted fragment should cause the
> * handshake to fail */
696,702c705
< #if 0
< /* Successfully read a fragment.
< * It may be (1) out of order, or
< * (2) it's a repeat, in which case we dump it
< * (3) the one we are expecting next (maybe with overlap)
< * If it is next one, it may overlap with previously read bytes
< */
---
> *ok = 1;
704,714c707,712
< /* case (1): buffer the future fragment
< * (we can treat fragments from a future message the same
< * as future fragments from the message being currently read, since
< * they are sematically simply out of order.
< */
< if ( msg_hdr.seq > s->d1->handshake_read_seq ||
< frag_off > s->init_num - DTLS1_HM_HEADER_LENGTH)
< {
< dtls1_buffer_handshake_fragment(s, &msg_hdr);
< return DTLS1_HM_FRAGMENT_RETRY;
< }
---
> /* Note that s->init_num is *not* used as current offset in
> * s->init_buf->data, but as a counter summing up fragments'
> * lengths: as soon as they sum up to handshake packet
> * length, we assume we have got all the fragments. */
> s->init_num += frag_len;
> return frag_len;
716,751d713
< /* case (2): drop the entire fragment, and try again */
< if ( msg_hdr.seq < s->d1->handshake_read_seq ||
< frag_off + frag_len < s->init_num - DTLS1_HM_HEADER_LENGTH)
< {
< s->init_num -= DTLS1_HM_HEADER_LENGTH;
< return DTLS1_HM_FRAGMENT_RETRY;
< }
< #endif
<
< /* case (3): received a immediately useful fragment. Determine the
< * possible overlap and copy the fragment.
< */
< overlap = (s->init_num - DTLS1_HM_HEADER_LENGTH) - frag_off;
<
< /* retain the header for the first fragment */
< if ( s->init_num > DTLS1_HM_HEADER_LENGTH)
< {
< memmove(&(s->init_buf->data[s->init_num]),
< &(s->init_buf->data[s->init_num + DTLS1_HM_HEADER_LENGTH + overlap]),
< frag_len - overlap);
<
< s->init_num += frag_len - overlap;
< }
< else
< s->init_num += frag_len;
<
< dtls1_process_handshake_fragment(s, frag_len - overlap);
<
< if (s->msg_callback)
< s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, s->init_buf->data,
< (size_t)s->init_num, s,
< s->msg_callback_arg);
< *ok=1;
<
< return s->init_num;
<
754,755c716,717
< s->init_num = 0;
< err:
---
> s->init_num = 0;
>
793c755
<
---
>
819,820d780
< s2n(s->d1->handshake_write_seq,p);
<
821a782,788
>
> if (s->client_version == DTLS1_BAD_VER)
> {
> s2n(s->d1->handshake_write_seq,p);
> s->init_num+=2;
> }
>
918,921c885,888
< {
< DTLS1_STATE *state;
< BIO *bio;
< int send_alert = 0;
---
> {
> DTLS1_STATE *state;
> BIO *bio;
> int send_alert = 0;
923,927c890,894
< if ( code > 0)
< {
< fprintf( stderr, "invalid state reached %s:%d", __FILE__, __LINE__);
< return 1;
< }
---
> if ( code > 0)
> {
> fprintf( stderr, "invalid state reached %s:%d", __FILE__, __LINE__);
> return 1;
> }
929,935c896,902
< bio = SSL_get_rbio(s);
< if ( ! BIO_dgram_recv_timedout(bio))
< {
< /* not a timeout, none of our business,
< let higher layers handle this. in fact it's probably an error */
< return code;
< }
---
> bio = SSL_get_rbio(s);
> if ( ! BIO_dgram_recv_timedout(bio))
> {
> /* not a timeout, none of our business,
> let higher layers handle this. in fact it's probably an error */
> return code;
> }
937,941c904,908
< if ( ! SSL_in_init(s)) /* done, no need to send a retransmit */
< {
< BIO_set_flags(SSL_get_rbio(s), BIO_FLAGS_READ);
< return code;
< }
---
> if ( ! SSL_in_init(s)) /* done, no need to send a retransmit */
> {
> BIO_set_flags(SSL_get_rbio(s), BIO_FLAGS_READ);
> return code;
> }
943,957c910,917
< state = s->d1;
< state->timeout.num_alerts++;
< if ( state->timeout.num_alerts > DTLS1_TMO_ALERT_COUNT)
< {
< /* fail the connection, enough alerts have been sent */
< SSLerr(SSL_F_DTLS1_READ_FAILED,SSL_R_READ_TIMEOUT_EXPIRED);
< return 0;
< }
<
< state->timeout.read_timeouts++;
< if ( state->timeout.read_timeouts > DTLS1_TMO_READ_COUNT)
< {
< send_alert = 1;
< state->timeout.read_timeouts = 1;
< }
---
> state = s->d1;
> state->timeout.num_alerts++;
> if ( state->timeout.num_alerts > DTLS1_TMO_ALERT_COUNT)
> {
> /* fail the connection, enough alerts have been sent */
> SSLerr(SSL_F_DTLS1_READ_FAILED,SSL_R_READ_TIMEOUT_EXPIRED);
> return 0;
> }
959c919,926
<
---
> state->timeout.read_timeouts++;
> if ( state->timeout.read_timeouts > DTLS1_TMO_READ_COUNT)
> {
> send_alert = 1;
> state->timeout.read_timeouts = 1;
> }
>
>
961,966c928,933
< item = pqueue_peek(state->rcvd_records);
< if ( item )
< {
< /* send an alert immediately for all the missing records */
< }
< else
---
> item = pqueue_peek(state->rcvd_records);
> if ( item )
> {
> /* send an alert immediately for all the missing records */
> }
> else
970,972c937,939
< if ( send_alert)
< ssl3_send_alert(s,SSL3_AL_WARNING,
< DTLS1_AD_MISSING_HANDSHAKE_MESSAGE);
---
> if ( send_alert)
> ssl3_send_alert(s,SSL3_AL_WARNING,
> DTLS1_AD_MISSING_HANDSHAKE_MESSAGE);
975,976c942,943
< return dtls1_retransmit_buffered_messages(s) ;
< }
---
> return dtls1_retransmit_buffered_messages(s) ;
> }
981,986c948,953
< {
< pqueue sent = s->d1->sent_messages;
< piterator iter;
< pitem *item;
< hm_fragment *frag;
< int found = 0;
---
> {
> pqueue sent = s->d1->sent_messages;
> piterator iter;
> pitem *item;
> hm_fragment *frag;
> int found = 0;
988c955
< iter = pqueue_iterator(sent);
---
> iter = pqueue_iterator(sent);
990,999c957,966
< for ( item = pqueue_next(&iter); item != NULL; item = pqueue_next(&iter))
< {
< frag = (hm_fragment *)item->data;
< if ( dtls1_retransmit_message(s, frag->msg_header.seq, 0, &found) <= 0 &&
< found)
< {
< fprintf(stderr, "dtls1_retransmit_message() failed\n");
< return -1;
< }
< }
---
> for ( item = pqueue_next(&iter); item != NULL; item = pqueue_next(&iter))
> {
> frag = (hm_fragment *)item->data;
> if ( dtls1_retransmit_message(s, frag->msg_header.seq, 0, &found) <= 0 &&
> found)
> {
> fprintf(stderr, "dtls1_retransmit_message() failed\n");
> return -1;
> }
> }
1001,1002c968,969
< return 1;
< }
---
> return 1;
> }
1004,1040d970
< #if 0
< static dtls1_message_buffer *
< dtls1_message_buffer_new(unsigned int len)
< {
< dtls1_message_buffer *msg_buf;
<
< msg_buf = (dtls1_message_buffer *)
< OPENSSL_malloc(sizeof(dtls1_message_buffer));
< if ( msg_buf == NULL)
< return NULL;
<
< memset(msg_buf, 0x00, sizeof(dtls1_message_buffer));
<
< msg_buf->data = (unsigned char *) OPENSSL_malloc(len);
< if ( msg_buf->data == NULL)
< {
< OPENSSL_free(msg_buf);
< return NULL;
< }
<
< memset(msg_buf->data, 0x00, len);
< return msg_buf;
< }
< #endif
<
< #if 0
< static void
< dtls1_message_buffer_free(dtls1_message_buffer *msg_buf)
< {
< if (msg_buf != NULL)
< {
< OPENSSL_free(msg_buf->data);
< OPENSSL_free(msg_buf);
< }
< }
< #endif
<
1043,1045c973,975
< {
< pitem *item;
< hm_fragment *frag;
---
> {
> pitem *item;
> hm_fragment *frag;
1048,1050c978,980
< /* this function is called immediately after a message has
< * been serialized */
< OPENSSL_assert(s->init_off == 0);
---
> /* this function is called immediately after a message has
> * been serialized */
> OPENSSL_assert(s->init_off == 0);
1052c982
< frag = dtls1_hm_fragment_new(s->init_num);
---
> frag = dtls1_hm_fragment_new(s->init_num);
1054c984
< memcpy(frag->fragment, s->init_buf->data, s->init_num);
---
> memcpy(frag->fragment, s->init_buf->data, s->init_num);
1056,1065c986,995
< if ( is_ccs)
< {
< OPENSSL_assert(s->d1->w_msg_hdr.msg_len +
< DTLS1_CCS_HEADER_LENGTH == (unsigned int)s->init_num);
< }
< else
< {
< OPENSSL_assert(s->d1->w_msg_hdr.msg_len +
< DTLS1_HM_HEADER_LENGTH == (unsigned int)s->init_num);
< }
---
> if ( is_ccs)
> {
> OPENSSL_assert(s->d1->w_msg_hdr.msg_len +
> DTLS1_CCS_HEADER_LENGTH <= (unsigned int)s->init_num);
> }
> else
> {
> OPENSSL_assert(s->d1->w_msg_hdr.msg_len +
> DTLS1_HM_HEADER_LENGTH == (unsigned int)s->init_num);
> }
1067,1072c997,1002
< frag->msg_header.msg_len = s->d1->w_msg_hdr.msg_len;
< frag->msg_header.seq = s->d1->w_msg_hdr.seq;
< frag->msg_header.type = s->d1->w_msg_hdr.type;
< frag->msg_header.frag_off = 0;
< frag->msg_header.frag_len = s->d1->w_msg_hdr.msg_len;
< frag->msg_header.is_ccs = is_ccs;
---
> frag->msg_header.msg_len = s->d1->w_msg_hdr.msg_len;
> frag->msg_header.seq = s->d1->w_msg_hdr.seq;
> frag->msg_header.type = s->d1->w_msg_hdr.type;
> frag->msg_header.frag_off = 0;
> frag->msg_header.frag_len = s->d1->w_msg_hdr.msg_len;
> frag->msg_header.is_ccs = is_ccs;
1074,1075c1004,1005
< pq_64bit_init(&seq64);
< pq_64bit_assign_word(&seq64, frag->msg_header.seq);
---
> pq_64bit_init(&seq64);
> pq_64bit_assign_word(&seq64, frag->msg_header.seq);
1077,1083c1007,1013
< item = pitem_new(seq64, frag);
< pq_64bit_free(&seq64);
< if ( item == NULL)
< {
< dtls1_hm_fragment_free(frag);
< return 0;
< }
---
> item = pitem_new(seq64, frag);
> pq_64bit_free(&seq64);
> if ( item == NULL)
> {
> dtls1_hm_fragment_free(frag);
> return 0;
> }
1086,1088c1016,1018
< fprintf( stderr, "buffered messge: \ttype = %xx\n", msg_buf->type);
< fprintf( stderr, "\t\t\t\t\tlen = %d\n", msg_buf->len);
< fprintf( stderr, "\t\t\t\t\tseq_num = %d\n", msg_buf->seq_num);
---
> fprintf( stderr, "buffered messge: \ttype = %xx\n", msg_buf->type);
> fprintf( stderr, "\t\t\t\t\tlen = %d\n", msg_buf->len);
> fprintf( stderr, "\t\t\t\t\tseq_num = %d\n", msg_buf->seq_num);
1091,1093c1021,1023
< pqueue_insert(s->d1->sent_messages, item);
< return 1;
< }
---
> pqueue_insert(s->d1->sent_messages, item);
> return 1;
> }
1097,1103c1027,1033
< int *found)
< {
< int ret;
< /* XDTLS: for now assuming that read/writes are blocking */
< pitem *item;
< hm_fragment *frag ;
< unsigned long header_length;
---
> int *found)
> {
> int ret;
> /* XDTLS: for now assuming that read/writes are blocking */
> pitem *item;
> hm_fragment *frag ;
> unsigned long header_length;
1106,1109c1036,1039
< /*
< OPENSSL_assert(s->init_num == 0);
< OPENSSL_assert(s->init_off == 0);
< */
---
> /*
> OPENSSL_assert(s->init_num == 0);
> OPENSSL_assert(s->init_off == 0);
> */
1111,1113c1041,1043
< /* XDTLS: the requested message ought to be found, otherwise error */
< pq_64bit_init(&seq64);
< pq_64bit_assign_word(&seq64, seq);
---
> /* XDTLS: the requested message ought to be found, otherwise error */
> pq_64bit_init(&seq64);
> pq_64bit_assign_word(&seq64, seq);
1115,1122c1045,1052
< item = pqueue_find(s->d1->sent_messages, seq64);
< pq_64bit_free(&seq64);
< if ( item == NULL)
< {
< fprintf(stderr, "retransmit: message %d non-existant\n", seq);
< *found = 0;
< return 0;
< }
---
> item = pqueue_find(s->d1->sent_messages, seq64);
> pq_64bit_free(&seq64);
> if ( item == NULL)
> {
> fprintf(stderr, "retransmit: message %d non-existant\n", seq);
> *found = 0;
> return 0;
> }
1124,1125c1054,1055
< *found = 1;
< frag = (hm_fragment *)item->data;
---
> *found = 1;
> frag = (hm_fragment *)item->data;
1127,1130c1057,1060
< if ( frag->msg_header.is_ccs)
< header_length = DTLS1_CCS_HEADER_LENGTH;
< else
< header_length = DTLS1_HM_HEADER_LENGTH;
---
> if ( frag->msg_header.is_ccs)
> header_length = DTLS1_CCS_HEADER_LENGTH;
> else
> header_length = DTLS1_HM_HEADER_LENGTH;
1132,1138c1062,1064
< memcpy(s->init_buf->data, frag->fragment,
< frag->msg_header.msg_len + header_length);
< s->init_num = frag->msg_header.msg_len + header_length;
<
< dtls1_set_message_header_int(s, frag->msg_header.type,
< frag->msg_header.msg_len, frag->msg_header.seq, 0,
< frag->msg_header.frag_len);
---
> memcpy(s->init_buf->data, frag->fragment,
> frag->msg_header.msg_len + header_length);
> s->init_num = frag->msg_header.msg_len + header_length;
1140,1143c1066,1068
< s->d1->retransmitting = 1;
< ret = dtls1_do_write(s, frag->msg_header.is_ccs ?
< SSL3_RT_CHANGE_CIPHER_SPEC : SSL3_RT_HANDSHAKE);
< s->d1->retransmitting = 0;
---
> dtls1_set_message_header_int(s, frag->msg_header.type,
> frag->msg_header.msg_len, frag->msg_header.seq, 0,
> frag->msg_header.frag_len);
1145,1147c1070,1073
< BIO_flush(SSL_get_wbio(s));
< return ret;
< }
---
> s->d1->retransmitting = 1;
> ret = dtls1_do_write(s, frag->msg_header.is_ccs ?
> SSL3_RT_CHANGE_CIPHER_SPEC : SSL3_RT_HANDSHAKE);
> s->d1->retransmitting = 0;
1148a1075,1078
> (void)BIO_flush(SSL_get_wbio(s));
> return ret;
> }
>
1152,1161c1082,1083
< {
< pitem *item;
<
< for(item = pqueue_pop(s->d1->sent_messages);
< item != NULL; item = pqueue_pop(s->d1->sent_messages))
< {
< dtls1_hm_fragment_free((hm_fragment *)item->data);
< pitem_free(item);
< }
< }
---
> {
> pitem *item;
1162a1085,1091
> for(item = pqueue_pop(s->d1->sent_messages);
> item != NULL; item = pqueue_pop(s->d1->sent_messages))
> {
> dtls1_hm_fragment_free((hm_fragment *)item->data);
> pitem_free(item);
> }
> }
1163a1093
>
1166,1178c1096,1102
< unsigned long len, unsigned long frag_off, unsigned long frag_len)
< {
< if ( frag_off == 0)
< {
< s->d1->handshake_write_seq = s->d1->next_handshake_write_seq;
< s->d1->next_handshake_write_seq++;
< }
<
< dtls1_set_message_header_int(s, mt, len, s->d1->handshake_write_seq,
< frag_off, frag_len);
<
< return p += DTLS1_HM_HEADER_LENGTH;
< }
---
> unsigned long len, unsigned long frag_off, unsigned long frag_len)
> {
> if ( frag_off == 0)
> {
> s->d1->handshake_write_seq = s->d1->next_handshake_write_seq;
> s->d1->next_handshake_write_seq++;
> }
1179a1104,1105
> dtls1_set_message_header_int(s, mt, len, s->d1->handshake_write_seq,
> frag_off, frag_len);
1180a1107,1110
> return p += DTLS1_HM_HEADER_LENGTH;
> }
>
>
1184,1194c1114,1117
< unsigned long len, unsigned short seq_num, unsigned long frag_off,
< unsigned long frag_len)
< {
< struct hm_header_st *msg_hdr = &s->d1->w_msg_hdr;
<
< msg_hdr->type = mt;
< msg_hdr->msg_len = len;
< msg_hdr->seq = seq_num;
< msg_hdr->frag_off = frag_off;
< msg_hdr->frag_len = frag_len;
< }
---
> unsigned long len, unsigned short seq_num, unsigned long frag_off,
> unsigned long frag_len)
> {
> struct hm_header_st *msg_hdr = &s->d1->w_msg_hdr;
1195a1119,1125
> msg_hdr->type = mt;
> msg_hdr->msg_len = len;
> msg_hdr->seq = seq_num;
> msg_hdr->frag_off = frag_off;
> msg_hdr->frag_len = frag_len;
> }
>
1198,1204c1128,1130
< unsigned long frag_len)
< {
< struct hm_header_st *msg_hdr = &s->d1->w_msg_hdr;
<
< msg_hdr->frag_off = frag_off;
< msg_hdr->frag_len = frag_len;
< }
---
> unsigned long frag_len)
> {
> struct hm_header_st *msg_hdr = &s->d1->w_msg_hdr;
1205a1132,1135
> msg_hdr->frag_off = frag_off;
> msg_hdr->frag_len = frag_len;
> }
>
1208,1219c1138,1139
< {
< struct hm_header_st *msg_hdr = &s->d1->w_msg_hdr;
<
< *p++ = msg_hdr->type;
< l2n3(msg_hdr->msg_len, p);
<
< s2n(msg_hdr->seq, p);
< l2n3(msg_hdr->frag_off, p);
< l2n3(msg_hdr->frag_len, p);
<
< return p;
< }
---
> {
> struct hm_header_st *msg_hdr = &s->d1->w_msg_hdr;
1220a1141,1150
> *p++ = msg_hdr->type;
> l2n3(msg_hdr->msg_len, p);
>
> s2n(msg_hdr->seq, p);
> l2n3(msg_hdr->frag_off, p);
> l2n3(msg_hdr->frag_len, p);
>
> return p;
> }
>
1223,1227c1153,1156
< {
< return
< g_probable_mtu[(sizeof(g_probable_mtu) /
< sizeof(g_probable_mtu[0])) - 1];
< }
---
> {
> return (g_probable_mtu[(sizeof(g_probable_mtu) /
> sizeof(g_probable_mtu[0])) - 1]);
> }
1240c1169
<
---
>
1246,1254c1175,1178
< {
< memset(msg_hdr, 0x00, sizeof(struct hm_header_st));
< msg_hdr->type = *(data++);
< n2l3(data, msg_hdr->msg_len);
<
< n2s(data, msg_hdr->seq);
< n2l3(data, msg_hdr->frag_off);
< n2l3(data, msg_hdr->frag_len);
< }
---
> {
> memset(msg_hdr, 0x00, sizeof(struct hm_header_st));
> msg_hdr->type = *(data++);
> n2l3(data, msg_hdr->msg_len);
1255a1180,1184
> n2s(data, msg_hdr->seq);
> n2l3(data, msg_hdr->frag_off);
> n2l3(data, msg_hdr->frag_len);
> }
>
1258,1263c1187,1191
< {
< memset(ccs_hdr, 0x00, sizeof(struct ccs_header_st));
<
< ccs_hdr->type = *(data++);
< n2s(data, ccs_hdr->seq);
< }
---
> {
> memset(ccs_hdr, 0x00, sizeof(struct ccs_header_st));
>
> ccs_hdr->type = *(data++);
> }