Skip to content

Upgrade to openssl-1.0.1u for v0.10 #8722

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

Upgrade to openssl-1.0.1u for v0.10 #8722

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7f44ecf
build: turn on -fno-delete-null-pointer-checks
bnoordhuis May 13, 2016
659be80
deps: upgrade openssl sources to 1.0.1u
shigeki Sep 22, 2016
1a38468
deps: copy all openssl header files to include dir
shigeki Sep 22, 2016
7e2fc13
deps: separate sha256/sha512-x86_64.pl for openssl
Mar 18, 2015
5981ca8
deps: fix openssl assembly error on ia32 win32
indutny Jan 8, 2014
46dbc38
openssl: fix keypress requirement in apps on win32
Feb 17, 2015
cde67bc
deps: add -no_rand_screen to openssl s_client
May 27, 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
openssl: fix keypress requirement in apps on win32 
reapply b910613

PR: #9451
PR-URL: nodejs/node-v0.x-archive#9451
Reviewed-By: Julien Gilli <julien.gilli@joyent.com>

PR: #25523
PR-URL: nodejs/node-v0.x-archive#25523
Reviewed-By: Julien Gilli <jgilli@fastmail.fm>

PR: #25654
PR-URL: nodejs/node-v0.x-archive#25654
Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
  • Loading branch information
Shigeki Ohtsu authored and Myles Borins committed Sep 22, 2016
commit 46dbc38bfdf8cd0de290ceae2404b3bbc5f3af3e
20 changes: 13 additions & 7 deletions deps/openssl/openssl/apps/s_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,13 @@ typedef unsigned int u_int;
# include <fcntl.h>
#endif

/* Use Windows API with STD_INPUT_HANDLE when checking for input?
Don't look at OPENSSL_SYS_MSDOS for this, since it is always defined if
OPENSSL_SYS_WINDOWS is defined */
#if defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_WINCE) && defined(STD_INPUT_HANDLE)
#define OPENSSL_USE_STD_INPUT_HANDLE
#endif

#undef PROG
#define PROG s_client_main

Expand Down Expand Up @@ -1584,17 +1591,16 @@ int MAIN(int argc, char **argv)
tv.tv_usec = 0;
i = select(width, (void *)&readfds, (void *)&writefds,
NULL, &tv);
# if defined(OPENSSL_SYS_WINCE) || defined(OPENSSL_SYS_MSDOS)
if (!i && (!_kbhit() || !read_tty))
continue;
# else
#if defined(OPENSSL_USE_STD_INPUT_HANDLE)
if (!i && (!((_kbhit())
|| (WAIT_OBJECT_0 ==
WaitForSingleObject(GetStdHandle
(STD_INPUT_HANDLE),
0)))
|| !read_tty))
continue;
#else
if(!i && (!_kbhit() || !read_tty) ) continue;
# endif
} else
i = select(width, (void *)&readfds, (void *)&writefds,
Expand Down Expand Up @@ -1793,12 +1799,12 @@ int MAIN(int argc, char **argv)
}
}
#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)
# if defined(OPENSSL_SYS_WINCE) || defined(OPENSSL_SYS_MSDOS)
else if (_kbhit())
# else
#if defined(OPENSSL_USE_STD_INPUT_HANDLE)
else if ((_kbhit())
|| (WAIT_OBJECT_0 ==
WaitForSingleObject(GetStdHandle(STD_INPUT_HANDLE), 0)))
#else
else if (_kbhit())
# endif
#elif defined (OPENSSL_SYS_NETWARE)
else if (_kbhit())
Expand Down