commit 7f18b139cc6ba1f2282d39a0fe5c84765c286b99
author David Benjamin <davidben@chromium.org> Sun Jan 11 17:36:21 2015 -0500
committer Adam Langley <agl@google.com> Wed Jan 14 21:43:36 2015 +0000
tree 596d0555996fd004244eff90966abbf90029dd90
parent d9778fb418786cd8d0edd2ae0d67013725b2f919

Always SSL_OP_NO_QUERY_MTU before querying the BIO MTU.

That setting means that the MTU is provided externally via SSL_set_mtu.

(Imported from upstream's 001235778a6e9c645dc0507cad6092d99c9af8f5)

Change-Id: I4e5743a9dee734ddd0235f080aefe98a7365aaf6
Reviewed-on: https://boringssl-review.googlesource.com/2826
Reviewed-by: Adam Langley <agl@google.com>

ssl/d1_lib.c

diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
index 9fcc050..d08b6bd 100644
--- a/ssl/d1_lib.c
+++ b/ssl/d1_lib.c
@@ -356,7 +356,8 @@
   s->d1->timeout.num_alerts++;
 
   /* Reduce MTU after 2 unsuccessful retransmissions */
-  if (s->d1->timeout.num_alerts > 2) {
+  if (s->d1->timeout.num_alerts > 2 &&
+      !(SSL_get_options(s) & SSL_OP_NO_QUERY_MTU)) {
     s->d1->mtu =
         BIO_ctrl(SSL_get_wbio(s), BIO_CTRL_DGRAM_GET_FALLBACK_MTU, 0, NULL);
   }