Skip to content

Upgrade to openssl-1.0.2a (Part2: final) #1389

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

Upgrade to openssl-1.0.2a (Part2: final) #1389

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b8e6ac1
deps: upgrade openssl to 1.0.2a
Mar 30, 2015
6dd35fe
deps: fix openssl assembly error on ia32 win32
indutny Jan 8, 2014
9e48b08
deps: fix asm build error of openssl in x86_win32
Feb 13, 2015
4319e75
deps: backport openssl patch of alt cert chains 1
Jan 27, 2015
4245ff6
openssl: fix keypress requirement in apps on win32
Feb 17, 2015
d0cde64
deps: replace all headers in openssl
Apr 10, 2015
8633524
deps: add x32 and arm64 support for opensslconf.h
Apr 10, 2015
37fd75f
deps: update opensslconf.h for 1.0.2a
Apr 10, 2015
974093e
deps: update openssl.gyp/gypi for openssl-1.0.2a
Mar 31, 2015
9ab4c08
deps: update asm Makefile for openssl-1.0.2a
Mar 31, 2015
866ae2d
deps, build: add support older assembler
Mar 31, 2015
9e52b6c
deps: update asm files for openssl-1.0.2a
Apr 10, 2015
4533707
build: enable ssl support on arm64
Apr 10, 2015
a755e0c
test: fix error message check for openssl-1.0.2a
Feb 5, 2015
0005f23
deps: add docs to upgrade openssl
Mar 31, 2015
d9fbcc0
build: fix error message in configure
Apr 13, 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 .
  • Loading branch information
Shigeki Ohtsu
Shigeki Ohtsu committed Apr 14, 2015
commit 4245ff69085b92a8d215373a4c1c7c22f7fed002
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 @@ -1757,17 +1764,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 @@ -1969,12 +1975,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