Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
b130feb
deps: upgrade openssl sources to 1.0.2m
shigeki Nov 2, 2017
3438765
deps: copy all openssl header files to include dir
shigeki Nov 2, 2017
3d7eea5
deps: fix openssl assembly error on ia32 win32
indutny Jan 8, 2014
e0f6dee
deps: fix asm build error of openssl in x86_win32
Feb 13, 2015
083a6e3
openssl: fix keypress requirement in apps on win32
Feb 17, 2015
162686f
deps: add -no_rand_screen to openssl s_client
May 27, 2015
185229e
deps: update openssl asm and asm_obsolete files
shigeki Nov 2, 2017
ed0fbd8
deps: cherry-pick e7f4e9e from upstream libuv
bzoz Nov 3, 2017
d6a0ffe
zlib: warn before crash on invalid internals usage
addaleax Oct 31, 2017
88ad01f
build: make doc target quiet
danbev Oct 26, 2017
8bc5249
build: make test-doc and lint addon docs
joyeecheung Oct 22, 2017
1cef9ef
doc: make default values and periods consistent
matejkrajcovic Oct 27, 2017
97fd6df
src: do not include x.h if x-inl.h is included
joyeecheung Oct 27, 2017
d733dd9
doc: add *-inl.h include rule to C++ style guide
joyeecheung Oct 27, 2017
224ea15
http2: move uv_prepare handle to `Http2Session`
addaleax Oct 24, 2017
f31b796
src: add `InternalCallbackScope` util constructor
addaleax Oct 24, 2017
b50c334
http2: track async state for sending
addaleax Oct 24, 2017
3f52962
http2: remove unused assignment
addaleax Oct 24, 2017
bf7dc38
http2: make sessions garbage-collectible
addaleax Oct 24, 2017
c4736cf
src: fix etw provider include on Windows
joyeecheung Oct 31, 2017
05f9047
repl: avoid crashing from null and undefined errors
priyank-p Oct 28, 2017
59a4789
doc: howto decode buffers extending from Writable
dicearr Oct 23, 2017
6ee28b2
doc: util.isDeepStrictEqual returns boolean
azz Oct 31, 2017
f9b2099
test: use fixtures module in test-https-pfx
t-k-g Oct 6, 2017
4f8765d
src: remove unused includes in string_bytes.h
danbev Oct 30, 2017
433745e
build: add missing comma in sources list
danbev Oct 30, 2017
ffe4d7b
test: increase coverage for ModuleMap
robtpaton Oct 6, 2017
f3e0161
build,src: Add CloudABI as a POSIX-like runtime environment.
EdSchouten Oct 30, 2017
1771bb5
doc: fix Changelog link order
gibfahn Oct 31, 2017
6998591
test,net: remove scatological terminology
Trott Oct 30, 2017
f3a65a8
src: pass context to Get() operations for cares_wrap
evanlucas Oct 31, 2017
3fd7edd
doc: add windowsVerbatimArguments docs
Oct 18, 2017
09181eb
doc: add details about rss on process.memoryUsage
profnandaa Oct 27, 2017
90e8e81
doc : mention constant-time in crypto doc
mithunsasidharan Oct 30, 2017
c40b3c6
src: add 'dynamic' process.release.lts property
rvagg Oct 6, 2015
d178c6d
test: update process-release for Node 8 Carbon
Fishrock123 Nov 1, 2017
5077faf
test: pause child until parent is ready
jBarz Oct 4, 2017
0b337cb
test: fix flaky test-http2-server-rst-stream.js
apapirovski Nov 2, 2017
3241799
build: suppress lint-md output
gibfahn Oct 27, 2017
d5ea177
doc: add nodejs/gyp team for GYP related issues
gibfahn Oct 31, 2017
7349d42
cli: add --stack-trace-limit to NODE_OPTIONS
addaleax Oct 25, 2017
a814786
src: improve module loader readability
addaleax Oct 26, 2017
a0b94f4
lib: refactor ES module loader for readability
addaleax Oct 28, 2017
d6d4610
http, tls: better support for IPv6 addresses
mattiasholmlund Aug 10, 2017
689c9d4
test: mark test-async-wrap-uncaughtexception as flaky
refack Nov 2, 2017
fc58c52
test: fix malformed parallel.status line
Trott Nov 3, 2017
e585c41
doc: add docs for Zlib#close()
lpinca Oct 29, 2017
26f1a1d
test: fix test-cli-node-options on Windows
addaleax Nov 3, 2017
dfe5684
http2: refactor settings handling
jasnell Nov 1, 2017
e3283c7
http2: allocate on every chunk send
jasnell Nov 1, 2017
7388144
doc: add 9.x to version picker and mark 8.x as LTS
Nov 1, 2017
77e4ec8
doc: update license to include node-inspect
MylesBorins Nov 1, 2017
a87f846
src: add method to compute storage in WriteWrap
addaleax Nov 3, 2017
326a048
tools: add fixer for no-let-in-for-declaration
starkwang Oct 31, 2017
1b090c9
http, http2: add 103 Early Hints status code
yosuke-furukawa Oct 31, 2017
87b4e3e
tls: accept array of protocols in TLSSocket
qubyte Oct 31, 2017
9c39d79
http: use arrow fns for lexical `this` in Agent
bengl Oct 25, 2017
72d0e7e
http2: refactor multiple internals
jasnell Nov 1, 2017
0ab3d37
test: refactor exitedAfterDisconnect test
Trott Nov 3, 2017
6074c8c
inspector: include node_platform.h header
alexeykuzmin Nov 2, 2017
762a11f
http2: improve errors thrown in header validation
joyeecheung Nov 3, 2017
d7df4df
doc: correct EventEmitter reference
gowpen Nov 6, 2017
e05d4f4
doc: correct effects to affects
gowpen Nov 6, 2017
2bb148f
doc: make stream.Readable consistent
thefourtheye Nov 6, 2017
8a2b4ee
src: remove unnecessary call to SetHiddenPrototype
verwaest Oct 27, 2017
fa5a841
tools: update to ESLint 4.10.0
cjihrig Nov 4, 2017
6a2cb12
src: clean up uv_fs_t's in module_wrap.cc
cjihrig Nov 3, 2017
f3e63f2
test: update test to use fixtures
awegrzyn Nov 6, 2017
bcd818a
test: replace `common.fixturesDir` usage
sastan Nov 6, 2017
422d315
tools: replace string concetation with templates
Nov 6, 2017
700c5e7
test: replace common.fixturesDir with fixtures.readSync()
AdriVanHoudt Nov 6, 2017
ec1b110
test: replace common.fixturesDir with fixtures module
doomhz Nov 6, 2017
e781d93
tools: replace string concatenation with template literals
lambrojos Nov 6, 2017
2156828
test: clarified assert message for test-require-json.js
matthias-reis Nov 6, 2017
021ccb4
test: use default assertion messages
trootski Nov 6, 2017
e4b3c00
test: replace fixturesDir with usage of fixtures module
itavy Nov 6, 2017
77f0359
http: use 'connect' event only if socket is connecting
lpinca Nov 3, 2017
6e22dc8
tools: replace string concatenation with template literals
kevinwcyu Nov 6, 2017
219ac4b
test: fix typos in read-buffer tests
jimivdw Nov 6, 2017
e9396d2
tools: remove unneeded parentheses in doc/html.js
vsemozhetbyt Nov 6, 2017
ef67980
test: update test to use fixtures.readKey
Nov 6, 2017
6831e42
test: use fixtures module in test-repl
DamianLion Nov 6, 2017
d054e94
test: add detailed message for assertion failure
Nov 6, 2017
5f88543
test: refactor tls test to use fixtres.readSync
brianoconnell Nov 6, 2017
6739f41
doc: fix json generator warnings
lpinca Nov 4, 2017
50d505c
test: include file mode in assert message
sastan Nov 6, 2017
a85d6e9
test: show incorrect value on test failure
Nov 6, 2017
527ddda
test: remove custom message from assertion
Marsup Nov 6, 2017
a409b87
test: improve message in test-fs-readfile-pipe-large
keldorus Nov 6, 2017
978aa84
doc: add isTTY property documentation
sonaysevik Nov 6, 2017
b441573
test: use default assertion message
jonask-wix Nov 6, 2017
da66610
src: fix -Winconsistent-missing-override warning
bnoordhuis Nov 3, 2017
c14030e
lib: fix version check in tick processor
bnoordhuis Nov 5, 2017
e0c7b3d
lib: shuffle v8_prof_polyfill.js for unit testing
bnoordhuis Nov 5, 2017
2294ba4
test: tick processor version check regression test
bnoordhuis Nov 5, 2017
f097e27
doc: fix a link in dgram.md
vsemozhetbyt Nov 7, 2017
dee7800
doc: add links to EventEmitter in errors.md
Delapouite Nov 7, 2017
9de633d
2017-11-07, Version 9.1.0 (Current)
cjihrig Nov 7, 2017
5f5ef42
Working on v9.1.1
cjihrig Nov 7, 2017
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: 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.

