From c1e6a7d223506c596700ea3d5161a3f66fd40a9b Mon Sep 17 00:00:00 2001
From: tb <>
Date: Sat, 27 Jan 2024 16:26:25 +0000
Subject: Throw PKCS5_PBE_add() into the trash bin at the end of evp_pbe.c

This has been a noop since forever and will be removed in the next bump.
---
 src/lib/libcrypto/evp/evp_pbe.c |  7 ++++++-
 src/lib/libcrypto/evp/p5_crpt.c | 10 +---------
 2 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/lib/libcrypto/evp/evp_pbe.c b/src/lib/libcrypto/evp/evp_pbe.c
index 422fb356ba..7f7784847b 100644
--- a/src/lib/libcrypto/evp/evp_pbe.c
+++ b/src/lib/libcrypto/evp/evp_pbe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: evp_pbe.c,v 1.37 2024/01/27 16:22:29 tb Exp $ */
+/* $OpenBSD: evp_pbe.c,v 1.38 2024/01/27 16:26:25 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -365,3 +365,8 @@ void
 EVP_PBE_cleanup(void)
 {
 }
+
+void
+PKCS5_PBE_add(void)
+{
+}
diff --git a/src/lib/libcrypto/evp/p5_crpt.c b/src/lib/libcrypto/evp/p5_crpt.c
index d26439ad26..15b9935ac1 100644
--- a/src/lib/libcrypto/evp/p5_crpt.c
+++ b/src/lib/libcrypto/evp/p5_crpt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p5_crpt.c,v 1.23 2023/07/07 19:37:54 beck Exp $ */
+/* $OpenBSD: p5_crpt.c,v 1.24 2024/01/27 16:26:25 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -66,14 +66,6 @@
 
 #include "evp_local.h"
 
-/* Doesn't do anything now: Builtin PBE algorithms in static table.
- */
-
-void
-PKCS5_PBE_add(void)
-{
-}
-
 int
 PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
     ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md, int en_de)
-- 
cgit v1.2.3-55-g6feb