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/cmac/cm_pmeth.c | 4 ++--
 src/lib/libcrypto/cmac/cmac.c     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/lib/libcrypto/cmac')

diff --git a/src/lib/libcrypto/cmac/cm_pmeth.c b/src/lib/libcrypto/cmac/cm_pmeth.c
index d47cfb7b73..fa2d53e53d 100644
--- a/src/lib/libcrypto/cmac/cm_pmeth.c
+++ b/src/lib/libcrypto/cmac/cm_pmeth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cm_pmeth.c,v 1.10 2022/11/26 16:08:51 tb Exp $ */
+/* $OpenBSD: cm_pmeth.c,v 1.11 2023/11/29 21:35:57 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2010.
  */
@@ -143,7 +143,7 @@ pkey_cmac_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
 		break;
 
 	case EVP_PKEY_CTRL_CIPHER:
-		if (!CMAC_Init(cmctx, NULL, 0, p2, ctx->engine))
+		if (!CMAC_Init(cmctx, NULL, 0, p2, NULL))
 			return 0;
 		break;
 
diff --git a/src/lib/libcrypto/cmac/cmac.c b/src/lib/libcrypto/cmac/cmac.c
index f5b5f5e320..f653219b8f 100644
--- a/src/lib/libcrypto/cmac/cmac.c
+++ b/src/lib/libcrypto/cmac/cmac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmac.c,v 1.15 2023/11/29 18:11:10 tb Exp $ */
+/* $OpenBSD: cmac.c,v 1.16 2023/11/29 21:35:57 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -178,7 +178,7 @@ CMAC_Init(CMAC_CTX *ctx, const void *key, size_t keylen,
 	int bl;
 
 	/* All zeros means restart */
-	if (key == NULL && cipher == NULL && impl == NULL && keylen == 0) {
+	if (key == NULL && cipher == NULL && keylen == 0) {
 		/* Not initialised */
 		if (ctx->nlast_block == -1)
 			return 0;
@@ -191,7 +191,7 @@ CMAC_Init(CMAC_CTX *ctx, const void *key, size_t keylen,
 
 	/* Initialise context. */
 	if (cipher != NULL) {
-		if (!EVP_EncryptInit_ex(&ctx->cctx, cipher, impl, NULL, NULL))
+		if (!EVP_EncryptInit_ex(&ctx->cctx, cipher, NULL, NULL, NULL))
 			return 0;
 	}
 
-- 
cgit v1.2.3-55-g6feb