From ef67f7c8ca20bed49392a78e0075e051d933c11b Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Wed, 28 Jun 2017 09:30:30 +0200 Subject: [PATCH] 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: https://github.com/nodejs/node/pull/13957 Reviewed-By: Refael Ackermann Reviewed-By: Colin Ihrig Reviewed-By: Ben Noordhuis Reviewed-By: James M Snell --- src/node_crypto_bio.cc | 2 ++ src/node_crypto_bio.h | 2 ++ src/node_crypto_clienthello-inl.h | 2 ++ src/node_crypto_clienthello.cc | 2 ++ src/node_crypto_clienthello.h | 2 ++ src/tls_wrap.cc | 24 +++++++++++++----------- src/tls_wrap.h | 4 ++-- 7 files changed, 25 insertions(+), 13 deletions(-) diff --git a/src/node_crypto_bio.cc b/src/node_crypto_bio.cc index 3084e50d24cf4b..00fd0b420c38c5 100644 --- a/src/node_crypto_bio.cc +++ b/src/node_crypto_bio.cc @@ -27,6 +27,7 @@ #include namespace node { +namespace crypto { const BIO_METHOD NodeBIO::method = { BIO_TYPE_MEM, @@ -488,4 +489,5 @@ NodeBIO::~NodeBIO() { write_head_ = nullptr; } +} // namespace crypto } // namespace node diff --git a/src/node_crypto_bio.h b/src/node_crypto_bio.h index 4699d1e6e342a4..5deac922323808 100644 --- a/src/node_crypto_bio.h +++ b/src/node_crypto_bio.h @@ -32,6 +32,7 @@ #include "v8.h" namespace node { +namespace crypto { class NodeBIO { public: @@ -156,6 +157,7 @@ class NodeBIO { Buffer* write_head_; }; +} // namespace crypto } // namespace node #endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS diff --git a/src/node_crypto_clienthello-inl.h b/src/node_crypto_clienthello-inl.h index 4044b0cde246df..5569b2951e9eee 100644 --- a/src/node_crypto_clienthello-inl.h +++ b/src/node_crypto_clienthello-inl.h @@ -28,6 +28,7 @@ #include "util-inl.h" namespace node { +namespace crypto { inline void ClientHelloParser::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 diff --git a/src/node_crypto_clienthello.cc b/src/node_crypto_clienthello.cc index 794d877e387258..65b5dff7f74447 100644 --- a/src/node_crypto_clienthello.cc +++ b/src/node_crypto_clienthello.cc @@ -23,6 +23,7 @@ #include "node_crypto_clienthello-inl.h" namespace node { +namespace crypto { void ClientHelloParser::Parse(const uint8_t* data, size_t avail) { switch (state_) { @@ -244,4 +245,5 @@ bool ClientHelloParser::ParseTLSClientHello(const uint8_t* data, size_t avail) { return true; } +} // namespace crypto } // namespace node diff --git a/src/node_crypto_clienthello.h b/src/node_crypto_clienthello.h index e52d6c3f9f8358..3ae5452de38c8d 100644 --- a/src/node_crypto_clienthello.h +++ b/src/node_crypto_clienthello.h @@ -30,6 +30,7 @@ #include // nullptr namespace node { +namespace crypto { class ClientHelloParser { public: @@ -133,6 +134,7 @@ class ClientHelloParser { const uint8_t* tls_ticket_; }; +} // namespace crypto } // namespace node #endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc index 351f8a34fe0884..f03dbd7fd650d8 100644 --- a/src/tls_wrap.cc +++ b/src/tls_wrap.cc @@ -138,10 +138,10 @@ void TLSWrap::NewSessionDoneCb() { void TLSWrap::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,7 +170,7 @@ void TLSWrap::InitSSL() { SSL_set_accept_state(ssl_); } else if (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 @@ -178,7 +178,7 @@ void TLSWrap::InitSSL() { } // Initialize ring for queud clear data - clear_in_ = new NodeBIO(); + clear_in_ = new crypto::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 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::OnClientHello, OnClientHelloParseEnd, wrap); diff --git a/src/tls_wrap.h b/src/tls_wrap.h index 19633ea8667fff..9d559f7a721ea6 100644 --- a/src/tls_wrap.h +++ b/src/tls_wrap.h @@ -38,10 +38,10 @@ namespace node { // Forward-declarations -class NodeBIO; class WriteWrap; namespace crypto { class SecureContext; +class NodeBIO; } class TLSWrap : public AsyncWrap, @@ -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 WriteItemList; WriteItemList write_item_queue_;