src: move crypto_bio/clienthello to crypto ns

Currently, node_crypto_bio and node_crypto_clienthello are not in the crypto namespace but simply in the node namespace. Not sure if this was intentional or not, but I think it would make sense to move them to be consistent. PR-URL: #13957 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: James M Snell <[email protected]>

Author: danbev

src/node_crypto_bio.cc

@@ -27,6 +27,7 @@
 #include<string.h>
 
 namespacenode{
+namespacecrypto{
 
 const BIO_METHOD NodeBIO::method ={
  BIO_TYPE_MEM,
@@ -488,4 +489,5 @@ NodeBIO::~NodeBIO(){
  write_head_ = nullptr;
 }
 
+} // namespace crypto
 } // namespace node

src/node_crypto_bio.h

@@ -32,6 +32,7 @@
 #include"v8.h"
 
 namespacenode{
+namespacecrypto{
 
 classNodeBIO{
 public:
@@ -156,6 +157,7 @@ class NodeBIO{
  Buffer* write_head_;
 };
 
+} // namespace crypto
 } // namespace node
 
 #endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

src/node_crypto_clienthello-inl.h

@@ -28,6 +28,7 @@
 #include"util-inl.h"
 
 namespacenode{
+namespacecrypto{
 
 inlinevoidClientHelloParser::Reset(){
  frame_len_ = 0;
@@ -74,6 +75,7 @@ inline bool ClientHelloParser::IsPaused() const{
 return state_ == kPaused;
 }
 
+} // namespace crypto
 } // namespace node
 
 #endif// defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

src/node_crypto_clienthello.cc

@@ -23,6 +23,7 @@
 #include"node_crypto_clienthello-inl.h"
 
 namespacenode{
+namespacecrypto{
 
 voidClientHelloParser::Parse(constuint8_t* data, size_t avail){
 switch (state_){
@@ -244,4 +245,5 @@ bool ClientHelloParser::ParseTLSClientHello(const uint8_t* data, size_t avail){
 returntrue;
 }
 
+} // namespace crypto
 } // namespace node

src/node_crypto_clienthello.h

@@ -30,6 +30,7 @@
 #include<stdlib.h>// nullptr
 
 namespacenode{
+namespacecrypto{
 
 classClientHelloParser{
 public:
@@ -133,6 +134,7 @@ class ClientHelloParser{
 constuint8_t* tls_ticket_;
 };
 
+} // namespace crypto
 } // namespace node
 
 #endif// defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

src/tls_wrap.cc

@@ -138,10 +138,10 @@ void TLSWrap::NewSessionDoneCb(){
 
 voidTLSWrap::InitSSL(){
 // Initialize SSL
- enc_in_ = NodeBIO::New();
- enc_out_ = NodeBIO::New();
-NodeBIO::FromBIO(enc_in_)->AssignEnvironment(env());
-NodeBIO::FromBIO(enc_out_)->AssignEnvironment(env());
+ enc_in_ = crypto::NodeBIO::New();
+ enc_out_ = crypto::NodeBIO::New();
+crypto::NodeBIO::FromBIO(enc_in_)->AssignEnvironment(env());
+crypto::NodeBIO::FromBIO(enc_out_)->AssignEnvironment(env());
 
 SSL_set_bio(ssl_, enc_in_, enc_out_);
 
@@ -170,15 +170,15 @@ void TLSWrap::InitSSL(){
 SSL_set_accept_state(ssl_);
  } elseif (is_client()){
 // Enough space for server response (hello, cert)
-NodeBIO::FromBIO(enc_in_)->set_initial(kInitialClientBufferLength);
+crypto::NodeBIO::FromBIO(enc_in_)->set_initial(kInitialClientBufferLength);
 SSL_set_connect_state(ssl_);
  } else{
 // Unexpected
 ABORT();
  }
 
 // Initialize ring for queud clear data
- clear_in_ = newNodeBIO();
+ clear_in_ = newcrypto::NodeBIO();
  clear_in_->AssignEnvironment(env());
 }
 
@@ -310,7 +310,9 @@ void TLSWrap::EncOut(){
 char* data[kSimultaneousBufferCount];
 size_t size[arraysize(data)];
 size_t count = arraysize(data);
- write_size_ = NodeBIO::FromBIO(enc_out_)->PeekMultiple(data, size, &count);
+ write_size_ = crypto::NodeBIO::FromBIO(enc_out_)->PeekMultiple(data,
+ size,
+ &count);
 CHECK(write_size_ != 0 && count != 0);
 
  Local<Object> req_wrap_obj =
@@ -356,7 +358,7 @@ void TLSWrap::EncOutCb(WriteWrap* req_wrap, int status){
  }
 
 // Commit
-NodeBIO::FromBIO(wrap->enc_out_)->Read(nullptr, wrap->write_size_);
+crypto::NodeBIO::FromBIO(wrap->enc_out_)->Read(nullptr, wrap->write_size_);
 
 // Ensure that the progress will be made and `InvokeQueued` will be called.
  wrap->ClearIn();
@@ -674,7 +676,7 @@ void TLSWrap::OnAllocImpl(size_t suggested_size, uv_buf_t* buf, void* ctx){
  }
 
 size_t size = 0;
- buf->base = NodeBIO::FromBIO(wrap->enc_in_)->PeekWritable(&size);
+ buf->base = crypto::NodeBIO::FromBIO(wrap->enc_in_)->PeekWritable(&size);
  buf->len = size;
 }
 
@@ -737,7 +739,7 @@ void TLSWrap::DoRead(ssize_t nread,
  }
 
 // Commit read data
- NodeBIO* enc_in = NodeBIO::FromBIO(enc_in_);
+crypto::NodeBIO* enc_in = crypto::NodeBIO::FromBIO(enc_in_);
  enc_in->Commit(nread);
 
 // Parse ClientHello first
@@ -808,7 +810,7 @@ void TLSWrap::EnableSessionCallbacks(
 "EnableSessionCallbacks after destroySSL");
  }
  wrap->enable_session_callbacks();
-NodeBIO::FromBIO(wrap->enc_in_)->set_initial(kMaxHelloLength);
+crypto::NodeBIO::FromBIO(wrap->enc_in_)->set_initial(kMaxHelloLength);
  wrap->hello_parser_.Start(SSLWrap<TLSWrap>::OnClientHello,
  OnClientHelloParseEnd,
  wrap);

src/tls_wrap.h

@@ -38,10 +38,10 @@
 namespacenode{
 
 // Forward-declarations
-classNodeBIO;
 classWriteWrap;
 namespacecrypto{
 classSecureContext;
+classNodeBIO;
 }
 
 classTLSWrap : publicAsyncWrap,
@@ -172,7 +172,7 @@ class TLSWrap : public AsyncWrap,
  StreamBase* stream_;
  BIO* enc_in_;
  BIO* enc_out_;
- NodeBIO* clear_in_;
+crypto::NodeBIO* clear_in_;
 size_t write_size_;
 typedef ListHead<WriteItem, &WriteItem::member_> WriteItemList;
  WriteItemList write_item_queue_;