diff --git a/ssl/test/bssl_shim.cc b/ssl/test/bssl_shim.cc index 31c0a0147..6df8d6008 100644 --- a/ssl/test/bssl_shim.cc +++ b/ssl/test/bssl_shim.cc @@ -692,7 +692,7 @@ static bool DoConnection(bssl::UniquePtr *out_session, const TestConfig *retry_config, bool is_resume, SSL_SESSION *session, SettingsWriter *writer) { bssl::UniquePtr ssl = config->NewSSL( - ssl_ctx, session, is_resume, std::unique_ptr(new TestState)); + ssl_ctx, session, std::unique_ptr(new TestState)); if (!ssl) { return false; } diff --git a/ssl/test/handshake_util.cc b/ssl/test/handshake_util.cc index f3f725dcc..aca255652 100644 --- a/ssl/test/handshake_util.cc +++ b/ssl/test/handshake_util.cc @@ -489,7 +489,7 @@ bool DoSplitHandshake(UniquePtr *ssl, SettingsWriter *writer, } UniquePtr ssl_handback = - config->NewSSL((*ssl)->ctx.get(), nullptr, false, nullptr); + config->NewSSL((*ssl)->ctx.get(), nullptr, nullptr); if (!ssl_handback) { return false; } diff --git a/ssl/test/handshaker.cc b/ssl/test/handshaker.cc index 72d6b2fde..3a0ee5796 100644 --- a/ssl/test/handshaker.cc +++ b/ssl/test/handshaker.cc @@ -40,7 +40,7 @@ bool Handshaker(const TestConfig *config, int rfd, int wfd, if (!ctx) { return false; } - UniquePtr ssl = config->NewSSL(ctx.get(), nullptr, false, nullptr); + UniquePtr 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 diff --git a/ssl/test/test_config.cc b/ssl/test/test_config.cc index d5a535747..30b2ef333 100644 --- a/ssl/test/test_config.cc +++ b/ssl/test/test_config.cc @@ -1518,7 +1518,7 @@ static int CertCallback(SSL *ssl, void *arg) { } bssl::UniquePtr TestConfig::NewSSL( - SSL_CTX *ssl_ctx, SSL_SESSION *session, bool is_resume, + SSL_CTX *ssl_ctx, SSL_SESSION *session, std::unique_ptr test_state) const { bssl::UniquePtr ssl(SSL_new(ssl_ctx)); if (!ssl) { @@ -1532,7 +1532,6 @@ bssl::UniquePtr TestConfig::NewSSL( 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)) { diff --git a/ssl/test/test_config.h b/ssl/test/test_config.h index 1f3542b41..babf1d5e2 100644 --- a/ssl/test/test_config.h +++ b/ssl/test/test_config.h @@ -192,7 +192,6 @@ struct TestConfig { bssl::UniquePtr SetupCtx(SSL_CTX *old_ctx) const; bssl::UniquePtr NewSSL(SSL_CTX *ssl_ctx, SSL_SESSION *session, - bool is_resume, std::unique_ptr test_state) const; }; diff --git a/ssl/test/test_state.h b/ssl/test/test_state.h index 745c4c42f..e5c96e5e0 100644 --- a/ssl/test/test_state.h +++ b/ssl/test/test_state.h @@ -56,7 +56,6 @@ struct TestState { bssl::UniquePtr 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;