summaryrefslogtreecommitdiff
path: root/lib/libssl/ssl_cert.c
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2014-05-26 20:15:30 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2014-05-26 20:15:30 +0000
commitd7586905b9f211f0a1d6a36b00e365eaf9d9789d (patch)
tree1c4556ce5f83e37b64be05ee6a84e539cefebf62 /lib/libssl/ssl_cert.c
parentf48964184ddaf86fe54c4a0fefad69cac57c183f (diff)
We don't really to keep history in constructs such as:
#if 1 /* new with openssl 0.9.4 */ current code; #else obsolete code; #endif
Diffstat (limited to 'lib/libssl/ssl_cert.c')
-rw-r--r--lib/libssl/ssl_cert.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/libssl/ssl_cert.c b/lib/libssl/ssl_cert.c
index f89fa13951a..d8b94b1285c 100644
--- a/lib/libssl/ssl_cert.c
+++ b/lib/libssl/ssl_cert.c
@@ -493,12 +493,7 @@ ssl_verify_cert_chain(SSL *s, STACK_OF(X509) *sk)
X509_STORE_CTX_set_verify_cb(&ctx, s->verify_callback);
if (s->ctx->app_verify_callback != NULL)
-#if 1 /* new with OpenSSL 0.9.7 */
- i = s->ctx->app_verify_callback(&ctx, s->ctx->app_verify_arg);
-
-#else
- i=s->ctx->app_verify_callback(&ctx); /* should pass app_verify_arg */
-#endif
+ i = s->ctx->app_verify_callback(&ctx, s->ctx->app_verify_arg);
else {
#ifndef OPENSSL_NO_X509_VERIFY
i = X509_verify_cert(&ctx);