PR-URL: #16691
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
shigeki authored and MylesBorins committed Nov 3, 2017
commit 3438765781ef08b0a5373cee8d5a25d89903b55e
266 changes: 1 addition & 265 deletions deps/openssl/openssl/crypto/opensslconf.h
Original file line number Diff line number Diff line change
@@ -1,265 +1 @@
/* opensslconf.h */
/* WARNING: Generated automatically from opensslconf.h.in by Configure. */

#ifdef __cplusplus
extern "C" {
#endif
/* OpenSSL was configured with the following options: */
#ifndef OPENSSL_DOING_MAKEDEPEND


#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
# define OPENSSL_NO_EC_NISTP_64_GCC_128
#endif
#ifndef OPENSSL_NO_GMP
# define OPENSSL_NO_GMP
#endif
#ifndef OPENSSL_NO_JPAKE
# define OPENSSL_NO_JPAKE
#endif
#ifndef OPENSSL_NO_KRB5
# define OPENSSL_NO_KRB5
#endif
#ifndef OPENSSL_NO_LIBUNBOUND
# define OPENSSL_NO_LIBUNBOUND
#endif
#ifndef OPENSSL_NO_MD2
# define OPENSSL_NO_MD2
#endif
#ifndef OPENSSL_NO_RC5
# define OPENSSL_NO_RC5
#endif
#ifndef OPENSSL_NO_RFC3779
# define OPENSSL_NO_RFC3779
#endif
#ifndef OPENSSL_NO_SCTP
# define OPENSSL_NO_SCTP
#endif
#ifndef OPENSSL_NO_SSL_TRACE
# define OPENSSL_NO_SSL_TRACE
#endif
#ifndef OPENSSL_NO_SSL2
# define OPENSSL_NO_SSL2
#endif
#ifndef OPENSSL_NO_STORE
# define OPENSSL_NO_STORE
#endif
#ifndef OPENSSL_NO_UNIT_TEST
# define OPENSSL_NO_UNIT_TEST
#endif
#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
# define OPENSSL_NO_WEAK_SSL_CIPHERS
#endif

#endif /* OPENSSL_DOING_MAKEDEPEND */

#ifndef OPENSSL_NO_DYNAMIC_ENGINE
# define OPENSSL_NO_DYNAMIC_ENGINE
#endif

/* The OPENSSL_NO_* macros are also defined as NO_* if the application
asks for it. This is a transient feature that is provided for those
who haven't had the time to do the appropriate changes in their
applications. */
#ifdef OPENSSL_ALGORITHM_DEFINES
# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
# define NO_EC_NISTP_64_GCC_128
# endif
# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
# define NO_GMP
# endif
# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
# define NO_JPAKE
# endif
# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
# define NO_KRB5
# endif
# if defined(OPENSSL_NO_LIBUNBOUND) && !defined(NO_LIBUNBOUND)
# define NO_LIBUNBOUND
# endif
# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
# define NO_MD2
# endif
# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
# define NO_RC5
# endif
# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
# define NO_RFC3779
# endif
# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
# define NO_SCTP
# endif
# if defined(OPENSSL_NO_SSL_TRACE) && !defined(NO_SSL_TRACE)
# define NO_SSL_TRACE
# endif
# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
# define NO_SSL2
# endif
# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
# define NO_STORE
# endif
# if defined(OPENSSL_NO_UNIT_TEST) && !defined(NO_UNIT_TEST)
# define NO_UNIT_TEST
# endif
# if defined(OPENSSL_NO_WEAK_SSL_CIPHERS) && !defined(NO_WEAK_SSL_CIPHERS)
# define NO_WEAK_SSL_CIPHERS
# endif
#endif

/* crypto/opensslconf.h.in */

/* Generate 80386 code? */
#undef I386_ONLY

#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
#define ENGINESDIR "/usr/local/ssl/lib/engines"
#define OPENSSLDIR "/usr/local/ssl"
#endif
#endif

#undef OPENSSL_UNISTD
#define OPENSSL_UNISTD <unistd.h>

#undef OPENSSL_EXPORT_VAR_AS_FUNCTION

#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
#define IDEA_INT unsigned int
#endif

#if defined(HEADER_MD2_H) && !defined(MD2_INT)
#define MD2_INT unsigned int
#endif

#if defined(HEADER_RC2_H) && !defined(RC2_INT)
/* I need to put in a mod for the alpha - eay */
#define RC2_INT unsigned int
#endif

#if defined(HEADER_RC4_H)
#if !defined(RC4_INT)
/* using int types make the structure larger but make the code faster
* on most boxes I have tested - up to %20 faster. */
/*
* I don't know what does "most" mean, but declaring "int" is a must on:
* - Intel P6 because partial register stalls are very expensive;
* - elder Alpha because it lacks byte load/store instructions;
*/
#define RC4_INT unsigned int
#endif
#if !defined(RC4_CHUNK)
/*
* This enables code handling data aligned at natural CPU word
* boundary. See crypto/rc4/rc4_enc.c for further details.
*/
#undef RC4_CHUNK
#endif
#endif

#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
* %20 speed up (longs are 8 bytes, int's are 4). */
#ifndef DES_LONG
#define DES_LONG unsigned long
#endif
#endif

#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
#define CONFIG_HEADER_BN_H
#undef BN_LLONG

/* Should we define BN_DIV2W here? */

/* Only one for the following should be defined */
#undef SIXTY_FOUR_BIT_LONG
#undef SIXTY_FOUR_BIT
#define THIRTY_TWO_BIT
#endif

#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
#define CONFIG_HEADER_RC4_LOCL_H
/* if this is defined data[i] is used instead of *data, this is a %20
* speedup on x86 */
#undef RC4_INDEX
#endif

#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
#define CONFIG_HEADER_BF_LOCL_H
#undef BF_PTR
#endif /* HEADER_BF_LOCL_H */

#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
#define CONFIG_HEADER_DES_LOCL_H
#ifndef DES_DEFAULT_OPTIONS
/* the following is tweaked from a config script, that is why it is a
* protected undef/define */
#ifndef DES_PTR
#undef DES_PTR
#endif

/* This helps C compiler generate the correct code for multiple functional
* units. It reduces register dependancies at the expense of 2 more
* registers */
#ifndef DES_RISC1
#undef DES_RISC1
#endif

#ifndef DES_RISC2
#undef DES_RISC2
#endif

#if defined(DES_RISC1) && defined(DES_RISC2)
#error YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
#endif

/* Unroll the inner loop, this sometimes helps, sometimes hinders.
* Very mucy CPU dependant */
#ifndef DES_UNROLL
#undef DES_UNROLL
#endif

/* These default values were supplied by
* Peter Gutman <pgut001@cs.auckland.ac.nz>
* They are only used if nothing else has been defined */
#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
/* Special defines which change the way the code is built depending on the
CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
even newer MIPS CPU's, but at the moment one size fits all for
optimization options. Older Sparc's work better with only UNROLL, but
there's no way to tell at compile time what it is you're running on */

#if defined( __sun ) || defined ( sun ) /* Newer Sparc's */
# define DES_PTR
# define DES_RISC1
# define DES_UNROLL
#elif defined( __ultrix ) /* Older MIPS */
# define DES_PTR
# define DES_RISC2
# define DES_UNROLL
#elif defined( __osf1__ ) /* Alpha */
# define DES_PTR
# define DES_RISC2
#elif defined ( _AIX ) /* RS6000 */
/* Unknown */
#elif defined( __hpux ) /* HP-PA */
/* Unknown */
#elif defined( __aux ) /* 68K */
/* Unknown */
#elif defined( __dgux ) /* 88K (but P6 in latest boxes) */
# define DES_UNROLL
#elif defined( __sgi ) /* Newer MIPS */
# define DES_PTR
# define DES_RISC2
# define DES_UNROLL
#elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */
# define DES_PTR
# define DES_RISC1
# define DES_UNROLL
#endif /* Systems-specific speed defines */
#endif

#endif /* DES_DEFAULT_OPTIONS */
#endif /* HEADER_DES_LOCL_H */
#ifdef __cplusplus
}
#endif
#include "../../config/opensslconf.h"
Loading