diff options
author | Shigeki Ohtsu <ohtsu@iij.ad.jp> | 2015-12-04 00:41:27 +0900 |
---|---|---|
committer | Shigeki Ohtsu <ohtsu@iij.ad.jp> | 2015-12-04 03:56:12 +0900 |
commit | ff4f16b7dd92f74bfa77207c623d6e7d13e19baf (patch) | |
tree | e2d867b594a7281e98d22c754425b06187d8fe91 /deps/openssl/openssl/e_os.h | |
parent | 181816ea1629b6bb8419d72a4fbe93df0f094831 (diff) | |
download | android-node-v8-ff4f16b7dd92f74bfa77207c623d6e7d13e19baf.tar.gz android-node-v8-ff4f16b7dd92f74bfa77207c623d6e7d13e19baf.tar.bz2 android-node-v8-ff4f16b7dd92f74bfa77207c623d6e7d13e19baf.zip |
deps: upgrade openssl sources to 1.0.2e
This just replaces all sources of openssl-1.0.2e.tar.gz into
deps/openssl/openssl
deps: copy all openssl header files to include dir
All symlink files in `deps/openssl/openssl/include/openssl/`
are removed and replaced with real header files to avoid
issues on Windows. Two files of opensslconf.h in crypto and
include dir are replaced to refer config/opensslconf.h.
deps: fix openssl assembly error on ia32 win32
`x86masm.pl` was mistakenly using .486 instruction set, why `cpuid` (and
perhaps others) are requiring .686 .
deps: fix asm build error of openssl in x86_win32
See
https://mta.openssl.org/pipermail/openssl-dev/2015-February/000651.html
node needs to stop using masm and move to nasm or yasm on Win32.
openssl: fix keypress requirement in apps on win32
Reapply b910613792dac946b295855963869933a9089044 .
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.
deps: update openssl config files
Regenrate config files for supported platforms with Makefile.
deps: update openssl asm and asm_obsolete files
Regenerate asm files with Makefile and CC=gcc and ASM=gcc where
gcc-4.8.4. Also asm files in asm_obsolete dir to support old compiler
and assmebler are regenerated without CC and ASM envs.
PR-URL: https://github.com/nodejs/node/pull/4134
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Diffstat (limited to 'deps/openssl/openssl/e_os.h')
-rw-r--r-- | deps/openssl/openssl/e_os.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/deps/openssl/openssl/e_os.h b/deps/openssl/openssl/e_os.h index 45fef691a0..1fa36c1719 100644 --- a/deps/openssl/openssl/e_os.h +++ b/deps/openssl/openssl/e_os.h @@ -619,7 +619,7 @@ struct servent *PASCAL getservbyname(const char *, const char *); # include <sys/select.h> # endif -# if defined(sun) +# if defined(__sun) || defined(sun) # include <sys/filio.h> # else # ifndef VMS @@ -661,7 +661,7 @@ struct servent *PASCAL getservbyname(const char *, const char *); # endif -# if defined(sun) && !defined(__svr4__) && !defined(__SVR4) +# if (defined(__sun) || defined(sun)) && !defined(__svr4__) && !defined(__SVR4) /* include headers first, so our defines don't break it */ # include <stdlib.h> # include <string.h> |