From 281a8f5ea393ffe67924249d2f0636d97a609c1f Mon Sep 17 00:00:00 2001
From: Nick Harper <nharper@chromium.org>
Date: Tue, 28 Jul 2020 10:12:49 -0700
Subject: [PATCH] Disable ClientHello padding for QUIC.

Bug: 327
Change-Id: I415deee8e6b2dc4cd5bdfb5e329d889dd3a5baa7
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/42364
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
---
 ssl/t1_lib.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/t1_lib.cc b/ssl/t1_lib.cc
index dad0fcf58..5032af5f0 100644
--- a/ssl/t1_lib.cc
+++ b/ssl/t1_lib.cc
@@ -3047,7 +3047,7 @@ bool ssl_add_clienthello_tlsext(SSL_HANDSHAKE *hs, CBB *out,
     last_was_empty = false;
   }
 
-  if (!SSL_is_dtls(ssl)) {
+  if (!SSL_is_dtls(ssl) && !ssl->quic_method) {
     size_t psk_extension_len = ext_pre_shared_key_clienthello_length(hs);
     header_len += 2 + CBB_len(&extensions) + psk_extension_len;
     size_t padding_len = 0;