commit 079b394c490849388ed8bc08756d26153b9d843a
author David Benjamin <davidben@google.com> Thu Oct 20 13:19:20 2016 -0400
committer Adam Langley <agl@google.com> Mon Oct 24 20:04:24 2016 +0000
tree 3751280171c453ef07ad51c20981e39bd0d7847a
parent afdbb62de2def21a61f6e9d7318a833eee65021f

Always enable GREASE for TLS 1.3 NewSessionTicket.

On the client we'll leave it off by default until the change has made it
through Chrome's release process. For TLS 1.3, there is no existing
breakage risk, so always do it. This saves us the trouble of having to
manually turn it on in servers.

See [0] for a data point of someone getting it wrong.

[0] https://hg.mozilla.org/projects/nss/rev/9dbc21b1c3cc

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

ssl/tls13_server.c

diff --git a/ssl/tls13_server.c b/ssl/tls13_server.c
index e54abcf..fac4364 100644
--- a/ssl/tls13_server.c
+++ b/ssl/tls13_server.c
@@ -574,12 +574,10 @@
   }
 
   /* Add a fake extension. See draft-davidben-tls-grease-01. */
-  if (ssl->ctx->grease_enabled) {
-    if (!CBB_add_u16(&extensions,
-                     ssl_get_grease_value(ssl, ssl_grease_ticket_extension)) ||
-        !CBB_add_u16(&extensions, 0 /* empty */)) {
-      goto err;
-    }
+  if (!CBB_add_u16(&extensions,
+                   ssl_get_grease_value(ssl, ssl_grease_ticket_extension)) ||
+      !CBB_add_u16(&extensions, 0 /* empty */)) {
+    goto err;
   }
 
   if (!ssl->method->finish_message(ssl, &cbb)) {