From 69bbc5fea4f411f0c0033ecb0fc5126c895ea82a 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/ec/ec_key.c | 4 ++-- src/lib/libcrypto/ec/ec_local.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src/lib/libcrypto/ec') diff --git a/src/lib/libcrypto/ec/ec_key.c b/src/lib/libcrypto/ec/ec_key.c index 2716db6dd0..dd976898ad 100644 --- a/src/lib/libcrypto/ec/ec_key.c +++ b/src/lib/libcrypto/ec/ec_key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_key.c,v 1.38 2023/11/19 15:46:09 tb Exp $ */ +/* $OpenBSD: ec_key.c,v 1.39 2023/11/29 21:35:57 tb Exp $ */ /* * Written by Nils Larsch for the OpenSSL project. */ @@ -191,7 +191,7 @@ EC_KEY_dup(const EC_KEY *ec_key) { EC_KEY *ret; - if ((ret = EC_KEY_new_method(ec_key->engine)) == NULL) + if ((ret = EC_KEY_new_method(NULL)) == NULL) return NULL; if (EC_KEY_copy(ret, ec_key) == NULL) { EC_KEY_free(ret); diff --git a/src/lib/libcrypto/ec/ec_local.h b/src/lib/libcrypto/ec/ec_local.h index 3252eeb1c8..6ea78eaac4 100644 --- a/src/lib/libcrypto/ec/ec_local.h +++ b/src/lib/libcrypto/ec/ec_local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_local.h,v 1.26 2023/07/28 15:50:33 tb Exp $ */ +/* $OpenBSD: ec_local.h,v 1.27 2023/11/29 21:35:57 tb Exp $ */ /* * Originally written by Bodo Moeller for the OpenSSL project. */ @@ -223,7 +223,6 @@ struct ec_group_st { struct ec_key_st { const EC_KEY_METHOD *meth; - ENGINE *engine; int version; -- cgit v1.2.3-55-g6feb