commit da890de1b534aedc6bb2001de6ff6b6676be3a60
author David Benjamin <davidben@google.com> Thu Mar 25 21:34:58 2021 -0400
committer Adam Langley <agl@google.com> Mon Mar 29 16:28:54 2021 +0000
tree 326df222aa11054ef753d13a27315cabdba5accd
parent 04c44d92c941da928d23b91aa1976f9844a0b3c1

Remove is_resume field on TestState.

This wasn't being used and wasn't even set correctly in split handshake
tests.

Change-Id: I03000db8dd3c227ea44e7bacaf3d1341259fae44
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/46384
Reviewed-by: Adam Langley <agl@google.com>

ssl/test/bssl_shim.cc

diff --git a/ssl/test/bssl_shim.cc b/ssl/test/bssl_shim.cc
index 31c0a01..6df8d60 100644
--- a/ssl/test/bssl_shim.cc
+++ b/ssl/test/bssl_shim.cc
@@ -692,7 +692,7 @@
                          const TestConfig *retry_config, bool is_resume,
                          SSL_SESSION *session, SettingsWriter *writer) {
   bssl::UniquePtr<SSL> ssl = config->NewSSL(
-      ssl_ctx, session, is_resume, std::unique_ptr<TestState>(new TestState));
+      ssl_ctx, session, std::unique_ptr<TestState>(new TestState));
   if (!ssl) {
     return false;
   }

ssl/test/handshake_util.cc

diff --git a/ssl/test/handshake_util.cc b/ssl/test/handshake_util.cc
index f3f725d..aca2556 100644
--- a/ssl/test/handshake_util.cc
+++ b/ssl/test/handshake_util.cc
@@ -489,7 +489,7 @@
   }
 
   UniquePtr<SSL> ssl_handback =
-      config->NewSSL((*ssl)->ctx.get(), nullptr, false, nullptr);
+      config->NewSSL((*ssl)->ctx.get(), nullptr, nullptr);
   if (!ssl_handback) {
     return false;
   }

ssl/test/handshaker.cc

diff --git a/ssl/test/handshaker.cc b/ssl/test/handshaker.cc
index 72d6b2f..3a0ee57 100644
--- a/ssl/test/handshaker.cc
+++ b/ssl/test/handshaker.cc
@@ -40,7 +40,7 @@
   if (!ctx) {
     return false;
   }
-  UniquePtr<SSL> ssl = config->NewSSL(ctx.get(), nullptr, false, nullptr);
+  UniquePtr<SSL> ssl = config->NewSSL(ctx.get(), nullptr, nullptr);
 
   // Set |O_NONBLOCK| in order to break out of the loop when we hit
   // |SSL_ERROR_WANT_READ|, so that we can send |kControlMsgWantRead| to the

ssl/test/test_config.cc

diff --git a/ssl/test/test_config.cc b/ssl/test/test_config.cc
index d5a5357..30b2ef3 100644
--- a/ssl/test/test_config.cc
+++ b/ssl/test/test_config.cc
@@ -1518,7 +1518,7 @@
 }
 
 bssl::UniquePtr<SSL> TestConfig::NewSSL(
-    SSL_CTX *ssl_ctx, SSL_SESSION *session, bool is_resume,
+    SSL_CTX *ssl_ctx, SSL_SESSION *session,
     std::unique_ptr<TestState> test_state) const {
   bssl::UniquePtr<SSL> ssl(SSL_new(ssl_ctx));
   if (!ssl) {
@@ -1532,7 +1532,6 @@
     if (!SetTestState(ssl.get(), std::move(test_state))) {
       return nullptr;
     }
-    GetTestState(ssl.get())->is_resume = is_resume;
   }
 
   if (fallback_scsv && !SSL_set_mode(ssl.get(), SSL_MODE_SEND_FALLBACK_SCSV)) {

ssl/test/test_config.h

diff --git a/ssl/test/test_config.h b/ssl/test/test_config.h
index 1f3542b..babf1d5 100644
--- a/ssl/test/test_config.h
+++ b/ssl/test/test_config.h
@@ -192,7 +192,6 @@
   bssl::UniquePtr<SSL_CTX> SetupCtx(SSL_CTX *old_ctx) const;
 
   bssl::UniquePtr<SSL> NewSSL(SSL_CTX *ssl_ctx, SSL_SESSION *session,
-                              bool is_resume,
                               std::unique_ptr<TestState> test_state) const;
 };
 

ssl/test/test_state.h

diff --git a/ssl/test/test_state.h b/ssl/test/test_state.h
index 745c4c4..e5c96e5 100644
--- a/ssl/test/test_state.h
+++ b/ssl/test/test_state.h
@@ -56,7 +56,6 @@
   bssl::UniquePtr<SSL_SESSION> new_session;
   bool ticket_decrypt_done = false;
   bool alpn_select_done = false;
-  bool is_resume = false;
   bool early_callback_ready = false;
   bool custom_verify_ready = false;
   std::string msg_callback_text;