commit 096ded9f097b73a15956b04cd168c7cfe7e28f52
author David Benjamin <davidben@google.com> Tue Jul 16 14:48:02 2024 -0400
committer Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jul 17 17:12:42 2024 +0000
tree f6f0029f1beed1a5c826be7ac732666e8c5f5afc
parent d274b1bacdca36f3941bf78e43dc38acf676a1a8

Compute should_ack_sni in one place

Right now it's split over the SNI extractor and the code that calls the
SNI callback. But the only thing that reads it is the code to send the
ServerHello extension, so we don't need to half-compute it earlier.

Change-Id: Ia0fdd502ab21bec2ccdde99185951601a4650efe
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/69747
Reviewed-by: Bob Beck <bbe@google.com>
Auto-Submit: David Benjamin <davidben@google.com>
Commit-Queue: Bob Beck <bbe@google.com>

ssl/extensions.cc

diff --git a/ssl/extensions.cc b/ssl/extensions.cc
index 3f35276..7f06ded 100644
--- a/ssl/extensions.cc
+++ b/ssl/extensions.cc
@@ -3794,6 +3794,7 @@
       return true;
 
     default:
+      hs->should_ack_sni = ssl->s3->hostname != nullptr;
       return true;
   }
 }

ssl/handshake_server.cc

diff --git a/ssl/handshake_server.cc b/ssl/handshake_server.cc
index 508f9bf..148a29c 100644
--- a/ssl/handshake_server.cc
+++ b/ssl/handshake_server.cc
@@ -616,7 +616,6 @@
     //
     // Clear state in case we previously extracted SNI from ClientHelloOuter.
     ssl->s3->hostname.reset();
-    hs->should_ack_sni = false;
     return true;
   }
 
@@ -653,8 +652,6 @@
     return false;
   }
   ssl->s3->hostname.reset(raw);
-
-  hs->should_ack_sni = true;
   return true;
 }