From 33d15fbeced7ed9bc03a4d5215a821dde3434bae Mon Sep 17 00:00:00 2001 From: tb <> Date: Sun, 19 Nov 2023 15:51:49 +0000 Subject: Unifdef OPENSSL_NO_ENGINE in libssl As usual, a few manual fixes to avoid duplicate lines. ok jsing --- src/lib/libssl/ssl_lib.c | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) (limited to 'src/lib/libssl/ssl_lib.c') diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index 0ac393f73c..9e65095c6c 100644 --- a/src/lib/libssl/ssl_lib.c +++ b/src/lib/libssl/ssl_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_lib.c,v 1.314 2023/09/19 01:22:31 tb Exp $ */ +/* $OpenBSD: ssl_lib.c,v 1.315 2023/11/19 15:51:49 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -154,10 +154,6 @@ #include #include -#ifndef OPENSSL_NO_ENGINE -#include -#endif - #include "bytestring.h" #include "dtls_local.h" #include "ssl_local.h" @@ -2164,26 +2160,6 @@ SSL_CTX_new(const SSL_METHOD *meth) ret->tlsext_status_cb = 0; ret->tlsext_status_arg = NULL; -#ifndef OPENSSL_NO_ENGINE - ret->client_cert_engine = NULL; -#ifdef OPENSSL_SSL_CLIENT_ENGINE_AUTO -#define eng_strx(x) #x -#define eng_str(x) eng_strx(x) - /* Use specific client engine automatically... ignore errors */ - { - ENGINE *eng; - eng = ENGINE_by_id(eng_str(OPENSSL_SSL_CLIENT_ENGINE_AUTO)); - if (!eng) { - ERR_clear_error(); - ENGINE_load_builtin_engines(); - eng = ENGINE_by_id(eng_str( - OPENSSL_SSL_CLIENT_ENGINE_AUTO)); - } - if (!eng || !SSL_CTX_set_client_cert_engine(ret, eng)) - ERR_clear_error(); - } -#endif -#endif /* * Default is to connect to non-RI servers. When RI is more widely * deployed might change this. @@ -2241,10 +2217,6 @@ SSL_CTX_free(SSL_CTX *ctx) sk_SRTP_PROTECTION_PROFILE_free(ctx->srtp_profiles); #endif -#ifndef OPENSSL_NO_ENGINE - ENGINE_finish(ctx->client_cert_engine); -#endif - free(ctx->tlsext_ecpointformatlist); free(ctx->tlsext_supportedgroups); -- cgit v1.2.3-55-g6feb