diff options
| author | miod <> | 2014-05-26 20:15:29 +0000 | 
|---|---|---|
| committer | miod <> | 2014-05-26 20:15:29 +0000 | 
| commit | 1177905d01a7463e765feac142139825d6d44c73 (patch) | |
| tree | b602404adb9f4f1bdddfe56acf622e944d2b345a /src/lib/libssl/ssl_cert.c | |
| parent | 0442c253bd5389cf7be9c6db5502bc0112b1c5b9 (diff) | |
| download | openbsd-1177905d01a7463e765feac142139825d6d44c73.tar.gz openbsd-1177905d01a7463e765feac142139825d6d44c73.tar.bz2 openbsd-1177905d01a7463e765feac142139825d6d44c73.zip | |
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 '')
| -rw-r--r-- | src/lib/libssl/ssl_cert.c | 7 | 
1 files changed, 1 insertions, 6 deletions
| diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c index f89fa13951..d8b94b1285 100644 --- a/src/lib/libssl/ssl_cert.c +++ b/src/lib/libssl/ssl_cert.c | |||
| @@ -493,12 +493,7 @@ ssl_verify_cert_chain(SSL *s, STACK_OF(X509) *sk) | |||
| 493 | X509_STORE_CTX_set_verify_cb(&ctx, s->verify_callback); | 493 | X509_STORE_CTX_set_verify_cb(&ctx, s->verify_callback); | 
| 494 | 494 | ||
| 495 | if (s->ctx->app_verify_callback != NULL) | 495 | if (s->ctx->app_verify_callback != NULL) | 
| 496 | #if 1 /* new with OpenSSL 0.9.7 */ | 496 | i = s->ctx->app_verify_callback(&ctx, s->ctx->app_verify_arg); | 
| 497 | i = s->ctx->app_verify_callback(&ctx, s->ctx->app_verify_arg); | ||
| 498 | |||
| 499 | #else | ||
| 500 | i=s->ctx->app_verify_callback(&ctx); /* should pass app_verify_arg */ | ||
| 501 | #endif | ||
| 502 | else { | 497 | else { | 
| 503 | #ifndef OPENSSL_NO_X509_VERIFY | 498 | #ifndef OPENSSL_NO_X509_VERIFY | 
| 504 | i = X509_verify_cert(&ctx); | 499 | i = X509_verify_cert(&ctx); | 
