commit c312fd02f611bdc44e2c4e6d4663cbafc25a908e
author Matthew Braithwaite <mab@google.com> Tue Jul 03 22:29:45 2018 -0700
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Mon Jul 09 18:50:50 2018 +0000
tree ddd735ef0e9282ec9c2ce168412bf9b4467361a7
parent 82639e6f5341a3129b7cb62a5a2dd9b65f3c91ef

Remove MoveTestConfig().

In f2bc5f4 davidben pointed out that this function seems unnecessary
in my desired end-state.  In fact, I think it may have been
unnecessary since 56986f90.  (This was easier to miss at the time,
since at the time the function was part of MoveExData(), having not
yet been factored out.)

Change-Id: Ia9b4a909c93cb595666bcf7356a9f9a085901455
Reviewed-on: https://boringssl-review.googlesource.com/29604
Commit-Queue: Matt Braithwaite <mab@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
Reviewed-by: David Benjamin <davidben@google.com>

ssl/test/bssl_shim.cc

diff --git a/ssl/test/bssl_shim.cc b/ssl/test/bssl_shim.cc
index e2a6c13..5044915 100644
--- a/ssl/test/bssl_shim.cc
+++ b/ssl/test/bssl_shim.cc
@@ -790,8 +790,7 @@
         return false;
       }
       SSL_set_accept_state(ssl_handoff.get());
-      if (!MoveTestConfig(ssl_handoff.get(), ssl) ||
-          !MoveTestState(ssl_handoff.get(), ssl)) {
+      if (!MoveTestState(ssl_handoff.get(), ssl)) {
         return false;
       }
       MoveBIOs(ssl_handoff.get(), ssl);
@@ -821,8 +820,7 @@
       }
 
       MoveBIOs(ssl, ssl_handoff.get());
-      if (!MoveTestConfig(ssl, ssl_handoff.get()) ||
-          !MoveTestState(ssl, ssl_handoff.get())) {
+      if (!MoveTestState(ssl, ssl_handoff.get())) {
         return false;
       }
 
@@ -865,8 +863,7 @@
         return false;
       }
       MoveBIOs(ssl_handback.get(), ssl);
-      if (!MoveTestConfig(ssl_handback.get(), ssl) ||
-          !MoveTestState(ssl_handback.get(), ssl)) {
+      if (!MoveTestState(ssl_handback.get(), ssl)) {
         return false;
       }
 

ssl/test/test_config.cc

diff --git a/ssl/test/test_config.cc b/ssl/test/test_config.cc
index c6500ab..3c5046e 100644
--- a/ssl/test/test_config.cc
+++ b/ssl/test/test_config.cc
@@ -372,16 +372,6 @@
   return (const TestConfig *)SSL_get_ex_data(ssl, g_config_index);
 }
 
-bool MoveTestConfig(SSL *dest, SSL *src) {
-  const TestConfig *config = GetTestConfig(src);
-  if (!SSL_set_ex_data(src, g_config_index, nullptr) ||
-      !SSL_set_ex_data(dest, g_config_index, (void *)config)) {
-    return false;
-  }
-
-  return true;
-}
-
 static int LegacyOCSPCallback(SSL *ssl, void *arg) {
   const TestConfig *config = GetTestConfig(ssl);
   if (!SSL_is_server(ssl)) {

ssl/test/test_config.h

diff --git a/ssl/test/test_config.h b/ssl/test/test_config.h
index 930100e..6f815b5 100644
--- a/ssl/test/test_config.h
+++ b/ssl/test/test_config.h
@@ -179,8 +179,6 @@
 
 const TestConfig *GetTestConfig(const SSL *ssl);
 
-bool MoveTestConfig(SSL *dest, SSL *src);
-
 bool LoadCertificate(bssl::UniquePtr<X509> *out_x509,
                      bssl::UniquePtr<STACK_OF(X509)> *out_chain,
                      const std::string &file);