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

Fix from 1.0.0-stable branch.

Browse Source
This commit is contained in:
Dr. Stephen Henson
2009-05-18 16:12:56 +00:00
parent 3e82dfdf2d
commit 4730ea8a38
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
crypto/bio/bss_dgram.c
View File

@@ -289,9 +289,6 @@ static int dgram_read(BIO *b, char *out, int outl)
BIO_set_retry_read(b); BIO_set_retry_read(b);
data->_errno = get_last_socket_error(); data->_errno = get_last_socket_error();
} }
#if 0
memset(&(data->hstimeout), 0, sizeof(struct timeval));
#endif
} }
} }
return(ret); return(ret);

11
ssl/d1_both.c
View File

@@ -561,7 +561,16 @@ dtls1_process_out_of_seq_message(SSL *s, struct hm_header_st* msg_hdr, int *ok)
if ((msg_hdr->frag_off+frag_len) > msg_hdr->msg_len) if ((msg_hdr->frag_off+frag_len) > msg_hdr->msg_len)
goto err; goto err;
if (msg_hdr->seq <= s->d1->handshake_read_seq) /* Try to find item in queue, to prevent duplicate entries */
memset(seq64be,0,sizeof(seq64be));
seq64be[6] = (unsigned char) (msg_hdr->seq>>8);
seq64be[7] = (unsigned char) msg_hdr->seq;
item = pqueue_find(s->d1->buffered_messages, seq64be);
/* Discard the message if sequence number was already there, is
* too far in the future or the fragment is already in the queue */
if (msg_hdr->seq <= s->d1->handshake_read_seq ||
msg_hdr->seq > s->d1->handshake_read_seq + 10 || item != NULL)
{ {
unsigned char devnull [256]; unsigned char devnull [256];