diff options
| author |   jsing <jsing@openbsd.org> | 2017-01-23 05:13:02 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2017-01-23 05:13:02 +0000 |
| commit | 1d51f822e326152afaa63f92515d0e41ed6a6dd3 (patch) | |
| tree | 326e71c3996fe3d796d0214a7cab53d8c7bf6a70 /lib/libssl/s3_clnt.c | |
| parent | pledge a tiny bit later. This results in the specified tty being (diff) | |
| download | wireguard-openbsd-1d51f822e326152afaa63f92515d0e41ed6a6dd3.tar.xz wireguard-openbsd-1d51f822e326152afaa63f92515d0e41ed6a6dd3.zip | |
Move most of the fields in SSL_CTX to internal - the ones that remain are
known to be in use.
ok beck@
Diffstat (limited to 'lib/libssl/s3_clnt.c')
| -rw-r--r-- | lib/libssl/s3_clnt.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/libssl/s3_clnt.c b/lib/libssl/s3_clnt.c index c606091e109..8c1a87f38e3 100644 --- a/lib/libssl/s3_clnt.c +++ b/lib/libssl/s3_clnt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_clnt.c,v 1.166 2017/01/23 04:55:26 beck Exp $ */ +/* $OpenBSD: s3_clnt.c,v 1.167 2017/01/23 05:13:02 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1484,8 +1484,8 @@ ssl3_get_server_key_exchange(SSL *s) q = md_buf; for (num = 2; num > 0; num--) { if (!EVP_DigestInit_ex(&md_ctx, - (num == 2) ? s->ctx->md5 : s->ctx->sha1, - NULL)) { + (num == 2) ? s->ctx->internal->md5 : + s->ctx->internal->sha1, NULL)) { al = SSL_AD_INTERNAL_ERROR; goto f_err; } @@ -2755,10 +2755,10 @@ ssl_do_client_cert_cb(SSL *s, X509 **px509, EVP_PKEY **ppkey) int i = 0; #ifndef OPENSSL_NO_ENGINE - if (s->ctx->client_cert_engine) { - i = ENGINE_load_ssl_client_cert(s->ctx->client_cert_engine, s, - SSL_get_client_CA_list(s), - px509, ppkey, NULL, NULL, NULL); + if (s->ctx->internal->client_cert_engine) { + i = ENGINE_load_ssl_client_cert( + s->ctx->internal->client_cert_engine, s, + SSL_get_client_CA_list(s), px509, ppkey, NULL, NULL, NULL); if (i != 0) return (i); } |