commit 2397276eed9c2697777fcd28de23c67fb54c953f
author David Benjamin <davidben@google.com> Mon Sep 05 01:23:54 2022 -0400
committer Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Sep 14 23:05:22 2022 +0000
tree 390c55a1c909859aca4cc09089f241e40f8c8a01
parent 46af2431214c4d5f76ebd4a47526715bd95f1a08

Unexport CONF_parse_list.

This doesn't seem to be used anywhere and unexporting it lets us make it
size_t-clean.

Update-Note: CONF_parse_list was removed. If parsing strings, use a
dedicated string library.

Bug: 516
Change-Id: I86fb353bb95268f7234fddf5563ecf2a27da99bd
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/54468
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: Bob Beck <bbe@google.com>

crypto/conf/internal.h

diff --git a/crypto/conf/internal.h b/crypto/conf/internal.h
index 3e0e57d..067f45c 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 <openssl/base.h>
+
 #if defined(__cplusplus)
 extern "C" {
 #endif
@@ -23,6 +25,16 @@
 // 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

crypto/x509/asn1_gen.c

diff --git a/crypto/x509/asn1_gen.c b/crypto/x509/asn1_gen.c
index eb31970..b5ee90d 100644
--- a/crypto/x509/asn1_gen.c
+++ b/crypto/x509/asn1_gen.c
@@ -64,6 +64,7 @@
 #include <openssl/obj.h>
 #include <openssl/x509v3.h>
 
+#include "../conf/internal.h"
 #include "../internal.h"
 #include "../x509v3/internal.h"
 #include "internal.h"

include/openssl/conf.h

diff --git a/include/openssl/conf.h b/include/openssl/conf.h
index 6890c7d..0872e13 100644
--- a/include/openssl/conf.h
+++ b/include/openssl/conf.h
@@ -121,19 +121,6 @@
                                             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