diff options
| author | BoringSSL Robot <178796648329-compute@developer.gserviceaccount.com> | 2024-07-17 18:51:22 +0000 |
|---|---|---|
| committer | BoringSSL Robot <178796648329-compute@developer.gserviceaccount.com> | 2024-07-17 18:51:22 +0000 |
| commit | c13c11ac3b40ddbf236cf135e1eae327601f4f4c (patch) | |
| tree | 51e2ad6c3bc102512973bd5452fc4cda255a21bc | |
| parent | f50e078ef04d1dfd8cbf609d4a457bea3e476d26 (diff) | |
| parent | 096ded9f097b73a15956b04cd168c7cfe7e28f52 (diff) | |
| download | boringssl-c13c11ac3b40ddbf236cf135e1eae327601f4f4c.zip boringssl-c13c11ac3b40ddbf236cf135e1eae327601f4f4c.tar.gz boringssl-c13c11ac3b40ddbf236cf135e1eae327601f4f4c.tar.bz2 | |
update main-with-bazel from master branch
| -rw-r--r-- | src/ssl/extensions.cc | 1 | ||||
| -rw-r--r-- | src/ssl/handshake_server.cc | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/ssl/extensions.cc b/src/ssl/extensions.cc index 3f35276..7f06ded 100644 --- a/src/ssl/extensions.cc +++ b/src/ssl/extensions.cc @@ -3794,6 +3794,7 @@ static bool ssl_check_clienthello_tlsext(SSL_HANDSHAKE *hs) { return true; default: + hs->should_ack_sni = ssl->s3->hostname != nullptr; return true; } } diff --git a/src/ssl/handshake_server.cc b/src/ssl/handshake_server.cc index 508f9bf..148a29c 100644 --- a/src/ssl/handshake_server.cc +++ b/src/ssl/handshake_server.cc @@ -616,7 +616,6 @@ static bool extract_sni(SSL_HANDSHAKE *hs, uint8_t *out_alert, // // 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 @@ static bool extract_sni(SSL_HANDSHAKE *hs, uint8_t *out_alert, return false; } ssl->s3->hostname.reset(raw); - - hs->should_ack_sni = true; return true; } |