Namespace crypto/pem's internal symbols.

Down from 997 to 994 unintended exported symbols.

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

crypto/pem/internal.h

diff --git a/crypto/pem/internal.h b/crypto/pem/internal.h
index 6e51d18..656dffb 100644
--- a/crypto/pem/internal.h
+++ b/crypto/pem/internal.h
@@ -20,10 +20,8 @@
 
 #include "../mem_internal.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
+BSSL_NAMESPACE_BEGIN
 
 // PEM_get_EVP_CIPHER_INFO decodes |header| as a PEM header block and writes the
 // specified cipher and IV to |cipher|. It returns one on success and zero on
@@ -46,8 +44,6 @@
                        bssl::UniquePtr<char> *header,
                        bssl::Array<uint8_t> *data);
 
-#ifdef __cplusplus
-}  // extern C
-#endif
+BSSL_NAMESPACE_END
 
 #endif  // OPENSSL_HEADER_CRYPTO_PEM_INTERNAL_H

crypto/pem/pem_info.cc

diff --git a/crypto/pem/pem_info.cc b/crypto/pem/pem_info.cc
index f461699..0a647fc 100644
--- a/crypto/pem/pem_info.cc
+++ b/crypto/pem/pem_info.cc
@@ -30,6 +30,8 @@
 #include "internal.h"
 
 
+using namespace bssl;
+
 static X509_PKEY *X509_PKEY_new() {
   return reinterpret_cast<X509_PKEY *>(OPENSSL_zalloc(sizeof(X509_PKEY)));
 }
@@ -121,9 +123,9 @@
 STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk,
                                             pem_password_cb *cb, void *u) {
   X509_INFO *info = nullptr;
-  bssl::UniquePtr<char> name;
-  bssl::UniquePtr<char> header;
-  bssl::Array<uint8_t> data;
+  UniquePtr<char> name;
+  UniquePtr<char> header;
+  Array<uint8_t> data;
   int ok = 0;
   STACK_OF(X509_INFO) *ret = nullptr;
 

crypto/pem/pem_lib.cc

diff --git a/crypto/pem/pem_lib.cc b/crypto/pem/pem_lib.cc
index 42336da..c2ff10b 100644
--- a/crypto/pem/pem_lib.cc
+++ b/crypto/pem/pem_lib.cc
@@ -40,6 +40,8 @@
 
 #define MIN_LENGTH 4
 
+using namespace bssl;
+
 static int load_iv(const char **fromp, unsigned char *to, size_t num);
 static int check_pem(const std::string_view nm, const std::string_view name);
 
@@ -175,9 +177,9 @@
                        const char *name, BIO *bp, pem_password_cb *cb,
                        void *u) {
   EVP_CIPHER_INFO cipher;
-  bssl::UniquePtr<char> nm;
-  bssl::UniquePtr<char> header;
-  bssl::Array<uint8_t> data;
+  UniquePtr<char> nm;
+  UniquePtr<char> header;
+  Array<uint8_t> data;
   size_t ulen;
   size_t unused = 0;
 
@@ -236,7 +238,7 @@
 int PEM_ASN1_write_bio(i2d_of_void *i2d, const char *name, BIO *bp, void *x,
                        const EVP_CIPHER *enc, const unsigned char *pass,
                        int pass_len, pem_password_cb *callback, void *u) {
-  bssl::ScopedEVP_CIPHER_CTX ctx;
+  ScopedEVP_CIPHER_CTX ctx;
   int dsize = 0, ret = 0;
   size_t i, j, data_size;
   unsigned char *p, *data = nullptr;
@@ -331,10 +333,10 @@
   return ret;
 }
 
-int PEM_do_header(const EVP_CIPHER_INFO *cipher, unsigned char *data,
-                  size_t *len, pem_password_cb *callback, void *u) {
+int bssl::PEM_do_header(const EVP_CIPHER_INFO *cipher, unsigned char *data,
+                        size_t *len, pem_password_cb *callback, void *u) {
   int pass_len;
-  bssl::ScopedEVP_CIPHER_CTX ctx;
+  ScopedEVP_CIPHER_CTX ctx;
   unsigned char key[EVP_MAX_KEY_LENGTH];
   char buf[PEM_BUFSIZE];
   const size_t in_len = *len;
@@ -374,7 +376,7 @@
   return 1;
 }
 
-int PEM_get_EVP_CIPHER_INFO(const char *header, EVP_CIPHER_INFO *cipher) {
+int bssl::PEM_get_EVP_CIPHER_INFO(const char *header, EVP_CIPHER_INFO *cipher) {
   cipher->cipher = nullptr;
   OPENSSL_memset(cipher->iv, 0, sizeof(cipher->iv));
   if ((header == nullptr) || (*header == '\0') || (*header == '\n')) {
@@ -542,9 +544,8 @@
   return ret;
 }
 
-int PEM_read_bio_inner(BIO *bp, bssl::UniquePtr<char> *name,
-                       bssl::UniquePtr<char> *header,
-                       bssl::Array<uint8_t> *data) {
+int bssl::PEM_read_bio_inner(BIO *bp, UniquePtr<char> *name,
+                             UniquePtr<char> *header, Array<uint8_t> *data) {
   EVP_ENCODE_CTX ctx;
   int end = 0, i, k, bl = 0, hl = 0, nohead = 0;
   char buf[256];
@@ -717,9 +718,9 @@
 
 int PEM_read_bio(BIO *bp, char **name, char **header, unsigned char **data,
                  long *len) {
-  bssl::UniquePtr<char> owned_name;
-  bssl::UniquePtr<char> owned_header;
-  bssl::Array<uint8_t> owned_data;
+  UniquePtr<char> owned_name;
+  UniquePtr<char> owned_header;
+  Array<uint8_t> owned_data;
   if (!PEM_read_bio_inner(bp, &owned_name, &owned_header, &owned_data)) {
     return 0;
   }