commit 0685b682161bfcfc5a4a0625016529ec86f883c9
author David Benjamin <davidben@chromium.org> Mon Mar 02 02:38:02 2015 -0500
committer Adam Langley <agl@google.com> Thu Mar 05 21:26:55 2015 +0000
tree 32edcf435a9db94ff04c05f2398084f891c524ab
parent 5ca39fb50c29d450ad8f68a0326682934706c31f

Remove HelloRequest special-case in DTLS message parsing.

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>

ssl/d1_both.c

diff --git a/ssl/d1_both.c b/ssl/d1_both.c
index d60aecd..0f31a55 100644
--- a/ssl/d1_both.c
+++ b/ssl/d1_both.c
@@ -759,7 +759,6 @@
   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 @@
     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;
   }