From 2a0e220756a798722c4877eec06d9125bf690f66 Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Wed, 29 Nov 2023 21:35:58 +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 --- lib/libcrypto/evp/evp_local.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'lib/libcrypto/evp/evp_local.h') diff --git a/lib/libcrypto/evp/evp_local.h b/lib/libcrypto/evp/evp_local.h index 015fbb50a94..5df1733cbc9 100644 --- a/lib/libcrypto/evp/evp_local.h +++ b/lib/libcrypto/evp/evp_local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_local.h,v 1.5 2023/09/28 11:29:10 tb Exp $ */ +/* $OpenBSD: evp_local.h,v 1.6 2023/11/29 21:35:57 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2000. */ @@ -97,7 +97,6 @@ struct evp_pkey_st { int save_type; int references; const EVP_PKEY_ASN1_METHOD *ameth; - ENGINE *engine; union { void *ptr; #ifndef OPENSSL_NO_RSA @@ -140,7 +139,6 @@ struct evp_md_st { struct evp_md_ctx_st { const EVP_MD *digest; - ENGINE *engine; /* functional reference if 'digest' is ENGINE-provided */ unsigned long flags; void *md_data; /* Public key context for sign/verify */ @@ -169,7 +167,6 @@ struct evp_cipher_st { struct evp_cipher_ctx_st { const EVP_CIPHER *cipher; - ENGINE *engine; /* functional reference if 'cipher' is ENGINE-provided */ int encrypt; /* encrypt or decrypt */ int buf_len; /* number we have left */ @@ -205,8 +202,6 @@ struct evp_Encode_Ctx_st { struct evp_pkey_ctx_st { /* Method associated with this operation */ const EVP_PKEY_METHOD *pmeth; - /* Engine that implements this method or NULL if builtin */ - ENGINE *engine; /* Key: may be NULL */ EVP_PKEY *pkey; /* Peer key for key agreement, may be NULL */ -- cgit v1.2.3