diff options
| author | Matt Caswell <matt@openssl.org> | 2016-10-19 11:22:07 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-11-04 10:38:54 +0000 |
| commit | aedf33aed53a414a0935d578da1817d8cbaa11ad (patch) | |
| tree | 48071aff07c834ace4d2aac0fe673a8ef32559cb /test/ossl_shim/ossl_shim.cc | |
| parent | 06e452fbc166339aa28280f4f6f2ba3e958cfbd6 (diff) | |
| download | openssl-aedf33aed53a414a0935d578da1817d8cbaa11ad.tar.gz | |
Remove some flags that are unused in the shim
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'test/ossl_shim/ossl_shim.cc')
| -rw-r--r-- | test/ossl_shim/ossl_shim.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/ossl_shim/ossl_shim.cc b/test/ossl_shim/ossl_shim.cc index 99733f6065..fc2180ef5e 100644 --- a/test/ossl_shim/ossl_shim.cc +++ b/test/ossl_shim/ossl_shim.cc @@ -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; |