From fc4faac9b396d551d0f7729a4dffa6ee31ac2d3e Mon Sep 17 00:00:00 2001 From: tb <> Date: Wed, 29 Nov 2023 21:35:57 +0000 Subject: Ignore ENGINE at the API boundary This removes the remaining ENGINE members from various internal structs and functions. Any ENGINE passed into a public API is now completely ignored functions returning an ENGINE always return NULL. ok jsing --- src/lib/libcrypto/dsa/dsa_lib.c | 4 ++-- src/lib/libcrypto/dsa/dsa_local.h | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'src/lib/libcrypto/dsa') diff --git a/src/lib/libcrypto/dsa/dsa_lib.c b/src/lib/libcrypto/dsa/dsa_lib.c index 5c01c20255..65eb65288d 100644 --- a/src/lib/libcrypto/dsa/dsa_lib.c +++ b/src/lib/libcrypto/dsa/dsa_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsa_lib.c,v 1.45 2023/11/19 15:46:09 tb Exp $ */ +/* $OpenBSD: dsa_lib.c,v 1.46 2023/11/29 21:35:57 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -397,7 +397,7 @@ LCRYPTO_ALIAS(DSA_set_flags); ENGINE * DSA_get0_engine(DSA *d) { - return d->engine; + return NULL; } LCRYPTO_ALIAS(DSA_get0_engine); diff --git a/src/lib/libcrypto/dsa/dsa_local.h b/src/lib/libcrypto/dsa/dsa_local.h index a413db9747..3e688b8ce6 100644 --- a/src/lib/libcrypto/dsa/dsa_local.h +++ b/src/lib/libcrypto/dsa/dsa_local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dsa_local.h,v 1.2 2023/03/04 20:54:52 tb Exp $ */ +/* $OpenBSD: dsa_local.h,v 1.3 2023/11/29 21:35:57 tb Exp $ */ /* ==================================================================== * Copyright (c) 2007 The OpenSSL Project. All rights reserved. * @@ -106,8 +106,6 @@ struct dsa_st { int references; CRYPTO_EX_DATA ex_data; const DSA_METHOD *meth; - /* functional reference if 'meth' is ENGINE-provided */ - ENGINE *engine; } /* DSA */; int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits, -- cgit v1.2.3-55-g6feb