From c61ca27624079de7edf2fc8c085023c6c6317af9 Mon Sep 17 00:00:00 2001 From: tb Date: Sat, 31 Aug 2024 09:44:00 +0000 Subject: [PATCH] Unexport NCONF_default The only project I'm aware of that ever used this was rust-openssl and they did so for no good reason. So remove this API, the crate's code is already adjusted accordingly. ok beck jsing --- lib/libcrypto/Symbols.list | 1 - lib/libcrypto/conf/conf.h | 3 +-- lib/libcrypto/conf/conf_def.c | 3 +-- lib/libcrypto/conf/conf_local.h | 4 +++- lib/libcrypto/hidden/openssl/conf.h | 3 +-- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/libcrypto/Symbols.list b/lib/libcrypto/Symbols.list index 396281c16c6..290850eebce 100644 --- a/lib/libcrypto/Symbols.list +++ b/lib/libcrypto/Symbols.list @@ -1486,7 +1486,6 @@ NAME_CONSTRAINTS_check NAME_CONSTRAINTS_free NAME_CONSTRAINTS_it NAME_CONSTRAINTS_new -NCONF_default NCONF_free NCONF_get_number_e NCONF_get_section diff --git a/lib/libcrypto/conf/conf.h b/lib/libcrypto/conf/conf.h index ebffab1401a..28b5f9d5836 100644 --- a/lib/libcrypto/conf/conf.h +++ b/lib/libcrypto/conf/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.23 2024/08/31 09:41:53 tb Exp $ */ +/* $OpenBSD: conf.h,v 1.24 2024/08/31 09:44:00 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -131,7 +131,6 @@ struct conf_st { }; CONF *NCONF_new(const CONF_METHOD *meth); -const CONF_METHOD *NCONF_default(void); void NCONF_free(CONF *conf); int NCONF_load(CONF *conf, const char *file, long *eline); diff --git a/lib/libcrypto/conf/conf_def.c b/lib/libcrypto/conf/conf_def.c index 26e273c841d..20bea03783d 100644 --- a/lib/libcrypto/conf/conf_def.c +++ b/lib/libcrypto/conf/conf_def.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf_def.c,v 1.42 2024/08/31 09:39:31 tb Exp $ */ +/* $OpenBSD: conf_def.c,v 1.43 2024/08/31 09:44:00 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -652,4 +652,3 @@ NCONF_default(void) { return &default_method; } -LCRYPTO_ALIAS(NCONF_default); diff --git a/lib/libcrypto/conf/conf_local.h b/lib/libcrypto/conf/conf_local.h index f2c755bbf69..035f9578661 100644 --- a/lib/libcrypto/conf/conf_local.h +++ b/lib/libcrypto/conf/conf_local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf_local.h,v 1.4 2024/08/31 09:39:31 tb Exp $ */ +/* $OpenBSD: conf_local.h,v 1.5 2024/08/31 09:44:00 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -61,6 +61,8 @@ __BEGIN_HIDDEN_DECLS +const CONF_METHOD *NCONF_default(void); + struct conf_method_st { const char *name; CONF *(*create)(const CONF_METHOD *meth); diff --git a/lib/libcrypto/hidden/openssl/conf.h b/lib/libcrypto/hidden/openssl/conf.h index 7374501c9c0..346fba1c4b4 100644 --- a/lib/libcrypto/hidden/openssl/conf.h +++ b/lib/libcrypto/hidden/openssl/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.5 2024/08/31 09:41:53 tb Exp $ */ +/* $OpenBSD: conf.h,v 1.6 2024/08/31 09:44:00 tb Exp $ */ /* * Copyright (c) 2024 Bob Beck * @@ -37,7 +37,6 @@ LCRYPTO_USED(CONF_free); LCRYPTO_USED(OPENSSL_config); LCRYPTO_USED(OPENSSL_no_config); LCRYPTO_USED(NCONF_new); -LCRYPTO_USED(NCONF_default); LCRYPTO_USED(NCONF_free); LCRYPTO_USED(NCONF_load); LCRYPTO_USED(NCONF_load_bio); -- 2.20.1