Skip to content

Release 1.8.4 (wrong branch target) #2145

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
Fishrock123 wants to merge 47 commits into from
Closed

Release 1.8.4 (wrong branch target) #2145

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
7ada680
tls: destroy SSL once it is out of use
indutny Apr 26, 2015
74060bb
crypto: track external memory for SSL structures
indutny Apr 26, 2015
1cfc455
tls: zero SSL_CTX freelist for a singleUse socket
indutny Apr 26, 2015
b72e4bc
tls: destroy singleUse context immediately
indutny Apr 27, 2015
ba0e744
deps: upgrade npm to 2.9.0
othiym23 May 1, 2015
f10f379
deps: make node-gyp work with io.js
cjihrig May 1, 2015
0eb74a8
win,node-gyp: optionally allow node.exe/iojs.exe to be renamed
piscisaureus May 1, 2015
71274b0
tls_wrap: use localhost if options.host is empty
sitegui Apr 21, 2015
5896fe5
test: adjust Makefile/test-ci, add to vcbuild.bat
rvagg Apr 26, 2015
65dd10e
build: remove -J from test-ci
rvagg Apr 28, 2015
898d423
string_decoder: don't cache Buffer.isEncoding
mscdex Apr 28, 2015
4030545
fs: validate fd on fs.write
julianduque Apr 28, 2015
32a6dbc
test: extend timeouts for ARMv6
rvagg Apr 29, 2015
ca63d68
2015-05-17 io.js v1.8.2 Release
rvagg May 18, 2015
1e758e0
Working on v1.8.3
rvagg May 18, 2015
77f5184
win,node-gyp: make delay-load hook C89 compliant
cosmosgenius Apr 26, 2015
2a3367a
deps: upgrade openssl sources to 1.0.2b
Jun 11, 2015
d593b55
deps: fix openssl assembly error on ia32 win32
indutny Jan 8, 2014
2836428
deps: fix asm build error of openssl in x86_win32
Feb 13, 2015
2cd7f73
openssl: fix keypress requirement in apps on win32
Feb 17, 2015
139da6a
deps: add -no_rand_screen to openssl s_client
May 27, 2015
151720f
deps: replace all headers in openssl
Jun 11, 2015
1feaa68
deps: update asm files for openssl-1.0.2b
Jun 11, 2015
c65484a
tls: make server not use DHE in less than 1024bits
May 20, 2015
e548abb
deps: upgrade openssl sources to 1.0.2c
Jun 12, 2015
b2467e3
deps: fix openssl assembly error on ia32 win32
indutny Jan 8, 2014
a472946
deps: fix asm build error of openssl in x86_win32
Feb 13, 2015
5c29c0c
openssl: fix keypress requirement in apps on win32
Feb 17, 2015
310b8d1
deps: add -no_rand_screen to openssl s_client
May 27, 2015
0e2d068
deps: replace all headers in openssl
Jun 12, 2015
a971255
deps: update UPGRADING.md doc to openssl-1.0.2c
Jun 11, 2015
c5d1ec7
build: simplify execution of built binary
jbergstroem Jun 12, 2015
e52e990
build: don't run lint from test-ci
jbergstroem Jun 13, 2015
8e1134c
build: remove lint from test-ci on windows
jbergstroem Jun 17, 2015
2ce1475
build,win: set env before generating projects
orangemocha Apr 23, 2015
561919a
build: add MSVS 2015 support
rvagg Apr 16, 2015
39e2207
build: fix cherry-pick ooops, fix comment wording
rvagg Jun 23, 2015
00ba429
build: update build targets for io.js
rvagg Jun 10, 2015
83ee07b
deps: copy all openssl header files to include dir
Jun 19, 2015
d8f260d
build: add tar-headers target for headers-only tar
rvagg Jun 14, 2015
78de5f8
deps: fix out-of-band write in utf8 decoder
bnoordhuis Jul 4, 2015
766a3b4
2015-07-04 io.js v1.8.3 Release
rvagg Jul 4, 2015
03c105a
Working on v1.8.4
rvagg Jul 4, 2015
20ff1e2
deps: upgrade openssl sources to 1.0.2d
Jul 9, 2015
52b1230
deps: update deps/openssl/conf/arch/*/opensslconf.h
Jul 9, 2015
2ea2049
2015-07-09 io.js v1.8.4 Release
Fishrock123 Jul 9, 2015
fa9c769
Working on v1.8.5
Fishrock123 Jul 9, 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
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
PR-URL: #1836
Reviewed-By: Ben Noordhuis <[email protected]>
  • Loading branch information
Shigeki Ohtsu committed Jun 12, 2015
commit 310b8d11207bbcc1c98ee7e7c39d650c00823a16
14 changes: 10 additions & 4 deletions 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,10 +124,16 @@ int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn)
char buffer[200];

#ifdef OPENSSL_SYS_WINDOWS
BIO_printf(bio_e, "Loading 'screen' into random state -");
BIO_flush(bio_e);
RAND_screen();
BIO_printf(bio_e, " done\n");
/*
* 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 @@ -448,6 +449,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 @@ -1127,6 +1132,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 @@ -1232,7 +1241,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