summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/libcrypto/conf/conf.h4
-rw-r--r--src/lib/libcrypto/conf/conf_local.h4
-rw-r--r--src/lib/libcrypto/hidden/openssl/conf.h3
3 files changed, 5 insertions, 6 deletions
diff --git a/src/lib/libcrypto/conf/conf.h b/src/lib/libcrypto/conf/conf.h
index 5796ee29ac..b7df24e001 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.25 2024/08/31 09:50:52 tb Exp $ */ 1/* $OpenBSD: conf.h,v 1.26 2024/08/31 09:53:02 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 *
@@ -104,8 +104,6 @@ typedef void conf_finish_func(CONF_IMODULE *md);
104#define CONF_MFLAGS_IGNORE_MISSING_FILE 0x10 104#define CONF_MFLAGS_IGNORE_MISSING_FILE 0x10
105#define CONF_MFLAGS_DEFAULT_SECTION 0x20 105#define CONF_MFLAGS_DEFAULT_SECTION 0x20
106 106
107void CONF_set_nconf(CONF *conf, LHASH_OF(CONF_VALUE) *hash);
108
109void OPENSSL_config(const char *config_name); 107void OPENSSL_config(const char *config_name);
110void OPENSSL_no_config(void); 108void OPENSSL_no_config(void);
111 109
diff --git a/src/lib/libcrypto/conf/conf_local.h b/src/lib/libcrypto/conf/conf_local.h
index 035f957866..2933240c8e 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.5 2024/08/31 09:44:00 tb Exp $ */ 1/* $OpenBSD: conf_local.h,v 1.6 2024/08/31 09:53:02 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 *
@@ -92,6 +92,8 @@ void CONF_module_set_usr_data(CONF_MODULE *pmod, void *usr_data);
92int CONF_parse_list(const char *list, int sep, int nospc, 92int CONF_parse_list(const char *list, int sep, int nospc,
93 int (*list_cb)(const char *elem, int len, void *usr), void *arg); 93 int (*list_cb)(const char *elem, int len, void *usr), void *arg);
94 94
95void CONF_set_nconf(CONF *conf, LHASH_OF(CONF_VALUE) *hash);
96
95CONF_VALUE *_CONF_new_section(CONF *conf, const char *section); 97CONF_VALUE *_CONF_new_section(CONF *conf, const char *section);
96CONF_VALUE *_CONF_get_section(const CONF *conf, const char *section); 98CONF_VALUE *_CONF_get_section(const CONF *conf, const char *section);
97STACK_OF(CONF_VALUE) *_CONF_get_section_values(const CONF *conf, 99STACK_OF(CONF_VALUE) *_CONF_get_section_values(const CONF *conf,
diff --git a/src/lib/libcrypto/hidden/openssl/conf.h b/src/lib/libcrypto/hidden/openssl/conf.h
index adb9b38548..29b49e920d 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.7 2024/08/31 09:50:52 tb Exp $ */ 1/* $OpenBSD: conf.h,v 1.8 2024/08/31 09:53:02 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2024 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2024 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -25,7 +25,6 @@
25#endif 25#endif
26#include "crypto_namespace.h" 26#include "crypto_namespace.h"
27 27
28LCRYPTO_USED(CONF_set_nconf);
29LCRYPTO_USED(OPENSSL_config); 28LCRYPTO_USED(OPENSSL_config);
30LCRYPTO_USED(OPENSSL_no_config); 29LCRYPTO_USED(OPENSSL_no_config);
31LCRYPTO_USED(NCONF_new); 30LCRYPTO_USED(NCONF_new);