src: simplify NodeBIO::GetMethod initialization

Make its initialization self-contained to avoid unnecessarily breaking encapsulation. PR-URL: #45799 Reviewed-By: Yagiz Nizipli <[email protected]> Reviewed-By: Mohammed Keyvanzadeh <[email protected]> Reviewed-By: Minwoo Jung <[email protected]> Reviewed-By: Tobias Nießen <[email protected]>
nodejs · Dec 13, 2022 · 8a03684 · 8a03684
1 parent b35ebeb
commit 8a03684
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/src/crypto/crypto_bio.cc b/src/crypto/crypto_bio.cc
@@ -223,20 +223,18 @@ long NodeBIO::Ctrl(BIO* bio, int cmd, long num,  // NOLINT(runtime/int)
 
 
 const BIO_METHOD* NodeBIO::GetMethod() {
-  // This is called from InitCryptoOnce() to avoid race conditions during
-  // initialization.
-  static BIO_METHOD* method = nullptr;
-
-  if (method == nullptr) {
-    method = BIO_meth_new(BIO_TYPE_MEM, "node.js SSL buffer");
+  // Static initialization ensures that this is safe to use concurrently.
+  static const BIO_METHOD* method = [&]() {
+    BIO_METHOD* method = BIO_meth_new(BIO_TYPE_MEM, "node.js SSL buffer");
     BIO_meth_set_write(method, Write);
     BIO_meth_set_read(method, Read);
     BIO_meth_set_puts(method, Puts);
     BIO_meth_set_gets(method, Gets);
     BIO_meth_set_ctrl(method, Ctrl);
     BIO_meth_set_create(method, New);
     BIO_meth_set_destroy(method, Free);
-  }
+    return method;
+  }();
 
   return method;
 }

diff --git a/src/crypto/crypto_bio.h b/src/crypto/crypto_bio.h
@@ -182,8 +182,6 @@ class NodeBIO : public MemoryRetainer {
   int eof_return_ = -1;
   Buffer* read_head_ = nullptr;
   Buffer* write_head_ = nullptr;
-
-  friend void node::crypto::InitCryptoOnce();
 };
 
 }  // namespace crypto

diff --git a/src/crypto/crypto_util.cc b/src/crypto/crypto_util.cc
@@ -184,8 +184,6 @@ void InitCryptoOnce() {
   ERR_load_ENGINE_strings();
   ENGINE_load_builtin_engines();
 #endif  // !OPENSSL_NO_ENGINE
-
-  NodeBIO::GetMethod();
 }
 
 void GetFipsCrypto(const FunctionCallbackInfo<Value>& args) {