diff options
author | Daniel Bevenius <daniel.bevenius@gmail.com> | 2017-06-28 09:30:30 +0200 |
---|---|---|
committer | Daniel Bevenius <daniel.bevenius@gmail.com> | 2017-06-30 07:23:25 +0200 |
commit | 08109a3ca12ddcd86167aa88e697cfed5923326d (patch) | |
tree | 7fa1090f79175ddcd4037f6f65f251bf05467c50 /src/tls_wrap.cc | |
parent | 93683c616b57dfa76521f184093c0610da7f52c7 (diff) | |
download | android-node-v8-08109a3ca12ddcd86167aa88e697cfed5923326d.tar.gz android-node-v8-08109a3ca12ddcd86167aa88e697cfed5923326d.tar.bz2 android-node-v8-08109a3ca12ddcd86167aa88e697cfed5923326d.zip |
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 <refack@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'src/tls_wrap.cc')
-rw-r--r-- | src/tls_wrap.cc | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc index 351f8a34fe..f03dbd7fd6 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<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); |