summaryrefslogtreecommitdiffstats
path: root/src/ssl/test/test_config.h
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2015-11-05 20:20:27 +0000
committerKenny Root <kroot@google.com>2015-11-05 20:20:27 +0000
commit03bcf618b7ed811b305845461fbb5497dfe55ac3 (patch)
tree24150183cfed2ad79eb2258cf525b4fc4544bd2d /src/ssl/test/test_config.h
parentfdeb488e6332a17729db5a04236e48a46a019272 (diff)
downloadexternal_boringssl-03bcf618b7ed811b305845461fbb5497dfe55ac3.zip
external_boringssl-03bcf618b7ed811b305845461fbb5497dfe55ac3.tar.gz
external_boringssl-03bcf618b7ed811b305845461fbb5497dfe55ac3.tar.bz2
Revert "external/boringssl: sync with upstream."
This reverts commit fdeb488e6332a17729db5a04236e48a46a019272. This breaks trusty since it doesn't have setjmp.h Change-Id: I960e25aa0bb2eef1237743b1567f7cb7f6d40497
Diffstat (limited to 'src/ssl/test/test_config.h')
-rw-r--r--src/ssl/test/test_config.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/ssl/test/test_config.h b/src/ssl/test/test_config.h
index 23fa1f1..9dea8e9 100644
--- a/src/ssl/test/test_config.h
+++ b/src/ssl/test/test_config.h
@@ -77,8 +77,10 @@ struct TestConfig {
std::string export_label;
std::string export_context;
bool use_export_context = false;
+ bool reject_peer_renegotiations = false;
bool no_legacy_server_connect = false;
bool tls_unique = false;
+ bool use_async_private_key = false;
bool expect_ticket_renewal = false;
bool expect_no_session = false;
bool use_ticket_callback = false;
@@ -95,10 +97,6 @@ struct TestConfig {
bool verify_peer = false;
bool expect_verify_result = false;
std::string signed_cert_timestamps;
- int expect_total_renegotiations = 0;
- bool renegotiate_once = false;
- bool renegotiate_freely = false;
- bool disable_npn = false;
};
bool ParseConfig(int argc, char **argv, TestConfig *out_config);