Skip to content

v8.16.2 proposal #29617

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

Merged
BethGriggs merged 25 commits into from
Oct 9, 2019
Merged

v8.16.2 proposal #29617

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
930647d
test: skip tests related to CI failures on AIX
sam-github Jun 28, 2019
588b761
test: skip stringbytes-external-exceed-max on AIX
sam-github Jul 2, 2019
7aca9cb
test: fix pty test hangs on aix
bnoordhuis Jul 8, 2019
65e9b0f
test: specialize OOM check for AIX
sam-github Jul 24, 2019
a7e5fe1
test: unskip tests that now pass on AIX
sam-github Aug 8, 2019
37e24b1
deps: V8: backport d520ebb
targos Apr 23, 2019
529b2ad
tools: update certdata.txt
sam-github Dec 18, 2018
4fbadf6
tools: update certdata.txt
sam-github Apr 23, 2019
c582fef
tools: update certdata.txt
sam-github Jul 22, 2019
b2a6b32
crypto: update root certificates
sam-github Dec 18, 2018
347fcd3
crypto: update root certificates
sam-github Apr 23, 2019
d57f797
tls: partially backport pull request #26415
bnoordhuis Aug 15, 2019
cc9d005
crypto: update root certificates
sam-github Jul 22, 2019
3ee076f
stream: ensure writable.destroy() emits error once
lpinca Feb 12, 2019
dc9d645
deps: upgrade openssl sources to 1.0.2s
sam-github Jun 14, 2019
da99d3f
deps: copy all openssl header files to include dir
sam-github Jun 14, 2019
87eee99
deps: fix openssl assembly error on ia32 win32
indutny Jan 8, 2014
9663ae3
deps: fix asm build error of openssl in x86_win32
Feb 13, 2015
dd28596
openssl: fix keypress requirement in apps on win32
Feb 17, 2015
5682e50
deps: add -no_rand_screen to openssl s_client
May 27, 2015
1a5dc6a
http: check for existance in resetHeadersTimeoutOnReqEnd
mcollina Mar 2, 2019
92a2f8b
test,win: cleanup exec-timeout processes
joaocgreis Jul 16, 2019
559a8e3
http2: do not crash on stream listener removal w/ destroyed session
addaleax Sep 5, 2019
e45b6a3
http2: do not start reading after write if new write is on wire
addaleax Sep 1, 2019
4efffd5
2019-10-09, Version 8.16.2 'Carbon' (LTS)
BethGriggs Sep 19, 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
deps: add -no_rand_screen to openssl s_client 
In openssl s_client on Windows, RAND_screen() is invoked to initialize
random state but it takes several seconds in each connection.
This added -no_rand_screen to openssl s_client on Windows to skip
RAND_screen() and gets a better performance in the unit test of
test-tls-server-verify.
Do not enable this except to use in the unit test.

Fixes: #1461
Backport-PR-URL: #28230
PR-URL: #1836
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
  • Loading branch information
@BethGriggs
Shigeki Ohtsu authored and BethGriggs committed Sep 19, 2019
commit 5682e503255432fc2ebf0dbc4d9a0dd2055a1a2e
11 changes: 10 additions & 1 deletion deps/openssl/openssl/apps/app_rand.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,16 @@ int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn)
char buffer[200];

#ifdef OPENSSL_SYS_WINDOWS
RAND_screen();
/*
* allocate 2 to dont_warn not to use RAND_screen() via
* -no_rand_screen option in s_client
*/
if (dont_warn != 2) {
BIO_printf(bio_e, "Loading 'screen' into random state -");
BIO_flush(bio_e);
RAND_screen();
BIO_printf(bio_e, " done\n");
}
#endif

if (file == NULL)
Expand Down
11 changes: 10 additions & 1 deletion deps/openssl/openssl/apps/s_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ static BIO *bio_c_msg = NULL;
static int c_quiet = 0;
static int c_ign_eof = 0;
static int c_brief = 0;
static int c_no_rand_screen = 0;

#ifndef OPENSSL_NO_PSK
/* Default PSK identity and key */
Expand Down Expand Up @@ -451,6 +452,10 @@ static void sc_usage(void)
" -keymatexport label - Export keying material using label\n");
BIO_printf(bio_err,
" -keymatexportlen len - Export len bytes of keying material (default 20)\n");
#ifdef OPENSSL_SYS_WINDOWS
BIO_printf(bio_err,
" -no_rand_screen - Do not use RAND_screen() to initialize random state\n");
#endif
}

#ifndef OPENSSL_NO_TLSEXT
Expand Down Expand Up @@ -1144,6 +1149,10 @@ int MAIN(int argc, char **argv)
keymatexportlen = atoi(*(++argv));
if (keymatexportlen == 0)
goto bad;
#ifdef OPENSSL_SYS_WINDOWS
} else if (strcmp(*argv, "-no_rand_screen") == 0) {
c_no_rand_screen = 1;
#endif
} else {
BIO_printf(bio_err, "unknown option %s\n", *argv);
badop = 1;
Expand Down Expand Up @@ -1260,7 +1269,7 @@ int MAIN(int argc, char **argv)
if (!load_excert(&exc, bio_err))
goto end;

if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL
if (!app_RAND_load_file(NULL, bio_err, ++c_no_rand_screen) && inrand == NULL
&& !RAND_status()) {
BIO_printf(bio_err,
"warning, not much extra random data, consider using the -rand option\n");
Expand Down