diff --git a/crypto/conf/internal.h b/crypto/conf/internal.h index 3e0e57dfe..067f45cfa 100644 --- a/crypto/conf/internal.h +++ b/crypto/conf/internal.h @@ -15,6 +15,8 @@ #ifndef OPENSSL_HEADER_CRYPTO_CONF_INTERNAL_H #define OPENSSL_HEADER_CRYPTO_CONF_INTERNAL_H +#include + #if defined(__cplusplus) extern "C" { #endif @@ -23,6 +25,16 @@ extern "C" { // CONF_VALUE_new returns a freshly allocated and zeroed |CONF_VALUE|. CONF_VALUE *CONF_VALUE_new(void); +// CONF_parse_list takes a list separated by 'sep' and calls |list_cb| giving +// the start and length of each member, optionally stripping leading and +// trailing whitespace. This can be used to parse comma separated lists for +// example. If |list_cb| returns <= 0, then the iteration is halted and that +// value is returned immediately. Otherwise it returns one. Note that |list_cb| +// may be called on an empty member. +int CONF_parse_list(const char *list, char sep, int remove_whitespace, + int (*list_cb)(const char *elem, int len, void *usr), + void *arg); + #if defined(__cplusplus) } // extern C diff --git a/crypto/x509/asn1_gen.c b/crypto/x509/asn1_gen.c index eb3197007..b5ee90d50 100644 --- a/crypto/x509/asn1_gen.c +++ b/crypto/x509/asn1_gen.c @@ -64,6 +64,7 @@ #include #include +#include "../conf/internal.h" #include "../internal.h" #include "../x509v3/internal.h" #include "internal.h" diff --git a/include/openssl/conf.h b/include/openssl/conf.h index 6890c7d25..0872e13d2 100644 --- a/include/openssl/conf.h +++ b/include/openssl/conf.h @@ -121,19 +121,6 @@ OPENSSL_EXPORT const char *NCONF_get_string(const CONF *conf, const char *name); -// Utility functions - -// CONF_parse_list takes a list separated by 'sep' and calls |list_cb| giving -// the start and length of each member, optionally stripping leading and -// trailing whitespace. This can be used to parse comma separated lists for -// example. If |list_cb| returns <= 0, then the iteration is halted and that -// value is returned immediately. Otherwise it returns one. Note that |list_cb| -// may be called on an empty member. -int CONF_parse_list(const char *list, char sep, int remove_whitespace, - int (*list_cb)(const char *elem, int len, void *usr), - void *arg); - - // Deprecated functions // These defines do nothing but are provided to make old code easier to