kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove HelloRequest special-case in DTLS message parsing.

Browse Source 
We don't support DTLS renego. Removing this separately from the rewrite to call
out intentionally dropping this logic.

Change-Id: Ie4428eea0d2dbbb8b4b8b6474df4821de62558cc
Reviewed-on: https://boringssl-review.googlesource.com/3761
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2015-03-02 02:38:02 -05:00 committed by Adam Langley
parent 5ca39fb50c
commit 0685b68216
1 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ssl/d1_both.c
View File

@ -759,7 +759,6 @@ static long dtls1_get_message_fragment(SSL *s, int stn, long max, int *ok) {
int i, al;
struct hm_header_st msg_hdr;
redo:
/* see if we have the required fragment already */
if ((frag_len = dtls1_retrieve_buffered_fragment(s, max, ok)) || *ok) {
if (*ok) {
@ -803,29 +802,6 @@ redo:
return dtls1_reassemble_fragment(s, &msg_hdr, ok);
}
if (!s->server && s->d1->r_msg_hdr.frag_off == 0 &&
wire[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 (wire[1] == 0 && wire[2] == 0 && wire[3] == 0) {
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;
goto redo;
} else {
/* Incorrectly formated Hello request */
al = SSL_AD_UNEXPECTED_MESSAGE;
OPENSSL_PUT_ERROR(SSL, dtls1_get_message_fragment,
SSL_R_UNEXPECTED_MESSAGE);
goto f_err;
}
}
if ((al = dtls1_preprocess_fragment(s, &msg_hdr, max))) {
goto f_err;
}