diff options
Diffstat (limited to 'src/lib/libcrypto/conf/conf_api.c')
| -rw-r--r-- | src/lib/libcrypto/conf/conf_api.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/lib/libcrypto/conf/conf_api.c b/src/lib/libcrypto/conf/conf_api.c index f986243b65..0d5a67d9a5 100644 --- a/src/lib/libcrypto/conf/conf_api.c +++ b/src/lib/libcrypto/conf/conf_api.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: conf_api.c,v 1.26 2025/03/08 09:35:53 tb Exp $ */ | 1 | /* $OpenBSD: conf_api.c,v 1.29 2025/12/21 07:31:22 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 | * |
| @@ -56,16 +56,10 @@ | |||
| 56 | * [including the GNU Public Licence.] | 56 | * [including the GNU Public Licence.] |
| 57 | */ | 57 | */ |
| 58 | 58 | ||
| 59 | /* Part of the code in here was originally in conf.c, which is now removed */ | ||
| 60 | |||
| 61 | #ifndef CONF_DEBUG | ||
| 62 | # undef NDEBUG /* avoid conflicting definitions */ | ||
| 63 | # define NDEBUG | ||
| 64 | #endif | ||
| 65 | |||
| 66 | #include <stdlib.h> | 59 | #include <stdlib.h> |
| 67 | #include <string.h> | 60 | #include <string.h> |
| 68 | #include <unistd.h> | 61 | #include <unistd.h> |
| 62 | |||
| 69 | #include <openssl/conf.h> | 63 | #include <openssl/conf.h> |
| 70 | 64 | ||
| 71 | #include "conf_local.h" | 65 | #include "conf_local.h" |
| @@ -77,7 +71,6 @@ static IMPLEMENT_LHASH_DOALL_ARG_FN(value_free_hash, CONF_VALUE, | |||
| 77 | LHASH_OF(CONF_VALUE)) | 71 | LHASH_OF(CONF_VALUE)) |
| 78 | static IMPLEMENT_LHASH_DOALL_FN(value_free_stack, CONF_VALUE) | 72 | static IMPLEMENT_LHASH_DOALL_FN(value_free_stack, CONF_VALUE) |
| 79 | 73 | ||
| 80 | /* Up until OpenSSL 0.9.5a, this was get_section */ | ||
| 81 | CONF_VALUE * | 74 | CONF_VALUE * |
| 82 | _CONF_get_section(const CONF *conf, const char *section) | 75 | _CONF_get_section(const CONF *conf, const char *section) |
| 83 | { | 76 | { |
| @@ -229,7 +222,6 @@ value_free_stack_doall(CONF_VALUE *a) | |||
| 229 | free(a); | 222 | free(a); |
| 230 | } | 223 | } |
| 231 | 224 | ||
| 232 | /* Up until OpenSSL 0.9.5a, this was new_section */ | ||
| 233 | CONF_VALUE * | 225 | CONF_VALUE * |
| 234 | _CONF_new_section(CONF *conf, const char *section) | 226 | _CONF_new_section(CONF *conf, const char *section) |
| 235 | { | 227 | { |
