Commit aedf33ae authored by Matt Caswell's avatar Matt Caswell
Browse files

Remove some flags that are unused in the shim 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 06e452fb

test/ossl_shim/ossl_shim.cc

+2 −3
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ static int CertCallback(SSL *ssl, void *arg) { 
  }



  // The certificate will be installed via other means.

  if (!config->async || config->use_early_callback ||

  if (!config->async ||

      config->use_old_client_cert_callback) {

    return 1;

  }
@@ -890,8 +890,7 @@ static bool DoExchange(bssl::UniquePtr<SSL_SESSION> *out_session, 
    return false;

  }

  // Install the certificate synchronously if nothing else will handle it.

  if (!config->use_early_callback &&

      !config->use_old_client_cert_callback &&

  if (!config->use_old_client_cert_callback &&

      !config->async &&

      !InstallCertificate(ssl.get())) {

    return false;

test/ossl_shim/test_config.cc

+0 −13
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ const Flag<bool> kBoolFlags[] = { 
  { "-async", &TestConfig::async },

  { "-write-different-record-sizes",

    &TestConfig::write_different_record_sizes },

  { "-cbc-record-splitting", &TestConfig::cbc_record_splitting },

  { "-partial-write", &TestConfig::partial_write },

  { "-no-tls13", &TestConfig::no_tls13 },

  { "-no-tls12", &TestConfig::no_tls12 },
@@ -65,10 +64,6 @@ const Flag<bool> kBoolFlags[] = { 
  { "-expect-extended-master-secret",

    &TestConfig::expect_extended_master_secret },

  { "-implicit-handshake", &TestConfig::implicit_handshake },

  { "-use-early-callback", &TestConfig::use_early_callback },

  { "-fail-early-callback", &TestConfig::fail_early_callback },

  { "-fail-ddos-callback", &TestConfig::fail_ddos_callback },

  { "-fail-second-ddos-callback", &TestConfig::fail_second_ddos_callback },

  { "-handshake-never-done", &TestConfig::handshake_never_done },

  { "-use-export-context", &TestConfig::use_export_context },

  { "-expect-ticket-renewal", &TestConfig::expect_ticket_renewal },
@@ -94,7 +89,6 @@ const Flag<bool> kBoolFlags[] = { 
    &TestConfig::use_old_client_cert_callback },

  { "-use-null-client-ca-list", &TestConfig::use_null_client_ca_list },

  { "-peek-then-read", &TestConfig::peek_then_read },

  { "-enable-grease", &TestConfig::enable_grease },

};



const Flag<std::string> kStringFlags[] = {
@@ -119,9 +113,6 @@ const Flag<std::string> kStringFlags[] = { 


const Flag<std::string> kBase64Flags[] = {

  { "-expect-certificate-types", &TestConfig::expected_certificate_types },

  { "-expect-ocsp-response", &TestConfig::expected_ocsp_response },

  { "-expect-signed-cert-timestamps",

    &TestConfig::expected_signed_cert_timestamps },

};



const Flag<int> kIntFlags[] = {
@@ -132,10 +123,6 @@ const Flag<int> kIntFlags[] = { 
  { "-mtu", &TestConfig::mtu },

  { "-export-keying-material", &TestConfig::export_keying_material },

  { "-expect-total-renegotiations", &TestConfig::expect_total_renegotiations },

  { "-expect-peer-signature-algorithm",

    &TestConfig::expect_peer_signature_algorithm },

  { "-expect-curve-id", &TestConfig::expect_curve_id },

  { "-expect-dhe-group-size", &TestConfig::expect_dhe_group_size },

  { "-max-cert-list", &TestConfig::max_cert_list },

};

test/ossl_shim/test_config.h

+0 −11
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ struct TestConfig { 
  std::string select_next_proto;

  bool async = false;

  bool write_different_record_sizes = false;

  bool cbc_record_splitting = false;

  bool partial_write = false;

  bool no_tls13 = false;

  bool no_tls12 = false;
@@ -54,16 +53,10 @@ struct TestConfig { 
  std::string psk;

  std::string psk_identity;

  std::string srtp_profiles;

  std::string expected_ocsp_response;

  std::string expected_signed_cert_timestamps;

  int min_version = 0;

  int max_version = 0;

  int mtu = 0;

  bool implicit_handshake = false;

  bool use_early_callback = false;

  bool fail_early_callback = false;

  bool fail_ddos_callback = false;

  bool fail_second_ddos_callback = false;

  std::string cipher;

  bool handshake_never_done = false;

  int export_keying_material = 0;
@@ -85,16 +78,12 @@ struct TestConfig { 
  bool expect_verify_result = false;

  int expect_total_renegotiations = 0;

  bool renegotiate_freely = false;

  int expect_peer_signature_algorithm = 0;

  bool p384_only = false;

  bool enable_all_curves = false;

  bool use_sparse_dh_prime = false;

  int expect_curve_id = 0;

  int expect_dhe_group_size = 0;

  bool use_old_client_cert_callback = false;

  bool use_null_client_ca_list = false;

  bool peek_then_read = false;

  bool enable_grease = false;

  int max_cert_list = 0;

};