diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-01-27 10:06:22 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-01-27 10:06:22 -0500 |
| commit | a00ae6c46e0d7907a7c9f9e85334e968aa5fd338 (patch) | |
| tree | 79a0e748842c1a3ed15b3b4a1ab08ce29bab5280 /ssl/ssl_cert.c | |
| parent | 109f1031a8d03a7c0a7c53c82314505ec5b7b207 (diff) | |
OPENSSL_NO_xxx cleanup: many removals
The following compile options (#ifdef's) are removed:
OPENSSL_NO_BIO OPENSSL_NO_BUFFER OPENSSL_NO_CHAIN_VERIFY
OPENSSL_NO_EVP OPENSSL_NO_FIPS_ERR OPENSSL_NO_HASH_COMP
OPENSSL_NO_LHASH OPENSSL_NO_OBJECT OPENSSL_NO_SPEED OPENSSL_NO_STACK
OPENSSL_NO_X509 OPENSSL_NO_X509_VERIFY
This diff is big because of updating the indents on preprocessor lines.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl/ssl_cert.c')
| -rw-r--r-- | ssl/ssl_cert.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index bfaf69aff7..f2de54bdf5 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c @@ -740,7 +740,6 @@ int ssl_verify_cert_chain(SSL *s, STACK_OF(X509) *sk) i = s->ctx->app_verify_callback(&ctx); /* should pass app_verify_arg */ #endif else { -#ifndef OPENSSL_NO_X509_VERIFY i = X509_verify_cert(&ctx); # if 0 /* Dummy error calls so mkerr generates them */ @@ -750,11 +749,6 @@ int ssl_verify_cert_chain(SSL *s, STACK_OF(X509) *sk) # endif if (i > 0) i = ssl_security_cert_chain(s, ctx.chain, NULL, 1); -#else - i = 0; - ctx.error = X509_V_ERR_APPLICATION_VERIFICATION; - SSLerr(SSL_F_SSL_VERIFY_CERT_CHAIN, SSL_R_NO_VERIFY_CALLBACK); -#endif } s->verify_result = ctx.error; |