diff options
author | Kenny Root <kroot@google.com> | 2015-09-25 00:44:37 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-25 00:44:37 +0000 |
commit | e246de8f184e644debf965ecdca552f006b56881 (patch) | |
tree | dc62c249d595198e0d99e43890019d21e901fbec /src/ssl/test/test_config.h | |
parent | c737bc23bc868fff21e5c1b95940813f709ea550 (diff) | |
parent | 00bc53f6f4436972b7a8dcf2c1e5fd0ad7515872 (diff) | |
download | external_boringssl-e246de8f184e644debf965ecdca552f006b56881.zip external_boringssl-e246de8f184e644debf965ecdca552f006b56881.tar.gz external_boringssl-e246de8f184e644debf965ecdca552f006b56881.tar.bz2 |
am 00bc53f6: am a04d78d3: Revert "external/boringssl: sync with upstream."
* commit '00bc53f6f4436972b7a8dcf2c1e5fd0ad7515872':
Revert "external/boringssl: sync with upstream."
Diffstat (limited to 'src/ssl/test/test_config.h')
-rw-r--r-- | src/ssl/test/test_config.h | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/src/ssl/test/test_config.h b/src/ssl/test/test_config.h index 9dea8e9..5d753c8 100644 --- a/src/ssl/test/test_config.h +++ b/src/ssl/test/test_config.h @@ -24,7 +24,6 @@ struct TestConfig { bool is_dtls = false; bool resume = false; bool fallback_scsv = false; - std::string digest_prefs; std::string key_file; std::string cert_file; std::string expected_server_name; @@ -55,11 +54,13 @@ struct TestConfig { bool expect_extended_master_secret = false; std::string psk; std::string psk_identity; + bool allow_unsafe_legacy_renegotiation = false; std::string srtp_profiles; bool enable_ocsp_stapling = false; std::string expected_ocsp_response; bool enable_signed_cert_timestamps = false; std::string expected_signed_cert_timestamps; + bool fastradio_padding = false; int min_version = 0; int max_version = 0; int mtu = 0; @@ -70,8 +71,6 @@ struct TestConfig { bool fail_ddos_callback = false; bool fail_second_ddos_callback = false; std::string cipher; - std::string cipher_tls10; - std::string cipher_tls11; bool handshake_never_done = false; int export_keying_material = 0; std::string export_label; @@ -80,23 +79,6 @@ struct TestConfig { 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; - bool renew_ticket = false; - bool enable_client_custom_extension = false; - bool enable_server_custom_extension = false; - bool custom_extension_skip = false; - bool custom_extension_fail_add = false; - std::string ocsp_response; - bool check_close_notify = false; - bool shim_shuts_down = false; - bool microsoft_big_sslv3_buffer = false; - bool verify_fail = false; - bool verify_peer = false; - bool expect_verify_result = false; - std::string signed_cert_timestamps; }; bool ParseConfig(int argc, char **argv, TestConfig *out_config); |