Namespace crypto/pkcs7's internal symbols.

Down from 872 to 869 unintended exported symbols.

Bug: 42220000
Change-Id: I09704609521b8878a6361de3f1949cc6e406fcd1
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/86249
Commit-Queue: Rudolf Polzer <rpolzer@google.com>
Reviewed-by: Xiangfei Ding <xfding@google.com>

crypto/cms/cms.cc

diff --git a/crypto/cms/cms.cc b/crypto/cms/cms.cc
index e7211e6..82d2176 100644
--- a/crypto/cms/cms.cc
+++ b/crypto/cms/cms.cc
@@ -23,6 +23,8 @@
 #include "../pkcs7/internal.h"
 
 
+using namespace bssl;
+
 // TODO(davidben): Should we move the core PKCS#7 / CMS implementation into
 // crypto/cms instead of crypto/pkcs7? CMS is getting new features while PKCS#7
 // is not.
@@ -51,7 +53,7 @@
     return nullptr;
   }
 
-  bssl::UniquePtr<CMS_ContentInfo> cms(
+  UniquePtr<CMS_ContentInfo> cms(
       static_cast<CMS_ContentInfo *>(OPENSSL_zalloc(sizeof(CMS_ContentInfo))));
   if (cms == nullptr) {
     return nullptr;
@@ -118,8 +120,8 @@
 
   // Save information for later.
   cms->has_signer_info = true;
-  cms->signer_info.signcert = bssl::UpRef(signcert).release();
-  cms->signer_info.pkey = bssl::UpRef(pkey).release();
+  cms->signer_info.signcert = UpRef(signcert).release();
+  cms->signer_info.pkey = UpRef(pkey).release();
   cms->signer_info.md = md;
   cms->signer_info.use_key_id = (flags & CMS_USE_KEYID) != 0;
   return &cms->signer_info;
@@ -139,7 +141,7 @@
     return 0;
   }
 
-  bssl::ScopedCBB cbb;
+  ScopedCBB cbb;
   if (!CBB_init(cbb.get(), 2048) ||
       !pkcs7_add_external_signature(cbb.get(), cms->signer_info.signcert,
                                     cms->signer_info.pkey, cms->signer_info.md,

crypto/pkcs7/internal.h

diff --git a/crypto/pkcs7/internal.h b/crypto/pkcs7/internal.h
index e6cc8b5..b85f2be 100644
--- a/crypto/pkcs7/internal.h
+++ b/crypto/pkcs7/internal.h
@@ -17,10 +17,8 @@
 
 #include <openssl/base.h>
 
-#if defined(__cplusplus)
-extern "C" {
-#endif
 
+BSSL_NAMESPACE_BEGIN
 
 // pkcs7_parse_header reads the non-certificate/non-CRL prefix of a PKCS#7
 // SignedData blob from |cbs| and sets |*out| to point to the rest of the
@@ -64,9 +62,6 @@
 int pkcs7_add_external_signature(CBB *out, X509 *sign_cert, EVP_PKEY *key,
                                  const EVP_MD *md, BIO *data, bool use_key_id);
 
-
-#if defined(__cplusplus)
-}  // extern C
-#endif
+BSSL_NAMESPACE_END
 
 #endif  // OPENSSL_HEADER_CRYPTO_PKCS7_INTERNAL_H

crypto/pkcs7/pkcs7.cc

diff --git a/crypto/pkcs7/pkcs7.cc b/crypto/pkcs7/pkcs7.cc
index 2b0b879..71e9ab8 100644
--- a/crypto/pkcs7/pkcs7.cc
+++ b/crypto/pkcs7/pkcs7.cc
@@ -24,6 +24,8 @@
 #include "internal.h"
 
 
+using namespace bssl;
+
 // 1.2.840.113549.1.7.1
 static const uint8_t kPKCS7Data[] = {0x2a, 0x86, 0x48, 0x86, 0xf7,
                                      0x0d, 0x01, 0x07, 0x01};
@@ -40,7 +42,7 @@
 //
 // It returns one on success or zero on error. On error, |*der_bytes| is
 // NULL.
-int pkcs7_parse_header(uint8_t **der_bytes, CBS *out, CBS *cbs) {
+int bssl::pkcs7_parse_header(uint8_t **der_bytes, CBS *out, CBS *cbs) {
   CBS in, content_info, content_type, wrapped_signed_data, signed_data;
   uint64_t version;
 
@@ -162,11 +164,11 @@
                                const_cast<STACK_OF(CRYPTO_BUFFER) *>(certs));
 }
 
-int pkcs7_add_signed_data(CBB *out, uint64_t signed_data_version,
-                          int (*digest_algos_cb)(CBB *out, void *arg),
-                          int (*cert_crl_cb)(CBB *out, void *arg),
-                          int (*signer_infos_cb)(CBB *out, void *arg),
-                          void *arg) {
+int bssl::pkcs7_add_signed_data(CBB *out, uint64_t signed_data_version,
+                                int (*digest_algos_cb)(CBB *out, void *arg),
+                                int (*cert_crl_cb)(CBB *out, void *arg),
+                                int (*signer_infos_cb)(CBB *out, void *arg),
+                                void *arg) {
   CBB outer_seq, wrapped_seq, seq, digest_algos_set, content_info, signer_infos;
 
   // See https://tools.ietf.org/html/rfc2315#section-7

crypto/pkcs7/pkcs7_x509.cc

diff --git a/crypto/pkcs7/pkcs7_x509.cc b/crypto/pkcs7/pkcs7_x509.cc
index efc2f2f..09a1379 100644
--- a/crypto/pkcs7/pkcs7_x509.cc
+++ b/crypto/pkcs7/pkcs7_x509.cc
@@ -470,8 +470,9 @@
   return 1;
 }
 
-int pkcs7_add_external_signature(CBB *out, X509 *sign_cert, EVP_PKEY *key,
-                                 const EVP_MD *md, BIO *data, bool use_key_id) {
+int bssl::pkcs7_add_external_signature(CBB *out, X509 *sign_cert, EVP_PKEY *key,
+                                       const EVP_MD *md, BIO *data,
+                                       bool use_key_id) {
   signer_info_data si_data;
   si_data.use_key_id = use_key_id;
   si_data.sign_cert = sign_cert;