Skip to content

v4.8.6 proposal #16500

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
MylesBorins merged 48 commits into from
Nov 7, 2017
Merged

v4.8.6 proposal #16500

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
545235f
deps/v8: add missing #include "unicode/normlzr.h"
ArchangeGabriel May 15, 2017
9ba73e1
deps: cherry-pick 4ae5993 from upstream OpenSSL
shigeki May 9, 2017
639180a
deps: update openssl asm and asm_obsolete files
shigeki May 9, 2017
0c820c0
v8: fix stack overflow in recursive method
bnoordhuis Apr 17, 2017
3640ba4
crypto: clear err stack after ECDH::BufferToPoint
rfk May 29, 2017
e2b6fdf
build: avoid /docs/api and /docs/doc/api upload
rvagg May 11, 2017
1611627
tools: be explicit about including key-id
MylesBorins May 30, 2017
0fa09df
doc: change `child` to `subprocess`
Trott Aug 1, 2017
1db3329
doc: add entry for subprocess.killed property
Trott Aug 3, 2017
59d35c0
build,tools: do not force codesign prefix
evanlucas Jul 12, 2017
05e8b1b
build: codesign tarball binary on macOS
evanlucas Jul 12, 2017
ed6298c
deps: cherry-pick 18ea996 from c-ares upstream
addaleax Jul 15, 2017
c40bffc
tools: update certdata.txt
bnoordhuis Apr 13, 2017
752b46a
crypto: update root certificates
bnoordhuis Apr 13, 2017
07c912e
tools: update certdata.txt
bnoordhuis May 29, 2017
210fa72
crypto: update root certificates
bnoordhuis May 29, 2017
751f1ac
Revert "deps: backport e093a04, 09db540 from upstream V8"
abernix Aug 14, 2017
71f9cdf
deps: cherry-pick 09db540,686558d from V8 upstream
abernix Aug 14, 2017
9bfada8
deps: add example of comparing OpenSSL changes
danbev May 26, 2017
8507f0f
deps: upgrade openssl sources to 1.0.2l
danbev May 26, 2017
bbd92b4
deps: copy all openssl header files to include dir
danbev May 26, 2017
80c48c0
deps: fix openssl assembly error on ia32 win32
indutny Jan 8, 2014
0aacd5a
deps: fix asm build error of openssl in x86_win32
Feb 13, 2015
e69f47b
openssl: fix keypress requirement in apps on win32
Feb 17, 2015
523eb60
deps: add -no_rand_screen to openssl s_client
May 27, 2015
c0fe1fc
deps: update openssl config files
danbev May 26, 2017
06eb181
deps: update openssl asm and asm_obsolete files
danbev Jun 1, 2017
532a294
doc: add missing make command to UPGRADING.md
danbev May 30, 2017
31bf595
zlib: fix node crashing on invalid options
aqrln May 22, 2017
a1f9929
zlib: fix crash when initializing failed
addaleax Aug 7, 2017
43bbfaf
docs: Fix broken links in crypto.md
Sep 4, 2017
a7f7a87
build: run test-hash-seed at the end of test-v8
targos Jul 13, 2017
85800c4
deps: backport e28183b5 from upstream V8
skomski Oct 5, 2015
b259fd3
deps: cherry pick d7f813b4 from V8 upstream
Sep 29, 2015
e064ae6
build: fix make test-v8
bnoordhuis Oct 2, 2017
43d1ac3
deps: backport bff3074 from V8 upstream
MylesBorins Sep 22, 2017
9c3e246
deps: backport 4e18190 from V8 upstream
jungshik Jan 4, 2016
5d9164c
test: move test-cluster-debug-port to sequential
Oleksandr-Kushchak-i2 Oct 18, 2017
f8e282e
doc: fix typo in zlib.md
lpinca Oct 25, 2017
cb92f93
test: remove internal headers from addons
gibfahn Aug 2, 2016
55e15ec
deps: upgrade openssl sources to 1.0.2m
shigeki Nov 2, 2017
16fbd9d
deps: copy all openssl header files to include dir
shigeki Nov 2, 2017
3f93ffe
deps: fix openssl assembly error on ia32 win32
indutny Jan 8, 2014
bdcb252
deps: fix asm build error of openssl in x86_win32
Feb 13, 2015
1bde7f5
openssl: fix keypress requirement in apps on win32
Feb 17, 2015
68661a9
deps: add -no_rand_screen to openssl s_client
May 27, 2015
ea09a1c
deps: update openssl asm and asm_obsolete files
shigeki Nov 2, 2017
449d60d
2017-11-07, Version 4.8.6 'Argon' (Maintenance)
MylesBorins Oct 25, 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 @MylesBorins
shigeki authored and MylesBorins committed Nov 3, 2017
commit 16fbd9da0d1fea71c4c46038b14bfe1e51796f0d
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