Namespace crypto/conf's internal symbols. Down from 869 to 867 unintended exported symbols. Bug: 42220000 Change-Id: I4a464a2f27ef13e033ac950aa303003cef30a953 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/86367 Reviewed-by: Xiangfei Ding <xfding@google.com> Commit-Queue: Rudolf Polzer <rpolzer@google.com>

diff --git a/crypto/conf/conf.cc b/crypto/conf/conf.cc
index 6836af9..7ae71af 100644
--- a/crypto/conf/conf.cc
+++ b/crypto/conf/conf.cc

@@ -29,12 +29,16 @@
 
 using namespace bssl;
 
+BSSL_NAMESPACE_BEGIN
+
 struct conf_section_st {
   char *name;
   // values contains non-owning pointers to the values in the section.
   STACK_OF(CONF_VALUE) *values;
 };
 
+BSSL_NAMESPACE_END
+
 static const char kDefaultSectionName[] = "default";
 
 static uint32_t conf_section_hash(const CONF_SECTION *s) {
@@ -80,7 +84,7 @@
   return conf;
 }
 
-CONF_VALUE *CONF_VALUE_new() {
+CONF_VALUE *bssl::CONF_VALUE_new() {
   return reinterpret_cast<CONF_VALUE *>(OPENSSL_zalloc(sizeof(CONF_VALUE)));
 }
 
@@ -576,9 +580,10 @@
   return ret;
 }
 
-int CONF_parse_list(const char *list, char sep, int remove_whitespace,
-                    int (*list_cb)(const char *elem, size_t len, void *usr),
-                    void *arg) {
+int bssl::CONF_parse_list(const char *list, char sep, int remove_whitespace,
+                          int (*list_cb)(const char *elem, size_t len,
+                                         void *usr),
+                          void *arg) {
   int ret;
   const char *lstart, *tmpend, *p;
 

diff --git a/crypto/conf/conf_test.cc b/crypto/conf/conf_test.cc
index c352a5e..53ed6fd 100644
--- a/crypto/conf/conf_test.cc
+++ b/crypto/conf/conf_test.cc

@@ -25,6 +25,9 @@
 #include "internal.h"
 
 
+BSSL_NAMESPACE_BEGIN
+namespace {
+
 // A |CONF| is an unordered list of sections, where each section contains an
 // ordered list of (name, value) pairs.
 using ConfModel =
@@ -403,9 +406,9 @@
   };
   for (const auto &t : kTests) {
     SCOPED_TRACE(t.in);
-    bssl::UniquePtr<BIO> bio(BIO_new_mem_buf(t.in.data(), t.in.size()));
+    UniquePtr<BIO> bio(BIO_new_mem_buf(t.in.data(), t.in.size()));
     ASSERT_TRUE(bio);
-    bssl::UniquePtr<CONF> conf(NCONF_new(nullptr));
+    UniquePtr<CONF> conf(NCONF_new(nullptr));
     ASSERT_TRUE(conf);
     ASSERT_TRUE(NCONF_load_bio(conf.get(), bio.get(), nullptr));
 
@@ -428,9 +431,9 @@
   };
   for (const auto &t : kInvalidTests) {
     SCOPED_TRACE(t);
-    bssl::UniquePtr<BIO> bio(BIO_new_mem_buf(t, strlen(t)));
+    UniquePtr<BIO> bio(BIO_new_mem_buf(t, strlen(t)));
     ASSERT_TRUE(bio);
-    bssl::UniquePtr<CONF> conf(NCONF_new(nullptr));
+    UniquePtr<CONF> conf(NCONF_new(nullptr));
     ASSERT_TRUE(conf);
     EXPECT_FALSE(NCONF_load_bio(conf.get(), bio.get(), nullptr));
   }
@@ -486,3 +489,6 @@
     EXPECT_EQ(result, t.expected);
   }
 }
+
+}  // namespace
+BSSL_NAMESPACE_END

diff --git a/crypto/conf/internal.h b/crypto/conf/internal.h
index f1a29bc..7fe35aa 100644
--- a/crypto/conf/internal.h
+++ b/crypto/conf/internal.h

@@ -20,10 +20,10 @@
 #include "../lhash/internal.h"
 
 
-typedef struct conf_section_st CONF_SECTION;
-
 BSSL_NAMESPACE_BEGIN
 
+typedef struct conf_section_st CONF_SECTION;
+
 DEFINE_LHASH_OF(CONF_SECTION)
 DEFINE_LHASH_OF(CONF_VALUE)
 
@@ -34,6 +34,8 @@
   LHASH_OF(CONF_SECTION) *sections;
 };
 
+BSSL_NAMESPACE_BEGIN
+
 // CONF_VALUE_new returns a freshly allocated and zeroed |CONF_VALUE|.
 CONF_VALUE *CONF_VALUE_new();
 
@@ -47,5 +49,6 @@
     const char *list, char sep, int remove_whitespace,
     int (*list_cb)(const char *elem, size_t len, void *usr), void *arg);
 
+BSSL_NAMESPACE_END
 
 #endif  // OPENSSL_HEADER_CRYPTO_CONF_INTERNAL_H

diff --git a/crypto/x509/asn1_gen.cc b/crypto/x509/asn1_gen.cc
index c134289..33823cd 100644
--- a/crypto/x509/asn1_gen.cc
+++ b/crypto/x509/asn1_gen.cc

@@ -29,6 +29,8 @@
 #include "internal.h"
 
 
+using namespace bssl;
+
 // Although this file is in crypto/x509 for layering purposes, it emits
 // errors from the ASN.1 module for OpenSSL compatibility.
 
@@ -58,7 +60,7 @@
 static int bitstr_cb(const char *elem, size_t len, void *bitstr);
 
 ASN1_TYPE *ASN1_generate_v3(const char *str, const X509V3_CTX *cnf) {
-  bssl::ScopedCBB cbb;
+  ScopedCBB cbb;
   if (!CBB_init(cbb.get(), 0) ||  //
       !generate_v3(cbb.get(), str, cnf, /*tag=*/0, ASN1_GEN_FORMAT_ASCII,
                    /*depth=*/0)) {

diff --git a/crypto/x509/v3_utl.cc b/crypto/x509/v3_utl.cc
index 015bbca..7546f40 100644
--- a/crypto/x509/v3_utl.cc
+++ b/crypto/x509/v3_utl.cc

@@ -31,6 +31,8 @@
 #include "internal.h"
 
 
+using namespace bssl;
+
 static char *strip_spaces(char *name);
 static int sk_strcmp(const char *const *a, const char *const *b);
 static STACK_OF(OPENSSL_STRING) *get_email(const X509_NAME *name,