diff options
author | tb <> | 2024-08-31 09:44:00 +0000 |
---|---|---|
committer | tb <> | 2024-08-31 09:44:00 +0000 |
commit | 8ed0a536d68fcf1d741f36e88cb5e42af7f495b1 (patch) | |
tree | 97b3476cc61b0265c07f9bef8ee4470ff135c850 /src/lib | |
parent | 4cc1384c3d5bce74b01be7b3ccca401fd1890ee3 (diff) | |
download | openbsd-8ed0a536d68fcf1d741f36e88cb5e42af7f495b1.tar.gz openbsd-8ed0a536d68fcf1d741f36e88cb5e42af7f495b1.tar.bz2 openbsd-8ed0a536d68fcf1d741f36e88cb5e42af7f495b1.zip |
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
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libcrypto/Symbols.list | 1 | ||||
-rw-r--r-- | src/lib/libcrypto/conf/conf.h | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/conf/conf_def.c | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/conf/conf_local.h | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/hidden/openssl/conf.h | 3 |
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 | |||
1486 | NAME_CONSTRAINTS_free | 1486 | NAME_CONSTRAINTS_free |
1487 | NAME_CONSTRAINTS_it | 1487 | NAME_CONSTRAINTS_it |
1488 | NAME_CONSTRAINTS_new | 1488 | NAME_CONSTRAINTS_new |
1489 | NCONF_default | ||
1490 | NCONF_free | 1489 | NCONF_free |
1491 | NCONF_get_number_e | 1490 | NCONF_get_number_e |
1492 | NCONF_get_section | 1491 | NCONF_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 | ||
133 | CONF *NCONF_new(const CONF_METHOD *meth); | 133 | CONF *NCONF_new(const CONF_METHOD *meth); |
134 | const CONF_METHOD *NCONF_default(void); | ||
135 | void NCONF_free(CONF *conf); | 134 | void NCONF_free(CONF *conf); |
136 | 135 | ||
137 | int NCONF_load(CONF *conf, const char *file, long *eline); | 136 | int 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 | } |
655 | LCRYPTO_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 | ||
64 | const CONF_METHOD *NCONF_default(void); | ||
65 | |||
64 | struct conf_method_st { | 66 | struct 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); | |||
37 | LCRYPTO_USED(OPENSSL_config); | 37 | LCRYPTO_USED(OPENSSL_config); |
38 | LCRYPTO_USED(OPENSSL_no_config); | 38 | LCRYPTO_USED(OPENSSL_no_config); |
39 | LCRYPTO_USED(NCONF_new); | 39 | LCRYPTO_USED(NCONF_new); |
40 | LCRYPTO_USED(NCONF_default); | ||
41 | LCRYPTO_USED(NCONF_free); | 40 | LCRYPTO_USED(NCONF_free); |
42 | LCRYPTO_USED(NCONF_load); | 41 | LCRYPTO_USED(NCONF_load); |
43 | LCRYPTO_USED(NCONF_load_bio); | 42 | LCRYPTO_USED(NCONF_load_bio); |