grpc 1.84.0 → 1.85.0.pre1

data/third_party/boringssl-with-bazel/crypto/stack/stack.cc

@@ -17,21 +17,26 @@
 #include <assert.h>
 #include <limits.h>
 
+#include <algorithm>
+
 #include <openssl/err.h>
 #include <openssl/mem.h>
 
 #include "../internal.h"
+#include "../mem_internal.h"
+
 
+using namespace bssl;
 
 struct stack_st {
-  // num contains the number of valid pointers in |data|.
+  // num contains the number of valid pointers in `data`.
   size_t num;
   void **data;
-  // sorted is non-zero if the values pointed to by |data| are in ascending
-  // order, based on |comp|.
+  // sorted is non-zero if the values pointed to by `data` are in ascending
+  // order, based on `comp`.
   int sorted;
   // num_alloc contains the number of pointers allocated in the buffer pointed
-  // to by |data|, which may be larger than |num|.
+  // to by `data`, which may be larger than `num`.
   size_t num_alloc;
   // comp is an optional comparison function.
   OPENSSL_sk_cmp_func comp;
@@ -42,15 +47,14 @@ struct stack_st {
 static const size_t kMinSize = 4;
 
 OPENSSL_STACK *OPENSSL_sk_new(OPENSSL_sk_cmp_func comp) {
-  OPENSSL_STACK *ret =
-      reinterpret_cast<OPENSSL_STACK *>(OPENSSL_zalloc(sizeof(OPENSSL_STACK)));
-  if (ret == NULL) {
-    return NULL;
+  OPENSSL_STACK *ret = New<OPENSSL_STACK>();
+  if (ret == nullptr) {
+    return nullptr;
   }
 
   ret->data =
       reinterpret_cast<void **>(OPENSSL_calloc(kMinSize, sizeof(void *)));
-  if (ret->data == NULL) {
+  if (ret->data == nullptr) {
     goto err;
   }
 
@@ -60,21 +64,21 @@ OPENSSL_STACK *OPENSSL_sk_new(OPENSSL_sk_cmp_func comp) {
   return ret;
 
 err:
-  OPENSSL_free(ret);
-  return NULL;
+  Delete(ret);
+  return nullptr;
 }
 
-OPENSSL_STACK *OPENSSL_sk_new_null(void) { return OPENSSL_sk_new(NULL); }
+OPENSSL_STACK *OPENSSL_sk_new_null() { return OPENSSL_sk_new(nullptr); }
 
 size_t OPENSSL_sk_num(const OPENSSL_STACK *sk) {
-  if (sk == NULL) {
+  if (sk == nullptr) {
     return 0;
   }
   return sk->num;
 }
 
 void OPENSSL_sk_zero(OPENSSL_STACK *sk) {
-  if (sk == NULL || sk->num == 0) {
+  if (sk == nullptr || sk->num == 0) {
     return;
   }
   OPENSSL_memset(sk->data, 0, sizeof(void *) * sk->num);
@@ -84,43 +88,44 @@ void OPENSSL_sk_zero(OPENSSL_STACK *sk) {
 
 void *OPENSSL_sk_value(const OPENSSL_STACK *sk, size_t i) {
   if (!sk || i >= sk->num) {
-    return NULL;
+    return nullptr;
   }
   return sk->data[i];
 }
 
 void *OPENSSL_sk_set(OPENSSL_STACK *sk, size_t i, void *value) {
   if (!sk || i >= sk->num) {
-    return NULL;
+    return nullptr;
   }
+  sk->sorted = 0;
   return sk->data[i] = value;
 }
 
 void OPENSSL_sk_free(OPENSSL_STACK *sk) {
-  if (sk == NULL) {
+  if (sk == nullptr) {
     return;
   }
   OPENSSL_free(sk->data);
-  OPENSSL_free(sk);
+  Delete(sk);
 }
 
 void OPENSSL_sk_pop_free_ex(OPENSSL_STACK *sk,
                             OPENSSL_sk_call_free_func call_free_func,
                             OPENSSL_sk_free_func free_func) {
-  if (sk == NULL) {
+  if (sk == nullptr) {
     return;
   }
 
   for (size_t i = 0; i < sk->num; i++) {
-    if (sk->data[i] != NULL) {
+    if (sk->data[i] != nullptr) {
       call_free_func(free_func, sk->data[i]);
     }
   }
   OPENSSL_sk_free(sk);
 }
 
-// Historically, |sk_pop_free| called the function as |OPENSSL_sk_free_func|
-// directly. This is undefined in C. Some callers called |sk_pop_free| directly,
+// Historically, `sk_pop_free` called the function as `OPENSSL_sk_free_func`
+// directly. This is undefined in C. Some callers called `sk_pop_free` directly,
 // so we must maintain a compatibility version for now.
 static void call_free_func_legacy(OPENSSL_sk_free_func func, void *ptr) {
   func(ptr);
@@ -131,7 +136,7 @@ void sk_pop_free(OPENSSL_STACK *sk, OPENSSL_sk_free_func free_func) {
 }
 
 size_t OPENSSL_sk_insert(OPENSSL_STACK *sk, void *p, size_t where) {
-  if (sk == NULL) {
+  if (sk == nullptr) {
     return 0;
   }
 
@@ -158,7 +163,7 @@ size_t OPENSSL_sk_insert(OPENSSL_STACK *sk, void *p, size_t where) {
     }
 
     data = reinterpret_cast<void **>(OPENSSL_realloc(sk->data, alloc_size));
-    if (data == NULL) {
+    if (data == nullptr) {
       return 0;
     }
 
@@ -184,7 +189,7 @@ void *OPENSSL_sk_delete(OPENSSL_STACK *sk, size_t where) {
   void *ret;
 
   if (!sk || where >= sk->num) {
-    return NULL;
+    return nullptr;
   }
 
   ret = sk->data[where];
@@ -199,8 +204,8 @@ void *OPENSSL_sk_delete(OPENSSL_STACK *sk, size_t where) {
 }
 
 void *OPENSSL_sk_delete_ptr(OPENSSL_STACK *sk, const void *p) {
-  if (sk == NULL) {
-    return NULL;
+  if (sk == nullptr) {
+    return nullptr;
   }
 
   for (size_t i = 0; i < sk->num; i++) {
@@ -209,13 +214,13 @@ void *OPENSSL_sk_delete_ptr(OPENSSL_STACK *sk, const void *p) {
     }
   }
 
-  return NULL;
+  return nullptr;
 }
 
 void OPENSSL_sk_delete_if(OPENSSL_STACK *sk,
                           OPENSSL_sk_call_delete_if_func call_func,
                           OPENSSL_sk_delete_if_func func, void *data) {
-  if (sk == NULL) {
+  if (sk == nullptr) {
     return;
   }
 
@@ -231,11 +236,11 @@ void OPENSSL_sk_delete_if(OPENSSL_STACK *sk,
 
 int OPENSSL_sk_find(const OPENSSL_STACK *sk, size_t *out_index, const void *p,
                     OPENSSL_sk_call_cmp_func call_cmp_func) {
-  if (sk == NULL) {
+  if (sk == nullptr) {
     return 0;
   }
 
-  if (sk->comp == NULL) {
+  if (sk->comp == nullptr) {
     // Use pointer equality when no comparison function has been set.
     for (size_t i = 0; i < sk->num; i++) {
       if (sk->data[i] == p) {
@@ -248,7 +253,7 @@ int OPENSSL_sk_find(const OPENSSL_STACK *sk, size_t *out_index, const void *p,
     return 0;
   }
 
-  if (p == NULL) {
+  if (p == nullptr) {
     return 0;
   }
 
@@ -266,29 +271,29 @@ int OPENSSL_sk_find(const OPENSSL_STACK *sk, size_t *out_index, const void *p,
 
   // The stack is sorted, so binary search to find the element.
   //
-  // |lo| and |hi| maintain a half-open interval of where the answer may be. All
-  // indices such that |lo <= idx < hi| are candidates.
+  // `lo` and `hi` maintain a half-open interval of where the answer may be. All
+  // indices such that `lo <= idx < hi` are candidates.
   size_t lo = 0, hi = sk->num;
   while (lo < hi) {
-    // Bias |mid| towards |lo|. See the |r == 0| case below.
+    // Bias `mid` towards `lo`. See the `r == 0` case below.
     size_t mid = lo + (hi - lo - 1) / 2;
     assert(lo <= mid && mid < hi);
     int r = call_cmp_func(sk->comp, p, sk->data[mid]);
     if (r > 0) {
-      lo = mid + 1;  // |mid| is too low.
+      lo = mid + 1;  // `mid` is too low.
     } else if (r < 0) {
-      hi = mid;  // |mid| is too high.
+      hi = mid;  // `mid` is too high.
     } else {
-      // |mid| matches. However, this function returns the earliest match, so we
+      // `mid` matches. However, this function returns the earliest match, so we
       // can only return if the range has size one.
       if (hi - lo == 1) {
-        if (out_index != NULL) {
+        if (out_index != nullptr) {
           *out_index = mid;
         }
         return 1;
       }
-      // The sample is biased towards |lo|. |mid| can only be |hi - 1| if
-      // |hi - lo| was one, so this makes forward progress.
+      // The sample is biased towards `lo`. `mid` can only be `hi - 1` if
+      // `hi - lo` was one, so this makes forward progress.
       assert(mid + 1 < hi);
       hi = mid + 1;
     }
@@ -299,11 +304,11 @@ int OPENSSL_sk_find(const OPENSSL_STACK *sk, size_t *out_index, const void *p,
 }
 
 void *OPENSSL_sk_shift(OPENSSL_STACK *sk) {
-  if (sk == NULL) {
-    return NULL;
+  if (sk == nullptr) {
+    return nullptr;
   }
   if (sk->num == 0) {
-    return NULL;
+    return nullptr;
   }
   return OPENSSL_sk_delete(sk, 0);
 }
@@ -313,29 +318,28 @@ size_t OPENSSL_sk_push(OPENSSL_STACK *sk, void *p) {
 }
 
 void *OPENSSL_sk_pop(OPENSSL_STACK *sk) {
-  if (sk == NULL) {
-    return NULL;
+  if (sk == nullptr) {
+    return nullptr;
   }
   if (sk->num == 0) {
-    return NULL;
+    return nullptr;
   }
   return OPENSSL_sk_delete(sk, sk->num - 1);
 }
 
 OPENSSL_STACK *OPENSSL_sk_dup(const OPENSSL_STACK *sk) {
-  if (sk == NULL) {
-    return NULL;
+  if (sk == nullptr) {
+    return nullptr;
   }
 
-  OPENSSL_STACK *ret =
-      reinterpret_cast<OPENSSL_STACK *>(OPENSSL_zalloc(sizeof(OPENSSL_STACK)));
-  if (ret == NULL) {
-    return NULL;
+  OPENSSL_STACK *ret = New<OPENSSL_STACK>();
+  if (ret == nullptr) {
+    return nullptr;
   }
 
   ret->data = reinterpret_cast<void **>(
       OPENSSL_memdup(sk->data, sizeof(void *) * sk->num_alloc));
-  if (ret->data == NULL) {
+  if (ret->data == nullptr) {
     goto err;
   }
 
@@ -347,84 +351,39 @@ OPENSSL_STACK *OPENSSL_sk_dup(const OPENSSL_STACK *sk) {
 
 err:
   OPENSSL_sk_free(ret);
-  return NULL;
-}
-
-static size_t parent_idx(size_t idx) {
-  assert(idx > 0);
-  return (idx - 1) / 2;
-}
-
-static size_t left_idx(size_t idx) {
-  // The largest possible index is |PTRDIFF_MAX|, not |SIZE_MAX|. If
-  // |ptrdiff_t|, a signed type, is the same size as |size_t|, this cannot
-  // overflow.
-  assert(idx <= PTRDIFF_MAX);
-  static_assert(PTRDIFF_MAX <= (SIZE_MAX - 1) / 2, "2 * idx + 1 may oveflow");
-  return 2 * idx + 1;
-}
-
-// down_heap fixes the subtree rooted at |i|. |i|'s children must each satisfy
-// the heap property. Only the first |num| elements of |sk| are considered.
-static void down_heap(OPENSSL_STACK *sk, OPENSSL_sk_call_cmp_func call_cmp_func,
-                      size_t i, size_t num) {
-  assert(i < num && num <= sk->num);
-  for (;;) {
-    size_t left = left_idx(i);
-    if (left >= num) {
-      break;  // No left child.
-    }
-
-    // Swap |i| with the largest of its children.
-    size_t next = i;
-    if (call_cmp_func(sk->comp, sk->data[next], sk->data[left]) < 0) {
-      next = left;
-    }
-    size_t right = left + 1;  // Cannot overflow because |left < num|.
-    if (right < num &&
-        call_cmp_func(sk->comp, sk->data[next], sk->data[right]) < 0) {
-      next = right;
-    }
-
-    if (i == next) {
-      break;  // |i| is already larger than its children.
-    }
-
-    void *tmp = sk->data[i];
-    sk->data[i] = sk->data[next];
-    sk->data[next] = tmp;
-    i = next;
-  }
+  return nullptr;
 }
 
 void OPENSSL_sk_sort(OPENSSL_STACK *sk,
                      OPENSSL_sk_call_cmp_func call_cmp_func) {
-  if (sk == NULL || sk->comp == NULL || sk->sorted) {
+  if (sk == nullptr || sk->comp == nullptr || sk->sorted) {
     return;
   }
 
-  if (sk->num >= 2) {
-    // |qsort| lacks a context parameter in the comparison function for us to
-    // pass in |call_cmp_func| and |sk->comp|. While we could cast |sk->comp| to
-    // the expected type, it is undefined behavior in C can trip sanitizers.
-    // |qsort_r| and |qsort_s| avoid this, but using them is impractical. See
-    // https://stackoverflow.com/a/39561369
-    //
-    // Use our own heap sort instead. This is not performance-sensitive, so we
-    // optimize for simplicity and size. First, build a max-heap in place.
-    for (size_t i = parent_idx(sk->num - 1); i < sk->num; i--) {
-      down_heap(sk, call_cmp_func, i, sk->num);
-    }
+  std::sort(sk->data, sk->data + sk->num, [&](void *a, void *b) {
+    return call_cmp_func(sk->comp, a, b) < 0;
+  });
+  sk->sorted = 1;
+}
+
+void OPENSSL_sk_sort_and_dedup(
+    OPENSSL_STACK *sk, OPENSSL_sk_call_cmp_func call_cmp_func,
+    OPENSSL_sk_call_free_func call_free_func, OPENSSL_sk_free_func free_func) {
+  OPENSSL_sk_sort(sk, call_cmp_func);
+  if (sk == nullptr || sk->comp == nullptr || sk->num <= 1) {
+    return;
+  }
 
-    // Iteratively remove the maximum element to populate the result in reverse.
-    for (size_t i = sk->num - 1; i > 0; i--) {
-      void *tmp = sk->data[0];
-      sk->data[0] = sk->data[i];
-      sk->data[i] = tmp;
-      down_heap(sk, call_cmp_func, 0, i);
+  size_t new_num = 1;
+  for (size_t i = 1; i < sk->num; i++) {
+    if (call_cmp_func(sk->comp, sk->data[i], sk->data[new_num - 1]) != 0) {
+      sk->data[new_num] = sk->data[i];
+      new_num++;
+    } else if (free_func != nullptr) {
+      call_free_func(free_func, sk->data[i]);
     }
   }
-  sk->sorted = 1;
+  sk->num = new_num;
 }
 
 int OPENSSL_sk_is_sorted(const OPENSSL_STACK *sk) {
@@ -432,7 +391,7 @@ int OPENSSL_sk_is_sorted(const OPENSSL_STACK *sk) {
     return 1;
   }
   // Zero- and one-element lists are always sorted.
-  return sk->sorted || (sk->comp != NULL && sk->num < 2);
+  return sk->sorted || (sk->comp != nullptr && sk->num < 2);
 }
 
 OPENSSL_sk_cmp_func OPENSSL_sk_set_cmp_func(OPENSSL_STACK *sk,
@@ -453,30 +412,30 @@ OPENSSL_STACK *OPENSSL_sk_deep_copy(const OPENSSL_STACK *sk,
                                     OPENSSL_sk_call_free_func call_free_func,
                                     OPENSSL_sk_free_func free_func) {
   OPENSSL_STACK *ret = OPENSSL_sk_dup(sk);
-  if (ret == NULL) {
-    return NULL;
+  if (ret == nullptr) {
+    return nullptr;
   }
 
   for (size_t i = 0; i < ret->num; i++) {
-    if (ret->data[i] == NULL) {
+    if (ret->data[i] == nullptr) {
       continue;
     }
     ret->data[i] = call_copy_func(copy_func, ret->data[i]);
-    if (ret->data[i] == NULL) {
+    if (ret->data[i] == nullptr) {
       for (size_t j = 0; j < i; j++) {
-        if (ret->data[j] != NULL) {
+        if (ret->data[j] != nullptr) {
           call_free_func(free_func, ret->data[j]);
         }
       }
       OPENSSL_sk_free(ret);
-      return NULL;
+      return nullptr;
     }
   }
 
   return ret;
 }
 
-OPENSSL_STACK *sk_new_null(void) { return OPENSSL_sk_new_null(); }
+OPENSSL_STACK *sk_new_null() { return OPENSSL_sk_new_null(); }
 
 size_t sk_num(const OPENSSL_STACK *sk) { return OPENSSL_sk_num(sk); }
 

data/third_party/boringssl-with-bazel/crypto/thread.cc

@@ -15,14 +15,14 @@
 #include <openssl/thread.h>
 
 
-int CRYPTO_num_locks(void) { return 1; }
+int CRYPTO_num_locks() { return 1; }
 
 void CRYPTO_set_locking_callback(void (*func)(int mode, int lock_num,
                                               const char *file, int line)) {}
 
-void (*CRYPTO_get_locking_callback(void))(int mode, int lock_num,
-                                          const char *file, int line) {
-  return NULL;
+void (*CRYPTO_get_locking_callback())(int mode, int lock_num, const char *file,
+                                      int line) {
+  return nullptr;
 }
 
 void CRYPTO_set_add_lock_callback(int (*func)(int *num, int mount, int lock_num,
@@ -40,7 +40,7 @@ void CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr) {}
 
 void CRYPTO_THREADID_current(CRYPTO_THREADID *id) {}
 
-void CRYPTO_set_id_callback(unsigned long (*func)(void)) {}
+void CRYPTO_set_id_callback(unsigned long (*func)()) {}
 
 void CRYPTO_set_dynlock_create_callback(struct CRYPTO_dynlock_value *(
     *dyn_create_function)(const char *file, int line)) {}
@@ -51,18 +51,18 @@ void CRYPTO_set_dynlock_lock_callback(void (*dyn_lock_function)(
 void CRYPTO_set_dynlock_destroy_callback(void (*dyn_destroy_function)(
     struct CRYPTO_dynlock_value *l, const char *file, int line)) {}
 
-struct CRYPTO_dynlock_value *(*CRYPTO_get_dynlock_create_callback(void))(
+struct CRYPTO_dynlock_value *(*CRYPTO_get_dynlock_create_callback())(
     const char *file, int line) {
-  return NULL;
+  return nullptr;
 }
 
-void (*CRYPTO_get_dynlock_lock_callback(void))(int mode,
-                                               struct CRYPTO_dynlock_value *l,
-                                               const char *file, int line) {
-  return NULL;
+void (*CRYPTO_get_dynlock_lock_callback())(int mode,
+                                           struct CRYPTO_dynlock_value *l,
+                                           const char *file, int line) {
+  return nullptr;
 }
 
-void (*CRYPTO_get_dynlock_destroy_callback(void))(
-    struct CRYPTO_dynlock_value *l, const char *file, int line) {
-  return NULL;
+void (*CRYPTO_get_dynlock_destroy_callback())(struct CRYPTO_dynlock_value *l,
+                                              const char *file, int line) {
+  return nullptr;
 }

data/third_party/boringssl-with-bazel/crypto/thread_none.cc

@@ -16,19 +16,16 @@
 
 #if !defined(OPENSSL_THREADS)
 
-void CRYPTO_MUTEX_init(CRYPTO_MUTEX *lock) {}
 
-void CRYPTO_MUTEX_lock_read(CRYPTO_MUTEX *lock) {}
+using namespace bssl;
 
-void CRYPTO_MUTEX_lock_write(CRYPTO_MUTEX *lock) {}
+void StaticMutex::LockRead() {}
+void StaticMutex::UnlockRead() {}
+void StaticMutex::LockWrite() {}
+void StaticMutex::UnlockWrite() {}
+Mutex::~Mutex() {}
 
-void CRYPTO_MUTEX_unlock_read(CRYPTO_MUTEX *lock) {}
-
-void CRYPTO_MUTEX_unlock_write(CRYPTO_MUTEX *lock) {}
-
-void CRYPTO_MUTEX_cleanup(CRYPTO_MUTEX *lock) {}
-
-void CRYPTO_once(CRYPTO_once_t *once, void (*init)(void)) {
+void bssl::CRYPTO_once(CRYPTO_once_t *once, void (*init)()) {
   if (*once) {
     return;
   }
@@ -38,12 +35,12 @@ void CRYPTO_once(CRYPTO_once_t *once, void (*init)(void)) {
 
 static void *g_thread_locals[NUM_OPENSSL_THREAD_LOCALS];
 
-void *CRYPTO_get_thread_local(thread_local_data_t index) {
+void *bssl::CRYPTO_get_thread_local(thread_local_data_t index) {
   return g_thread_locals[index];
 }
 
-int CRYPTO_set_thread_local(thread_local_data_t index, void *value,
-                            thread_local_destructor_t destructor) {
+int bssl::CRYPTO_set_thread_local(thread_local_data_t index, void *value,
+                                  thread_local_destructor_t destructor) {
   g_thread_locals[index] = value;
   return 1;
 }

data/third_party/boringssl-with-bazel/crypto/thread_pthread.cc

@@ -23,42 +23,27 @@
 #include <stdlib.h>
 #include <string.h>
 
-void CRYPTO_MUTEX_init(CRYPTO_MUTEX *lock) {
-  if (pthread_rwlock_init(lock, NULL) != 0) {
-    abort();
-  }
-}
 
-void CRYPTO_MUTEX_lock_read(CRYPTO_MUTEX *lock) {
-  if (pthread_rwlock_rdlock(lock) != 0) {
-    abort();
-  }
-}
+BSSL_NAMESPACE_BEGIN
 
-void CRYPTO_MUTEX_lock_write(CRYPTO_MUTEX *lock) {
-  if (pthread_rwlock_wrlock(lock) != 0) {
-    abort();
-  }
+void StaticMutex::LockRead() { BSSL_CHECK(pthread_rwlock_rdlock(&lock_) == 0); }
+
+void StaticMutex::UnlockRead() {
+  BSSL_CHECK(pthread_rwlock_unlock(&lock_) == 0);
 }
 
-void CRYPTO_MUTEX_unlock_read(CRYPTO_MUTEX *lock) {
-  if (pthread_rwlock_unlock(lock) != 0) {
-    abort();
-  }
+void StaticMutex::LockWrite() {
+  BSSL_CHECK(pthread_rwlock_wrlock(&lock_) == 0);
 }
 
-void CRYPTO_MUTEX_unlock_write(CRYPTO_MUTEX *lock) {
-  if (pthread_rwlock_unlock(lock) != 0) {
-    abort();
-  }
+void StaticMutex::UnlockWrite() {
+  BSSL_CHECK(pthread_rwlock_unlock(&lock_) == 0);
 }
 
-void CRYPTO_MUTEX_cleanup(CRYPTO_MUTEX *lock) { pthread_rwlock_destroy(lock); }
+Mutex::~Mutex() { pthread_rwlock_destroy(&lock_); }
 
-void CRYPTO_once(CRYPTO_once_t *once, void (*init)(void)) {
-  if (pthread_once(once, init) != 0) {
-    abort();
-  }
+void CRYPTO_once(CRYPTO_once_t *once, void (*init)()) {
+  BSSL_CHECK(pthread_once(once, init) == 0);
 }
 
 static pthread_mutex_t g_destructors_lock = PTHREAD_MUTEX_INITIALIZER;
@@ -67,7 +52,7 @@ static thread_local_destructor_t g_destructors[NUM_OPENSSL_THREAD_LOCALS];
 // thread_local_destructor is called when a thread exits. It releases thread
 // local data for that thread only.
 static void thread_local_destructor(void *arg) {
-  if (arg == NULL) {
+  if (arg == nullptr) {
     return;
   }
 
@@ -81,7 +66,7 @@ static void thread_local_destructor(void *arg) {
   unsigned i;
   void **pointers = reinterpret_cast<void **>(arg);
   for (i = 0; i < NUM_OPENSSL_THREAD_LOCALS; i++) {
-    if (destructors[i] != NULL) {
+    if (destructors[i] != nullptr) {
       destructors[i](pointers[i]);
     }
   }
@@ -93,7 +78,7 @@ static pthread_once_t g_thread_local_init_once = PTHREAD_ONCE_INIT;
 static pthread_key_t g_thread_local_key;
 static int g_thread_local_key_created = 0;
 
-static void thread_local_init(void) {
+static void thread_local_init() {
   g_thread_local_key_created =
       pthread_key_create(&g_thread_local_key, thread_local_destructor) == 0;
 }
@@ -101,13 +86,13 @@ static void thread_local_init(void) {
 void *CRYPTO_get_thread_local(thread_local_data_t index) {
   CRYPTO_once(&g_thread_local_init_once, thread_local_init);
   if (!g_thread_local_key_created) {
-    return NULL;
+    return nullptr;
   }
 
   void **pointers =
       reinterpret_cast<void **>(pthread_getspecific(g_thread_local_key));
-  if (pointers == NULL) {
-    return NULL;
+  if (pointers == nullptr) {
+    return nullptr;
   }
   return pointers[index];
 }
@@ -122,10 +107,10 @@ int CRYPTO_set_thread_local(thread_local_data_t index, void *value,
 
   void **pointers =
       reinterpret_cast<void **>(pthread_getspecific(g_thread_local_key));
-  if (pointers == NULL) {
+  if (pointers == nullptr) {
     pointers = reinterpret_cast<void **>(
         malloc(sizeof(void *) * NUM_OPENSSL_THREAD_LOCALS));
-    if (pointers == NULL) {
+    if (pointers == nullptr) {
       destructor(value);
       return 0;
     }
@@ -148,4 +133,6 @@ int CRYPTO_set_thread_local(thread_local_data_t index, void *value,
   return 1;
 }
 
+BSSL_NAMESPACE_END
+
 #endif  // OPENSSL_PTHREADS