From f38881420fba9a207cd725b6a35181faeecf26b9 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Mon, 23 Jan 2017 05:13:02 +0000 Subject: Move most of the fields in SSL_CTX to internal - the ones that remain are known to be in use. ok beck@ --- src/lib/libssl/s3_clnt.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/lib/libssl/s3_clnt.c') diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c index c606091e10..8c1a87f38e 100644 --- a/src/lib/libssl/s3_clnt.c +++ b/src/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); } -- cgit v1.2.3-55-g6feb