Move `crypto/err/internal.h` into the `bssl` namespace.

The CL, except for the `crypto/err/internal.h` change itself, was
generated entirely automatically using
`util/move_symbol_into_namespace.pl`.

Change-Id: I1893343fee1b43b3e31e9d66a244475ffc4a35f1
Bug: 42220000
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/85707
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: Rudolf Polzer <rpolzer@google.com>

crypto/err/err.cc

diff --git a/crypto/err/err.cc b/crypto/err/err.cc
index 23933db..491070c 100644
--- a/crypto/err/err.cc
+++ b/crypto/err/err.cc
@@ -33,6 +33,8 @@
 #include "./internal.h"
 
 
+using namespace bssl;
+
 namespace {
 struct err_error_st {
   // file contains the filename where the error occurred.
@@ -449,9 +451,8 @@
 
   // Unlike OpenSSL, BoringSSL's reason strings already match symbol name, so we
   // do not need to check |symbol|.
-  return err_string_lookup(lib, reason, bssl::kOpenSSLReasonValues,
-                           bssl::kOpenSSLReasonValuesLen,
-                           bssl::kOpenSSLReasonStringData);
+  return err_string_lookup(lib, reason, kOpenSSLReasonValues,
+                           kOpenSSLReasonValuesLen, kOpenSSLReasonStringData);
 }
 
 const char *ERR_reason_error_string(uint32_t packed_error) {
@@ -746,12 +747,12 @@
 
 void ERR_load_RAND_strings(void) {}
 
-struct err_save_state_st {
+struct bssl::err_save_state_st {
   struct err_error_st *errors;
   size_t num_errors;
 };
 
-void ERR_SAVE_STATE_free(ERR_SAVE_STATE *state) {
+void bssl::ERR_SAVE_STATE_free(ERR_SAVE_STATE *state) {
   if (state == nullptr) {
     return;
   }
@@ -762,7 +763,7 @@
   free(state);
 }
 
-ERR_SAVE_STATE *ERR_save_state(void) {
+ERR_SAVE_STATE *bssl::ERR_save_state(void) {
   ERR_STATE *const state = err_get_state();
   if (state == nullptr || state->top == state->bottom) {
     return nullptr;
@@ -795,7 +796,7 @@
   return ret;
 }
 
-void ERR_restore_state(const ERR_SAVE_STATE *state) {
+void bssl::ERR_restore_state(const ERR_SAVE_STATE *state) {
   if (state == nullptr || state->num_errors == 0) {
     ERR_clear_error();
     return;

crypto/err/err_test.cc

diff --git a/crypto/err/err_test.cc b/crypto/err/err_test.cc
index 77e9c9f..b058d7c 100644
--- a/crypto/err/err_test.cc
+++ b/crypto/err/err_test.cc
@@ -32,6 +32,8 @@
 #endif
 
 
+using namespace bssl;
+
 TEST(ErrTest, Overflow) {
   for (unsigned i = 0; i < ERR_NUM_ERRORS*2; i++) {
     ERR_put_error(1, 0 /* unused */, i+1, "test", 1);
@@ -82,7 +84,7 @@
   EXPECT_STREQ("testing", data);
 
   ERR_put_error(1, 0 /* unused */, 2, "test", 4);
-  bssl::UniquePtr<char> str(OPENSSL_strdup("testing"));
+  UniquePtr<char> str(OPENSSL_strdup("testing"));
   ERR_set_error_data(str.release(), ERR_FLAG_STRING | ERR_FLAG_MALLOCED);
   packed_error = ERR_get_error_line_data(&file, &line, &data, &flags);
   EXPECT_STREQ("testing", data);
@@ -155,7 +157,7 @@
   ERR_put_error(2, 0 /* unused */, 2, "test2.c", 2);
   ERR_put_error(3, 0 /* unused */, 3, "test3.c", 3);
   ERR_add_error_data(1, "data3");
-  bssl::UniquePtr<ERR_SAVE_STATE> saved(ERR_save_state());
+  UniquePtr<ERR_SAVE_STATE> saved(ERR_save_state());
   ASSERT_TRUE(saved);
 
   // The existing error queue entries still exist.

crypto/err/internal.h

diff --git a/crypto/err/internal.h b/crypto/err/internal.h
index 4ce440a..43ece38 100644
--- a/crypto/err/internal.h
+++ b/crypto/err/internal.h
@@ -17,10 +17,8 @@
 
 #include <openssl/err.h>
 
-#if defined(__cplusplus)
-extern "C" {
-#endif
 
+BSSL_NAMESPACE_BEGIN
 
 // Private error queue functions.
 
@@ -40,19 +38,8 @@
 // ERR_restore_state clears the error queue and replaces it with |state|.
 OPENSSL_EXPORT void ERR_restore_state(const ERR_SAVE_STATE *state);
 
-
-#if defined(__cplusplus)
-}  // extern C
-
-extern "C++" {
-
-BSSL_NAMESPACE_BEGIN
-
 BORINGSSL_MAKE_DELETER(ERR_SAVE_STATE, ERR_SAVE_STATE_free)
 
 BSSL_NAMESPACE_END
 
-}  // extern C++
-#endif
-
 #endif  // OPENSSL_HEADER_CRYPTO_ERR_INTERNAL_H