Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TLSCallbacks => TLSWrap, better TLS inception #840

Closed
wants to merge 41 commits into from
Closed

TLSCallbacks => TLSWrap, better TLS inception #840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
2a9da69
stream_wrap: introduce StreamBase base class
indutny Feb 10, 2015
2e4ceb2
stream_base: do not require extra internal field
indutny Feb 10, 2015
100f9bd
stream_base: specialize interface methods
indutny Feb 10, 2015
5298490
stream_wrap: remove WriteStringImpl
indutny Feb 10, 2015
e9def28
stream_base: move Shutdown to StreamBase
indutny Feb 10, 2015
605775c
stream_base: move away WriteBuffer
indutny Feb 10, 2015
16e33d4
stream_base: move Writev/WriteString
indutny Feb 10, 2015
ddd5d28
stream_base: DoAlloc
indutny Feb 11, 2015
48c1ff6
stream_base: DoRead
indutny Feb 11, 2015
924b327
stream_base: move to callbacks
indutny Feb 11, 2015
96cfde6
tls_wrap: rewrite (wip)
indutny Feb 11, 2015
fd7243f
tls_wrap: minor fixes
indutny Feb 11, 2015
c7c9247
stream_base: better Consume() API
indutny Feb 12, 2015
8801cc3
stream_base: save progress
indutny Feb 12, 2015
1fe7d75
src: fix build
indutny Feb 12, 2015
11d8877
src: save progress
indutny Feb 12, 2015
445b0fc
src: fix build
indutny Feb 12, 2015
b827305
stream_base: OnData!
indutny Feb 12, 2015
ab64ce6
tls_wrap: add proper methods
indutny Feb 12, 2015
24a9ae6
stream_base: use GetParent()
indutny Feb 12, 2015
372b986
stream_base: moar fixes
indutny Feb 12, 2015
22eafaf
stream_base: proper interfaces
indutny Feb 12, 2015
025ed30
tls_wrap: invoke OnData on self
indutny Feb 13, 2015
312bd56
tls_wrap.js: use new wrapping
indutny Feb 13, 2015
15033d0
tls_wrap.js: fix tls.connect
indutny Feb 13, 2015
bd78b94
javascript test fixes
indutny Feb 13, 2015
7b7bec6
tls_wrap: fix Receive
indutny Feb 13, 2015
0c9e1a2
tls_wrap: allow wrapping TLSWrap
indutny Feb 13, 2015
cac9cd7
tls_wrap: fix inception test
indutny Feb 13, 2015
eadd63e
test: fix multi-key test, _handle disappears
indutny Feb 13, 2015
62c7c74
stream_base: last fixes, hopefuly
indutny Feb 13, 2015
a2f0e57
tls_wrap: return of this.ssl
indutny Feb 13, 2015
bcbad15
tls_wrap.js: result=>socket
indutny Feb 13, 2015
f8d5779
stream_base: remove GetObject()
indutny Feb 15, 2015
659d0cb
stream_base: fix lint errors
indutny Feb 15, 2015
59cd1f2
tls_wrap: support reading in parts
indutny Feb 16, 2015
ce0e7a4
stream_base: OnData => EmitData
indutny Feb 16, 2015
259c236
net: remove commented code
indutny Feb 16, 2015
9f409e5
stream_base: move SetBlocking to StreamWrap
indutny Feb 16, 2015
2231333
node_crypto: fix
indutny Feb 20, 2015
07025b7
stream_base: remove TODO
indutny Feb 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/_tls_legacy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,11 @@ function onCryptoStreamFinish() {
// Generate close notify
// NOTE: first call checks if client has sent us shutdown,
// second call enqueues shutdown into the BIO.
if (this.pair.ssl.shutdown() !== 1) {
if (this.pair.ssl.shutdownSSL() !== 1) {
if (this.pair.ssl && this.pair.ssl.error)
return this.pair.error();

this.pair.ssl.shutdown();
this.pair.ssl.shutdownSSL();
}

if (this.pair.ssl && this.pair.ssl.error)
Expand Down
Loading