diff options
| author | jsing <> | 2017-01-23 04:15:28 +0000 |
|---|---|---|
| committer | jsing <> | 2017-01-23 04:15:28 +0000 |
| commit | 779cc82ab96e48a0162ed5caa96bbc04dd3a5c72 (patch) | |
| tree | d2bcfe381c02ccf528bdd3f18dcabbc4bec0aa3c /src/lib/libssl/ssl_cert.c | |
| parent | 8c3e82ca039c1de2d07ceb9033058fc6bb5791a2 (diff) | |
| download | openbsd-779cc82ab96e48a0162ed5caa96bbc04dd3a5c72.tar.gz openbsd-779cc82ab96e48a0162ed5caa96bbc04dd3a5c72.tar.bz2 openbsd-779cc82ab96e48a0162ed5caa96bbc04dd3a5c72.zip | |
Move callback function pointers and argument pointers from SSL_CTX to
internal.
ok beck@
Diffstat (limited to 'src/lib/libssl/ssl_cert.c')
| -rw-r--r-- | src/lib/libssl/ssl_cert.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c index d520a6d249..603deb4218 100644 --- a/src/lib/libssl/ssl_cert.c +++ b/src/lib/libssl/ssl_cert.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_cert.c,v 1.54 2017/01/22 09:02:07 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_cert.c,v 1.55 2017/01/23 04:15:28 jsing Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -443,8 +443,9 @@ ssl_verify_cert_chain(SSL *s, STACK_OF(X509) *sk) | |||
| 443 | if (s->verify_callback) | 443 | if (s->verify_callback) |
| 444 | X509_STORE_CTX_set_verify_cb(&ctx, s->verify_callback); | 444 | X509_STORE_CTX_set_verify_cb(&ctx, s->verify_callback); |
| 445 | 445 | ||
| 446 | if (s->ctx->app_verify_callback != NULL) | 446 | if (s->ctx->internal->app_verify_callback != NULL) |
| 447 | ret = s->ctx->app_verify_callback(&ctx, s->ctx->app_verify_arg); | 447 | ret = s->ctx->internal->app_verify_callback(&ctx, |
| 448 | s->ctx->internal->app_verify_arg); | ||
| 448 | else | 449 | else |
| 449 | ret = X509_verify_cert(&ctx); | 450 | ret = X509_verify_cert(&ctx); |
| 450 | 451 | ||
