summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/libcrypto/Symbols.list1
-rw-r--r--src/lib/libcrypto/conf/conf.h3
-rw-r--r--src/lib/libcrypto/conf/conf_def.c3
-rw-r--r--src/lib/libcrypto/conf/conf_local.h4
-rw-r--r--src/lib/libcrypto/hidden/openssl/conf.h3
5 files changed, 6 insertions, 8 deletions
diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list
index 396281c16c..290850eebc 100644
--- a/src/lib/libcrypto/Symbols.list
+++ b/src/lib/libcrypto/Symbols.list
@@ -1486,7 +1486,6 @@ NAME_CONSTRAINTS_check
1486NAME_CONSTRAINTS_free 1486NAME_CONSTRAINTS_free
1487NAME_CONSTRAINTS_it 1487NAME_CONSTRAINTS_it
1488NAME_CONSTRAINTS_new 1488NAME_CONSTRAINTS_new
1489NCONF_default
1490NCONF_free 1489NCONF_free
1491NCONF_get_number_e 1490NCONF_get_number_e
1492NCONF_get_section 1491NCONF_get_section
diff --git a/src/lib/libcrypto/conf/conf.h b/src/lib/libcrypto/conf/conf.h
index ebffab1401..28b5f9d583 100644
--- a/src/lib/libcrypto/conf/conf.h
+++ b/src/lib/libcrypto/conf/conf.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: conf.h,v 1.23 2024/08/31 09:41:53 tb Exp $ */ 1/* $OpenBSD: conf.h,v 1.24 2024/08/31 09:44:00 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -131,7 +131,6 @@ struct conf_st {
131}; 131};
132 132
133CONF *NCONF_new(const CONF_METHOD *meth); 133CONF *NCONF_new(const CONF_METHOD *meth);
134const CONF_METHOD *NCONF_default(void);
135void NCONF_free(CONF *conf); 134void NCONF_free(CONF *conf);
136 135
137int NCONF_load(CONF *conf, const char *file, long *eline); 136int NCONF_load(CONF *conf, const char *file, long *eline);
diff --git a/src/lib/libcrypto/conf/conf_def.c b/src/lib/libcrypto/conf/conf_def.c
index 26e273c841..20bea03783 100644
--- a/src/lib/libcrypto/conf/conf_def.c
+++ b/src/lib/libcrypto/conf/conf_def.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: conf_def.c,v 1.42 2024/08/31 09:39:31 tb Exp $ */ 1/* $OpenBSD: conf_def.c,v 1.43 2024/08/31 09:44:00 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -652,4 +652,3 @@ NCONF_default(void)
652{ 652{
653 return &default_method; 653 return &default_method;
654} 654}
655LCRYPTO_ALIAS(NCONF_default);
diff --git a/src/lib/libcrypto/conf/conf_local.h b/src/lib/libcrypto/conf/conf_local.h
index f2c755bbf6..035f957866 100644
--- a/src/lib/libcrypto/conf/conf_local.h
+++ b/src/lib/libcrypto/conf/conf_local.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: conf_local.h,v 1.4 2024/08/31 09:39:31 tb Exp $ */ 1/* $OpenBSD: conf_local.h,v 1.5 2024/08/31 09:44:00 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -61,6 +61,8 @@
61 61
62__BEGIN_HIDDEN_DECLS 62__BEGIN_HIDDEN_DECLS
63 63
64const CONF_METHOD *NCONF_default(void);
65
64struct conf_method_st { 66struct conf_method_st {
65 const char *name; 67 const char *name;
66 CONF *(*create)(const CONF_METHOD *meth); 68 CONF *(*create)(const CONF_METHOD *meth);
diff --git a/src/lib/libcrypto/hidden/openssl/conf.h b/src/lib/libcrypto/hidden/openssl/conf.h
index 7374501c9c..346fba1c4b 100644
--- a/src/lib/libcrypto/hidden/openssl/conf.h
+++ b/src/lib/libcrypto/hidden/openssl/conf.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: conf.h,v 1.5 2024/08/31 09:41:53 tb Exp $ */ 1/* $OpenBSD: conf.h,v 1.6 2024/08/31 09:44:00 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2024 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2024 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -37,7 +37,6 @@ LCRYPTO_USED(CONF_free);
37LCRYPTO_USED(OPENSSL_config); 37LCRYPTO_USED(OPENSSL_config);
38LCRYPTO_USED(OPENSSL_no_config); 38LCRYPTO_USED(OPENSSL_no_config);
39LCRYPTO_USED(NCONF_new); 39LCRYPTO_USED(NCONF_new);
40LCRYPTO_USED(NCONF_default);
41LCRYPTO_USED(NCONF_free); 40LCRYPTO_USED(NCONF_free);
42LCRYPTO_USED(NCONF_load); 41LCRYPTO_USED(NCONF_load);
43LCRYPTO_USED(NCONF_load_bio); 42LCRYPTO_USED(NCONF_load_bio);