Skip to content

[v11.x backport] Update openssl to 1.1.1a #25688

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

Closed
sam-github wants to merge 13 commits into from
Closed

[v11.x backport] Update openssl to 1.1.1a #25688

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2d0fc10
deps: upgrade openssl sources to 1.1.1a
sam-github Jan 24, 2019
e78e4c0
deps: fix gyp/gypi for openssl-1.1.1
shigeki May 5, 2018
bc7caaf
deps: fix MacOS and Win build for OpenSSL-1.1.1
shigeki Nov 1, 2018
6c0417e
deps: add s390 asm rules for OpenSSL-1.1.1
shigeki Mar 7, 2018
706deb5
deps: add only avx2 configs for OpenSSL-1.1.1
shigeki Nov 8, 2018
580dc0f
deps: fix for non GNU assembler in AIX
shigeki Nov 15, 2018
1a00628
doc: fix assembler requirement for OpenSSL-1.1.1
shigeki Nov 10, 2018
9cd76e6
deps: update archs files for OpenSSL-1.1.1a
sam-github Jan 24, 2019
45e0616
tls: make ossl 1.1.1 cipher list throw error
sam-github Nov 26, 2018
839f177
tls: workaround handshakedone in renegotiation
shigeki Sep 12, 2018
8ecdc03
test: assert on client and server side seperately
sam-github Jan 7, 2019
6fe20ec
fixup! test: assert on client and server side seperately
sam-github Jan 24, 2019
dffd719
fixup! fixup! test: assert on client and server side seperately
sam-github Jan 25, 2019
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
Prev Previous commit
Next Next commit
tls: workaround handshakedone in renegotiation 
`SSL_CB_HANDSHAKE_START` and `SSL_CB_HANDSHAKE_DONE` are called
sending HelloRequest in OpenSSL-1.1.1.
We need to check whether this is in a renegotiation state or not.

PR-URL: #25381
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org>
  • Loading branch information
@shigeki @sam-github
shigeki authored and sam-github committed Jan 24, 2019
commit 839f177169e8eddf461a63c086af41d0ea8a6b10
5 changes: 4 additions & 1 deletion src/tls_wrap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,10 @@ void TLSWrap::SSLInfoCallback(const SSL* ssl_, int where, int ret) {
}
}

if (where & SSL_CB_HANDSHAKE_DONE) {
// SSL_CB_HANDSHAKE_START and SSL_CB_HANDSHAKE_DONE are called
// sending HelloRequest in OpenSSL-1.1.1.
// We need to check whether this is in a renegotiation state or not.
if (where & SSL_CB_HANDSHAKE_DONE && !SSL_renegotiate_pending(ssl)) {
Local<Value> callback;

c->established_ = true;
Expand Down