From e3f6bea371b15b4735ec49cd9e8b42b426576507 Mon Sep 17 00:00:00 2001
From: Theo Buehler <tb@cvs.openbsd.org>
Date: Sat, 13 Jan 2024 11:48:17 +0000
Subject: Neuter EVP_add_{cipher,digest}()

This makes them noops. They are used in the wild for adding ciphers
that are always added by the library init code. This is a historic
leftover.

This removes the last (and only ever) calls to check_defer().

ok jsing
---
 lib/libcrypto/evp/names.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'lib/libcrypto')

diff --git a/lib/libcrypto/evp/names.c b/lib/libcrypto/evp/names.c
index f43534194a4..6ef061a2cb6 100644
--- a/lib/libcrypto/evp/names.c
+++ b/lib/libcrypto/evp/names.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: names.c,v 1.26 2024/01/13 11:45:03 tb Exp $ */
+/* $OpenBSD: names.c,v 1.27 2024/01/13 11:48:16 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -70,22 +70,12 @@ void check_defer(int nid);
 int
 EVP_add_cipher(const EVP_CIPHER *c)
 {
-	if (c == NULL)
-		return 0;
-
-	check_defer(c->nid);
-
 	return 1;
 }
 
 int
 EVP_add_digest(const EVP_MD *md)
 {
-	check_defer(md->type);
-
-	if (md->pkey_type && md->type != md->pkey_type)
-		check_defer(md->pkey_type);
-
 	return 1;
 }
 
-- 
cgit v1.2.3