diff options
| author | David Benjamin <davidben@chromium.org> | 2014-08-20 19:09:03 +0400 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2014-08-20 23:04:32 +0400 |
| commit | 422d3a40158385942acc20e24a736798cf93745e (patch) | |
| tree | 5f5342839ed9b5caee89ac24771ddbd5e276cbc8 /ssl/ssl_lib.c | |
| parent | fd00303a54554d20d2ce38bb40ae13b8aace6c41 (diff) | |
Remove some unused state and code.
Change-Id: I1f917d1fe70ef5046eeea8fed27cc402bcd674b9
Reviewed-on: https://boringssl-review.googlesource.com/1568
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'ssl/ssl_lib.c')
| -rw-r--r-- | ssl/ssl_lib.c | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 16b5b3d4..43ce97bb 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -187,7 +187,6 @@ int SSL_clear(SSL *s) s->session=NULL; } - s->error=0; s->hit=0; s->shutdown=0; @@ -2011,26 +2010,7 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth) ret->psk_identity_hint=NULL; ret->psk_client_callback=NULL; ret->psk_server_callback=NULL; -#ifndef OPENSSL_NO_ENGINE - ret->client_cert_engine = NULL; -#ifdef OPENSSL_SSL_CLIENT_ENGINE_AUTO -#define eng_strx(x) #x -#define eng_str(x) eng_strx(x) - /* Use specific client engine automatically... ignore errors */ - { - ENGINE *eng; - eng = ENGINE_by_id(eng_str(OPENSSL_SSL_CLIENT_ENGINE_AUTO)); - if (!eng) - { - ERR_clear_error(); - ENGINE_load_builtin_engines(); - eng = ENGINE_by_id(eng_str(OPENSSL_SSL_CLIENT_ENGINE_AUTO)); - } - if (!eng || !SSL_CTX_set_client_cert_engine(ret, eng)) - ERR_clear_error(); - } -#endif -#endif + /* Default is to connect to non-RI servers. When RI is more widely * deployed might change this. */ @@ -2105,14 +2085,6 @@ void SSL_CTX_free(SSL_CTX *a) if (a->psk_identity_hint) OPENSSL_free(a->psk_identity_hint); - /* TODO(fork): remove. */ -#if 0 -#ifndef OPENSSL_NO_ENGINE - if (a->client_cert_engine) - ENGINE_finish(a->client_cert_engine); -#endif -#endif - # ifndef OPENSSL_NO_EC if (a->tlsext_ecpointformatlist) OPENSSL_free(a->tlsext_ecpointformatlist); |