diff --git a/lib/net.js b/lib/net.js index 4f32dc1eba..2382035fac 100644 --- a/lib/net.js +++ b/lib/net.js @@ -322,15 +322,15 @@ function setImplmentationMethods (self) { assert(buf); assert(self.secure); - var bytesWritten = self.secureStream.writeInject(buf, off, len); + var bytesWritten = self.secureStream.clearIn(buf, off, len); if (!securePool) { allocNewSecurePool(); } - var secureLen = self.secureStream.writeExtract(securePool, - 0, - securePool.length); + var secureLen = self.secureStream.encOut(securePool, + 0, + securePool.length); if (secureLen == -1) { // Check our read again for secure handshake @@ -363,15 +363,15 @@ function setImplmentationMethods (self) { if (calledByIOWatcher) { secureBytesRead = oldRead(securePool, 0, securePool.length); - self.secureStream.readInject(securePool, 0, secureBytesRead); + self.secureStream.encIn(securePool, 0, secureBytesRead); } var chunkBytes; do { chunkBytes = - self.secureStream.readExtract(pool, - pool.used + bytesRead, - pool.length - pool.used - bytesRead); + self.secureStream.clearOut(pool, + pool.used + bytesRead, + pool.length - pool.used - bytesRead); bytesRead += chunkBytes; } while ((chunkBytes > 0) && (pool.used + bytesRead < pool.length)); @@ -379,7 +379,7 @@ function setImplmentationMethods (self) { return -1; } - if (self.secureStream.readPending()) { + if (self.secureStream.clearPending()) { process.nextTick(function () { if (self._readWatcher) self._readWatcher.callback(); }); @@ -426,7 +426,7 @@ function setImplmentationMethods (self) { allocNewSecurePool(); } - var secureLen = self.secureStream.writeExtract( + var secureLen = self.secureStream.encOut( securePool, 0, securePool.length ); diff --git a/src/node_crypto.cc b/src/node_crypto.cc index 9ea5e8e5b7..526993668f 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -238,18 +238,18 @@ void SecureStream::Initialize(Handle target) { t->InstanceTemplate()->SetInternalFieldCount(1); t->SetClassName(String::NewSymbol("SecureStream")); - NODE_SET_PROTOTYPE_METHOD(t, "readInject", - SecureStream::ReadInject); - NODE_SET_PROTOTYPE_METHOD(t, "readExtract", - SecureStream::ReadExtract); - NODE_SET_PROTOTYPE_METHOD(t, "writeInject", - SecureStream::WriteInject); - NODE_SET_PROTOTYPE_METHOD(t, "writeExtract", - SecureStream::WriteExtract); - NODE_SET_PROTOTYPE_METHOD(t, "readPending", - SecureStream::ReadPending); - NODE_SET_PROTOTYPE_METHOD(t, "writeCanExtract", - SecureStream::WriteCanExtract); + NODE_SET_PROTOTYPE_METHOD(t, "encIn", + SecureStream::EncIn); + NODE_SET_PROTOTYPE_METHOD(t, "clearOut", + SecureStream::ClearOut); + NODE_SET_PROTOTYPE_METHOD(t, "clearIn", + SecureStream::ClearIn); + NODE_SET_PROTOTYPE_METHOD(t, "encOut", + SecureStream::EncOut); + NODE_SET_PROTOTYPE_METHOD(t, "clearPending", + SecureStream::ClearPending); + NODE_SET_PROTOTYPE_METHOD(t, "encPending", + SecureStream::EncPending); NODE_SET_PROTOTYPE_METHOD(t, "getPeerCertificate", SecureStream::GetPeerCertificate); NODE_SET_PROTOTYPE_METHOD(t, "isInitFinished", @@ -308,7 +308,7 @@ Handle SecureStream::New(const Arguments& args) { } -Handle SecureStream::ReadInject(const Arguments& args) { +Handle SecureStream::EncIn(const Arguments& args) { HandleScope scope; SecureStream *ss = ObjectWrap::Unwrap(args.Holder()); @@ -350,7 +350,7 @@ Handle SecureStream::ReadInject(const Arguments& args) { } -Handle SecureStream::ReadExtract(const Arguments& args) { +Handle SecureStream::ClearOut(const Arguments& args) { HandleScope scope; SecureStream *ss = ObjectWrap::Unwrap(args.Holder()); @@ -417,7 +417,7 @@ Handle SecureStream::ReadExtract(const Arguments& args) { } -Handle SecureStream::ReadPending(const Arguments& args) { +Handle SecureStream::ClearPending(const Arguments& args) { HandleScope scope; SecureStream *ss = ObjectWrap::Unwrap(args.Holder()); @@ -426,7 +426,7 @@ Handle SecureStream::ReadPending(const Arguments& args) { } -Handle SecureStream::WriteCanExtract(const Arguments& args) { +Handle SecureStream::EncPending(const Arguments& args) { HandleScope scope; SecureStream *ss = ObjectWrap::Unwrap(args.Holder()); @@ -435,7 +435,7 @@ Handle SecureStream::WriteCanExtract(const Arguments& args) { } -Handle SecureStream::WriteExtract(const Arguments& args) { +Handle SecureStream::EncOut(const Arguments& args) { HandleScope scope; SecureStream *ss = ObjectWrap::Unwrap(args.Holder()); @@ -472,7 +472,7 @@ Handle SecureStream::WriteExtract(const Arguments& args) { } -Handle SecureStream::WriteInject(const Arguments& args) { +Handle SecureStream::ClearIn(const Arguments& args) { HandleScope scope; SecureStream *ss = ObjectWrap::Unwrap(args.Holder()); diff --git a/src/node_crypto.h b/src/node_crypto.h index 617c0de02e..4ecde41140 100644 --- a/src/node_crypto.h +++ b/src/node_crypto.h @@ -51,12 +51,12 @@ class SecureStream : ObjectWrap { protected: static v8::Handle New(const v8::Arguments& args); - static v8::Handle ReadInject(const v8::Arguments& args); - static v8::Handle ReadExtract(const v8::Arguments& args); - static v8::Handle ReadPending(const v8::Arguments& args); - static v8::Handle WriteCanExtract(const v8::Arguments& args); - static v8::Handle WriteExtract(const v8::Arguments& args); - static v8::Handle WriteInject(const v8::Arguments& args); + static v8::Handle EncIn(const v8::Arguments& args); + static v8::Handle ClearOut(const v8::Arguments& args); + static v8::Handle ClearPending(const v8::Arguments& args); + static v8::Handle EncPending(const v8::Arguments& args); + static v8::Handle EncOut(const v8::Arguments& args); + static v8::Handle ClearIn(const v8::Arguments& args); static v8::Handle GetPeerCertificate(const v8::Arguments& args); static v8::Handle IsInitFinished(const v8::Arguments& args); static v8::Handle VerifyPeer(const v8::Arguments& args);