Skip to content

Propose v6.1.0 (Openssl update) #6557

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

Merged
Fishrock123 merged 61 commits into from
May 5, 2016
Merged

Propose v6.1.0 (Openssl update) #6557

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
cbbe95e
net: introduce `Socket#connecting` property
indutny Apr 26, 2016
19fb134
doc: use Buffer.from() instead of new Buffer()
JacksonTian Apr 25, 2016
36207c6
doc: correctly document the behavior of ee.once().
lance Apr 25, 2016
11e7cc5
build: don't compile with -B
bnoordhuis Apr 26, 2016
7b9ae70
benchmark: Fix crash in net benchmarks
Apr 27, 2016
8956432
build: exclude tap files from tarballs
mscdex Apr 22, 2016
f6d7279
doc: update build instructions for OS X
Trott Apr 20, 2016
fdde369
crypto: fix error in deprecation message
Trott Apr 22, 2016
6d1606e
test,tools: adjust function argument alignment
Trott Apr 26, 2016
3f608b1
tools: lint for function argument alignment
Trott Apr 19, 2016
66903f6
tools: add tests for the doctool
iankronquist Apr 3, 2016
089362f
test,tools: limit lint tolerance of gc global
Trott Apr 21, 2016
7153f96
build: unbreak -prof, disable PIE on OS X
bnoordhuis Apr 28, 2016
e62c42b
tools: remove default parameters from lint rule
Trott Apr 27, 2016
fa9d82d
src: unify implementations of Utf8Value etc.
addaleax Apr 23, 2016
ab84d69
doc: better example & synopsis
Fishrock123 Apr 12, 2016
150dd36
doc: no Node.js(1)
Fishrock123 Apr 12, 2016
fc0fbf1
doc: subdivide TOC, add auxiliary links
Fishrock123 Apr 12, 2016
9f23cb2
tools: fix exit code when linting from CI
mscdex Apr 27, 2016
2c92a1f
events: pass the original listener added by once
davidtaikocha Apr 29, 2016
1b9fdba
process: add process.cpuUsage() - implementation, doc, tests
Apr 5, 2016
b3f75ec
doc: expand documentation for process.exit()
jasnell Apr 27, 2016
76c9ab5
assert: allow circular references
Trott Apr 27, 2016
fd37d54
doc: added note warning about change to console.endTime()
ben-page Apr 28, 2016
8eb87ee
doc: Remove extra space in REPL example
Apr 28, 2016
bfcde97
doc: fix incorrect syntax in examples
evanlucas Apr 29, 2016
4068d64
doc: fix EventEmitter#eventNames() example
ChALkeR Apr 27, 2016
0d19853
build: use shorthand lint target from test
jbergstroem Apr 27, 2016
e6c8da4
doc: make `writable.setDefaultEncoding()` return `this`
estliberitas Apr 30, 2016
4ae39f9
doc: remove all scrollbar styling
claudiorodriguez Apr 29, 2016
7034ebe
doc: use `Node.js` in synopsis document
Trott Apr 29, 2016
3d5b732
doc: clarifies http.serverResponse implementation
AllenSH12 Apr 6, 2016
13e6608
doc: extra clarification of historySize option
vsemozhetbyt Apr 26, 2016
ab7055b
doc: fix fs.realpath man pg links
phette23 Apr 28, 2016
969f96a
doc: fix a typo in __dirname section
toyota790 Apr 29, 2016
3e028a1
doc: remove obsolete comment in isError() example
cjihrig Apr 30, 2016
e5ce53a
doc: fix sentence fragment in fs doc
Trott Apr 30, 2016
457d12a
test: add failing url parse tests as known_issue
jasnell Mar 24, 2016
5fe5fa2
test: make addon testing part of `make test`
bnoordhuis Apr 15, 2016
2d503b1
debugger: display array contents in repl
cjihrig Apr 28, 2016
7641f9a
test: refactor large event emitter tests
cjihrig Apr 28, 2016
7c30f15
doc: ensure consistent grammar in node.1 file
justshiv Apr 27, 2016
08e0884
tools: add -F flag for fixing lint issues
Trott Apr 29, 2016
1330496
cluster: remove use of bind() in destroy()
yorkie May 1, 2016
d674493
doc: add missing underscore for markdown italics
May 2, 2016
0bca959
util: fix inspecting of proxy objects
jasnell Apr 29, 2016
9a29b50
doc: fix the lint of an example in cluster.md
yorkie May 2, 2016
4f728df
doc: linkify remaining references to fs.Stats object
Apr 30, 2016
33f24c8
doc: adds 'close' events to fs.ReadStream and fs.WriteStream
May 1, 2016
91ab769
util: truncate inspect array and typed array
jasnell Apr 21, 2016
65b6574
deps: backport IsValid changes from 4e8736d in V8
targos May 3, 2016
e6ab3ec
deps: upgrade openssl sources to 1.0.2h
May 3, 2016
3af28d3
deps: copy all openssl header files to include dir
May 3, 2016
d159462
deps: fix openssl assembly error on ia32 win32
indutny Jan 8, 2014
3fe6812
deps: fix asm build error of openssl in x86_win32
Feb 13, 2015
534f03c
openssl: fix keypress requirement in apps on win32
Feb 17, 2015
a5a2944
deps: add -no_rand_screen to openssl s_client
May 27, 2015
54f8600
deps: update openssl asm and asm_obsolete files
May 3, 2016
65030c7
test: fix alpn tests for openssl1.0.2h
May 3, 2016
cd7b76e
2016-05-05, Version 6.1.0 (Current)
Fishrock123 May 5, 2016
8aa8f18
Working on v6.1.1
Fishrock123 May 5, 2016
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.

Fixes: #6458
PR-URL: #6550
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
  • Loading branch information
Shigeki Ohtsu @Fishrock123
Shigeki Ohtsu authored and Fishrock123 committed May 4, 2016
commit 3af28d3693665485a394cf1ef78a94211e5229f9
266 changes: 1 addition & 265 deletions deps/openssl/openssl/crypto/opensslconf.h
View file
Open in desktop
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