fixup! src: move crypto bio stuff to ncrypto

nodejs · Aug 11, 2024 · ca3dbce · ca3dbce
1 parent dd31314
commit ca3dbce
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/src/crypto/crypto_bio.cc b/src/crypto/crypto_bio.cc
@@ -43,9 +43,9 @@ BIOPointer NodeBIO::New(Environment* env) {
 BIOPointer NodeBIO::NewFixed(const char* data, size_t len, Environment* env) {
   BIOPointer bio = New(env);
 
-  if (!bio ||
-      len > INT_MAX ||
-      BIOPointer::Write(&bio, std::string_view(data, len)) != static_cast<int>(len) ||
+  if (!bio || len > INT_MAX ||
+      BIOPointer::Write(&bio, std::string_view(data, len)) !=
+          static_cast<int>(len) ||
       BIO_set_mem_eof_return(bio.get(), 0) != 1) {
     return BIOPointer();
   }

diff --git a/src/crypto/crypto_common.cc b/src/crypto/crypto_common.cc
@@ -466,7 +466,8 @@ MaybeLocal<Value> GetExponentString(
     const BIOPointer& bio,
     const BIGNUM* e) {
   uint64_t exponent_word = static_cast<uint64_t>(BignumPointer::GetWord(e));
-  BIOPointer::Printf(const_cast<BIOPointer*>(&bio), "0x%" PRIx64, exponent_word);
+  BIOPointer::Printf(
+      const_cast<BIOPointer*>(&bio), "0x%" PRIx64, exponent_word);
   return ToV8Value(env, bio);
 }
 

diff --git a/src/crypto/crypto_context.cc b/src/crypto/crypto_context.cc
@@ -68,7 +68,8 @@ BIOPointer LoadBIO(Environment* env, Local<Value> v) {
     if (!bio) return {};
     ByteSource bsrc = ByteSource::FromStringOrBuffer(env, v);
     if (bsrc.size() > INT_MAX) return {};
-    int written = BIOPointer::Write(&bio, std::string_view(bsrc.data<char>(), bsrc.size()));
+    int written = BIOPointer::Write(
+        &bio, std::string_view(bsrc.data<char>(), bsrc.size()));
     if (written < 0) return {};
     if (static_cast<size_t>(written) != bsrc.size()) return {};
     return bio;

diff --git a/src/crypto/crypto_keys.cc b/src/crypto/crypto_keys.cc
@@ -270,10 +270,9 @@ ParseKeyResult ParsePrivateKey(EVPKeyPointer* pkey,
   return ParseKeyResult::kParseKeyFailed;
 }
 
-MaybeLocal<Value> BIOToStringOrBuffer(
-    Environment* env,
-    const BIOPointer& bio,
-    PKFormatType format) {
+MaybeLocal<Value> BIOToStringOrBuffer(Environment* env,
+                                      const BIOPointer& bio,
+                                      PKFormatType format) {
   BUF_MEM* bptr = bio;
   if (format == kKeyFormatPEM) {
     // PEM is an ASCII format, so we will return it as a string.

diff --git a/src/crypto/crypto_tls.cc b/src/crypto/crypto_tls.cc
@@ -21,12 +21,12 @@
 
 #include "crypto/crypto_tls.h"
 #include <cstdio>
-#include "crypto/crypto_context.h"
-#include "crypto/crypto_common.h"
-#include "crypto/crypto_util.h"
+#include "async_wrap-inl.h"
 #include "crypto/crypto_bio.h"
 #include "crypto/crypto_clienthello-inl.h"
-#include "async_wrap-inl.h"
+#include "crypto/crypto_common.h"
+#include "crypto/crypto_context.h"
+#include "crypto/crypto_util.h"
 #include "debug_utils-inl.h"
 #include "memory_tracker-inl.h"
 #include "node_buffer.h"