From d58c480554b7e690b2dab126d2f8f622324e3a42 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Sat, 31 Aug 2024 09:59:12 +0000
Subject: Retire X509V3_set_conf_lhash()

Thankfully sthen removed the out-of-support PHP versions 7.4 and 8.0,
which were the last users of this API, which in turn permitted much of
this conf rampage. Now the stub can join its guts in the attic.

ok beck jsing
---
 src/lib/libcrypto/Symbols.list            |  1 -
 src/lib/libcrypto/hidden/openssl/x509v3.h |  3 +--
 src/lib/libcrypto/x509/x509_conf.c        | 12 +-----------
 src/lib/libcrypto/x509/x509v3.h           |  3 +--
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list
index c5187d65ee..d18a13410d 100644
--- a/src/lib/libcrypto/Symbols.list
+++ b/src/lib/libcrypto/Symbols.list
@@ -2384,7 +2384,6 @@ X509V3_get_value_bool
 X509V3_get_value_int
 X509V3_parse_list
 X509V3_section_free
-X509V3_set_conf_lhash
 X509V3_set_ctx
 X509V3_set_nconf
 X509V3_string_free
diff --git a/src/lib/libcrypto/hidden/openssl/x509v3.h b/src/lib/libcrypto/hidden/openssl/x509v3.h
index 5912726791..6cdd932209 100644
--- a/src/lib/libcrypto/hidden/openssl/x509v3.h
+++ b/src/lib/libcrypto/hidden/openssl/x509v3.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509v3.h,v 1.13 2024/08/31 09:56:50 tb Exp $ */
+/* $OpenBSD: x509v3.h,v 1.14 2024/08/31 09:59:12 tb Exp $ */
 /*
  * Copyright (c) 2022 Bob Beck <beck@openbsd.org>
  *
@@ -143,7 +143,6 @@ LCRYPTO_USED(X509V3_add_value_bool_nf);
 LCRYPTO_USED(X509V3_get_value_bool);
 LCRYPTO_USED(X509V3_get_value_int);
 LCRYPTO_USED(X509V3_set_nconf);
-LCRYPTO_UNUSED(X509V3_set_conf_lhash);
 LCRYPTO_UNUSED(X509V3_get_string);
 LCRYPTO_USED(X509V3_get_section);
 LCRYPTO_UNUSED(X509V3_string_free);
diff --git a/src/lib/libcrypto/x509/x509_conf.c b/src/lib/libcrypto/x509/x509_conf.c
index dee9bf65e0..ab78649453 100644
--- a/src/lib/libcrypto/x509/x509_conf.c
+++ b/src/lib/libcrypto/x509/x509_conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_conf.c,v 1.24 2024/08/31 09:56:50 tb Exp $ */
+/* $OpenBSD: x509_conf.c,v 1.25 2024/08/31 09:59:12 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -479,13 +479,3 @@ X509V3_EXT_conf_nid(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx, int nid,
 	return X509V3_EXT_nconf_nid(&ctmp, ctx, nid, value);
 }
 LCRYPTO_ALIAS(X509V3_EXT_conf_nid);
-
-/*
- * XXX - remove everything below in the next bump.
- */
-
-void
-X509V3_set_conf_lhash(X509V3_CTX *ctx, LHASH_OF(CONF_VALUE) *lhash)
-{
-}
-LCRYPTO_ALIAS(X509V3_set_conf_lhash);
diff --git a/src/lib/libcrypto/x509/x509v3.h b/src/lib/libcrypto/x509/x509v3.h
index 6470f059ee..6a18c1f153 100644
--- a/src/lib/libcrypto/x509/x509v3.h
+++ b/src/lib/libcrypto/x509/x509v3.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509v3.h,v 1.31 2024/08/31 09:56:50 tb Exp $ */
+/* $OpenBSD: x509v3.h,v 1.32 2024/08/31 09:59:12 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -653,7 +653,6 @@ int X509V3_add_value_bool_nf(const char *name, int asn1_bool,
 int X509V3_get_value_bool(const CONF_VALUE *value, int *asn1_bool);
 int X509V3_get_value_int(const CONF_VALUE *value, ASN1_INTEGER **aint);
 void X509V3_set_nconf(X509V3_CTX *ctx, CONF *conf);
-void X509V3_set_conf_lhash(X509V3_CTX *ctx, LHASH_OF(CONF_VALUE) *lhash);
 #endif
 
 char *X509V3_get_string(X509V3_CTX *ctx, const char *name,
-- 
cgit v1.2.3-55-g6feb