From 3c509700cc3e08f35c0600e61e87525876ccc3f9 Mon Sep 17 00:00:00 2001 From: tb <> Date: Wed, 28 Aug 2024 08:59:03 +0000 Subject: Get rid of last use of db_meth Nothing touches db_meth in ports. Thus only way a db_meth can be set is now as a side effect X509V3_set_conf() in which case the db is an NCONF database and the db_meth will be a thin wrapper of NCONF_get_section(). Make that explicit in the implementation, remove the guts of the unused X509V3_get_string() and X509V3_string_free(), turn X509V3_section_free() into a noop and replace several checks for ctx->db, ctx->db->meth, ... with a simple ctx->db != NULL check. ok beck jsing --- src/lib/libcrypto/hidden/openssl/x509v3.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/libcrypto/hidden') diff --git a/src/lib/libcrypto/hidden/openssl/x509v3.h b/src/lib/libcrypto/hidden/openssl/x509v3.h index f0db675e48..d0d4e97ec9 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.11 2024/08/28 08:43:55 tb Exp $ */ +/* $OpenBSD: x509v3.h,v 1.12 2024/08/28 08:59:03 tb Exp $ */ /* * Copyright (c) 2022 Bob Beck * @@ -147,9 +147,9 @@ LCRYPTO_USED(X509V3_get_value_bool); LCRYPTO_USED(X509V3_get_value_int); LCRYPTO_USED(X509V3_set_nconf); LCRYPTO_UNUSED(X509V3_set_conf_lhash); -LCRYPTO_USED(X509V3_get_string); +LCRYPTO_UNUSED(X509V3_get_string); LCRYPTO_USED(X509V3_get_section); -LCRYPTO_USED(X509V3_string_free); +LCRYPTO_UNUSED(X509V3_string_free); LCRYPTO_USED(X509V3_section_free); LCRYPTO_USED(X509V3_set_ctx); LCRYPTO_USED(X509V3_add_value); -- cgit v1.2.3-55-g6feb