Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nodejs/node
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v8.13.0
Choose a base ref
...
head repository: nodejs/node
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v8.14.0
Choose a head ref
  • 13 commits
  • 85 files changed
  • 7 contributors

Commits on Nov 20, 2018

  1. Working on v8.13.1

    PR-URL: #23974
    MylesBorins committed Nov 20, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    davidboden David Boden
    Copy the full SHA
    ebe617e View commit details

Commits on Nov 24, 2018

  1. deps: upgrade openssl sources to 1.0.2q

    This updates all sources in deps/openssl/openssl with openssl-1.0.2q.
    
    PR-URL: #24530
    Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org>
    Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
    Reviewed-By: Rod Vagg <rod@vagg.org>
    sam-github authored and rvagg committed Nov 24, 2018
    Copy the full SHA
    f5b3433 View commit details
  2. 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.
    
    Header files were generated by:
      $ cd deps/openssl
      $ mkdir -p openssl/include/openssl
      $ tar xf .../openssl-1.02q.tar.gz
      $ cd openssl-1.02q
      $ ./config
      $ cd include/openssl
      $ sed -i '' *.h
      $ cp *.h ../../../openssl/include/openssl/
    
    PR-URL: #24530
    Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org>
    Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
    Reviewed-By: Rod Vagg <rod@vagg.org>
    sam-github authored and rvagg committed Nov 24, 2018
    Copy the full SHA
    69037ad View commit details
  3. deps: fix openssl assembly error on ia32 win32

    `x86masm.pl` was mistakenly using .486 instruction set, why `cpuid` (and
    perhaps others) are requiring .686 .
    
    Fixes: #589
    PR-URL: #1389
    Reviewed-By: Fedor Indutny <fedor@indutny.com>
    Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
    Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
    indutny authored and rvagg committed Nov 24, 2018
    Copy the full SHA
    f1d1f12 View commit details
  4. deps: fix asm build error of openssl in x86_win32

    See
    https://mta.openssl.org/pipermail/openssl-dev/2015-February/000651.html
    
    iojs needs to stop using masm and move to nasm or yasm on Win32.
    
    Fixes: #589
    PR-URL: #1389
    Reviewed-By: Fedor Indutny <fedor@indutny.com>
    Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
    Shigeki Ohtsu authored and rvagg committed Nov 24, 2018
    Copy the full SHA
    c4e382c View commit details
  5. openssl: fix keypress requirement in apps on win32

    Reapply b910613 .
    
    Fixes: #589
    PR-URL: #1389
    Reviewed-By: Fedor Indutny <fedor@indutny.com>
    Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
    Shigeki Ohtsu authored and rvagg committed Nov 24, 2018
    Copy the full SHA
    7f362a1 View commit details
  6. 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.
    
    Fixes: #1461
    PR-URL: #1836
    Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
    Shigeki Ohtsu authored and rvagg committed Nov 24, 2018
    Copy the full SHA
    add20f3 View commit details

Commits on Nov 27, 2018

  1. deps,http: http_parser set max header size to 8KB

    CVE-2018-12121
    
    PR-URL: nodejs-private/node-private#143
    Ref: nodejs-private/security#139
    Ref: nodejs-private/http-parser-private#2
    Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
    Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
    Reviewed-By: James M Snell <jasnell@gmail.com>
    Reviewed-By: Rod Vagg <rod@vagg.org>
    Reviewed-By: Anna Henningsen <anna@addaleax.net>
    mcollina authored and rvagg committed Nov 27, 2018
    Copy the full SHA
    93dba83 View commit details
  2. http,https: protect against slow headers attack

    CVE-2018-12122
    
    An attacker can send a char/s within headers and exahust the resources
    (file descriptors) of a system even with a tight max header length
    protection. This PR destroys a socket if it has not received the headers
    in 40s.
    
    PR-URL: nodejs-private/node-private#151
    Ref: nodejs-private/node-private#144
    Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
    Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
    Reviewed-By: James M Snell <jasnell@gmail.com>
    mcollina authored and rvagg committed Nov 27, 2018
    Copy the full SHA
    696f063 View commit details
  3. url: avoid hostname spoofing w/ javascript protocol

    CVE-2018-12123
    
    Fixes: nodejs-private/security#205
    PR-URL: nodejs-private/node-private#145
    Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
    Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
    Reviewed-By: Anna Henningsen <anna@addaleax.net>
    mcollina authored and rvagg committed Nov 27, 2018
    Copy the full SHA
    53a6e4e View commit details
  4. http: disallow two-byte characters in URL path

    CVE-2018-12116
    Backport of b961d9f to 8.x
    
    Original commit:
      This commit changes node's handling of two-byte characters in
      the path component of an http URL. Previously, node would just
      strip the higher byte when generating the request. So this code:
    
      ```
      http.request({host: "example.com", port: "80", "/N"})
      ```
    
      would request `http://example.com/.`
      (`.` is the character for the byte `0x2e`).
    
      This is not useful and can in some cases lead to filter evasion.
      With this change, the code generates `ERR_UNESCAPED_CHARACTERS`,
      just like space and control characters already did.
    
      PR-URL: #16237
      Reviewed-By: James M Snell <jasnell@gmail.com>
      Reviewed-By: Anna Henningsen <anna@addaleax.net>
      Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
      Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
      Reviewed-By: Timothy Gu <timothygu99@gmail.com>
    
    PR-URL: nodejs-private/node-private#146
    Fixes: nodejs-private/security#207
    Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
    Reviewed-By: James M Snell <jasnell@gmail.com>
    Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
    Reviewed-By: Anna Henningsen <anna@addaleax.net>
    Reviewed-By: Timothy Gu <timothygu99@gmail.com>
    Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
    bennofs authored and rvagg committed Nov 27, 2018
    Copy the full SHA
    513e974 View commit details
  5. http: add --security-revert for CVE-2018-12116

    PR-URL: nodejs-private/node-private#146
    Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
    Reviewed-By: James M Snell <jasnell@gmail.com>
    Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
    Reviewed-By: Anna Henningsen <anna@addaleax.net>
    Reviewed-By: Timothy Gu <timothygu99@gmail.com>
    Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
    mcollina authored and rvagg committed Nov 27, 2018
    1
    Copy the full SHA
    576038f View commit details
  6. 2018-11-27, Version 8.14.0 'Carbon' (LTS)

    This is a security release. All Node.js users should consult the security
    release summary at:
    
      https://nodejs.org/en/blog/vulnerability/november-2018-security-releases/
    
    for details on patched vulnerabilities.
    
    Fixes for the following CVEs are included in this release:
    
      * Node.js: Denial of Service with large HTTP headers (CVE-2018-12121)
      * Node.js: Slowloris HTTP Denial of Service (CVE-2018-12122 / Node.js)
      * Node.js: Hostname spoofing in URL parser for javascript protocol
        (CVE-2018-12123)
      * Node.js: HTTP request splitting (CVE-2018-12116)
      * OpenSSL: Timing vulnerability in DSA signature generation (CVE-2018-0734)
      * OpenSSL: Microarchitecture timing vulnerability in ECC scalar multiplication
        (CVE-2018-5407)
    
    Notable Changes:
    
    * deps: Upgrade to OpenSSL 1.0.2q, fixing CVE-2018-0734 and CVE-2018-5407
    * http:
      * Headers received by HTTP servers must not exceed 8192 bytes in total to
        prevent possible Denial of Service attacks. Reported by Trevor Norris.
        (CVE-2018-12121 / Matteo Collina)
      * A timeout of 40 seconds now applies to servers receiving HTTP headers. This
        value can be adjusted with `server.headersTimeout`. Where headers are not
        completely received within this period, the socket is destroyed on the next
        received chunk. In conjunction with `server.setTimeout()`, this aids in
        protecting against excessive resource retention and possible Denial of
        Service. Reported by Jan Maybach (liebdich.com).
      * Two-byte characters are now strictly disallowed for the `path` option in
        HTTP client requests. Paths containing characters outside of the range
        `\u0021` - `\u00ff` will now be rejected with a `TypeError`. This behavior
        can be reverted if necessary by supplying the
        `--security-revert=CVE-2018-12116` command line argument (this is not
        recommended). Reported as security concern for Node.js 6 and 8 by
        Arkadiy Tetelman (lob.com), fixed by backporting a change by Benno
        Fünfstück applied to Node.js 10 and later.
        (CVE-2018-12116 / Matteo Collina)
    * url: Fix a bug that would allow a hostname being spoofed when parsing URLs
      with `url.parse()` with the `'javascript:'` protocol. Reported by
      Martin Bajanik (kenticocloud.com). (CVE-2018-12123 / Matteo Collina)
    
    PR-URL: nodejs-private/node-private#154
    rvagg committed Nov 27, 2018
    Copy the full SHA
    39716a8 View commit details
Showing with 2,100 additions and 253 deletions.
  1. +2 −1 CHANGELOG.md
  2. +2 −2 deps/http_parser/http_parser.gyp
  3. +1 −0 deps/openssl/openssl.gypi
  4. +30 −0 deps/openssl/openssl/CHANGES
  5. +23 −23 deps/openssl/openssl/Makefile
  6. +21 −21 deps/openssl/openssl/Makefile.bak
  7. +5 −0 deps/openssl/openssl/NEWS
  8. +1 −1 deps/openssl/openssl/README
  9. +188 −0 deps/openssl/openssl/apps/CA.pl.bak
  10. +1 −2 deps/openssl/openssl/apps/req.c
  11. +1 −0 deps/openssl/openssl/config
  12. +11 −2 deps/openssl/openssl/crypto/Makefile
  13. +22 −1 deps/openssl/openssl/crypto/bio/b_sock.c
  14. +0 −6 deps/openssl/openssl/crypto/bn/asm/x86_64-gcc.c
  15. +45 −20 deps/openssl/openssl/crypto/bn/bn_blind.c
  16. +56 −10 deps/openssl/openssl/crypto/bn/bn_lib.c
  17. +66 −1 deps/openssl/openssl/crypto/bn/bn_mod.c
  18. +19 −10 deps/openssl/openssl/crypto/bn/bn_mont.c
  19. +11 −1 deps/openssl/openssl/crypto/bn/bn_mul.c
  20. +11 −1 deps/openssl/openssl/crypto/bn/bn_sqr.c
  21. +4 −2 deps/openssl/openssl/crypto/bn/bn_x931p.c
  22. +6 −0 deps/openssl/openssl/crypto/bn_int.h
  23. +4 −3 deps/openssl/openssl/crypto/conf/Makefile
  24. +3 −2 deps/openssl/openssl/crypto/conf/conf_api.c
  25. +2 −2 deps/openssl/openssl/crypto/conf/conf_mod.c
  26. +2 −0 deps/openssl/openssl/crypto/cryptlib.h
  27. +2 −1 deps/openssl/openssl/crypto/crypto-lib.com
  28. +6 −0 deps/openssl/openssl/crypto/dsa/dsa_gen.c
  29. +34 −4 deps/openssl/openssl/crypto/dsa/dsa_ossl.c
  30. +2 −3 deps/openssl/openssl/crypto/ec/ec_lcl.h
  31. +29 −12 deps/openssl/openssl/crypto/ec/ec_lib.c
  32. +247 −1 deps/openssl/openssl/crypto/ec/ec_mult.c
  33. +4 −3 deps/openssl/openssl/crypto/engine/eng_list.c
  34. +31 −0 deps/openssl/openssl/crypto/getenv.c
  35. +265 −0 deps/openssl/openssl/crypto/opensslconf.h.bak
  36. +3 −3 deps/openssl/openssl/crypto/opensslv.h
  37. +3 −2 deps/openssl/openssl/crypto/pkcs12/p12_init.c
  38. +0 −1 deps/openssl/openssl/crypto/pkcs7/pk7_lib.c
  39. +5 −4 deps/openssl/openssl/crypto/rand/Makefile
  40. +19 −9 deps/openssl/openssl/crypto/rand/md_rand.c
  41. +2 −2 deps/openssl/openssl/crypto/rand/rand_lcl.h
  42. +20 −2 deps/openssl/openssl/crypto/rand/rand_lib.c
  43. +3 −4 deps/openssl/openssl/crypto/rand/randfile.c
  44. +84 −18 deps/openssl/openssl/crypto/rsa/rsa_eay.c
  45. +18 −0 deps/openssl/openssl/crypto/ui/ui_openssl.c
  46. +1 −1 deps/openssl/openssl/crypto/x509/by_dir.c
  47. +2 −1 deps/openssl/openssl/crypto/x509/by_file.c
  48. +6 −7 deps/openssl/openssl/crypto/x509/x509_vfy.c
  49. +0 −4 deps/openssl/openssl/crypto/x509v3/v3_purp.c
  50. +1 −1 deps/openssl/openssl/doc/apps/crl.pod
  51. +1 −2 deps/openssl/openssl/doc/apps/req.pod
  52. +6 −0 deps/openssl/openssl/doc/apps/s_server.pod
  53. +5 −2 deps/openssl/openssl/doc/crypto/EVP_DigestSignInit.pod
  54. +5 −2 deps/openssl/openssl/doc/crypto/EVP_DigestVerifyInit.pod
  55. +7 −2 deps/openssl/openssl/doc/crypto/OPENSSL_VERSION_NUMBER.pod
  56. +25 −9 deps/openssl/openssl/engines/e_capi.c
  57. +3 −3 deps/openssl/openssl/include/openssl/opensslv.h
  58. +1 −1 deps/openssl/openssl/openssl.spec
  59. +1 −3 deps/openssl/openssl/ssl/d1_pkt.c
  60. +8 −2 deps/openssl/openssl/ssl/ssl_ciph.c
  61. +5 −3 deps/openssl/openssl/ssl/ssl_lib.c
  62. +5 −1 deps/openssl/openssl/ssl/t1_lib.c
  63. +1 −1 deps/openssl/openssl/test/maketests.com
  64. +7 −1 deps/openssl/openssl/test/tests.com
  65. +209 −0 deps/openssl/openssl/tools/c_rehash.bak
  66. +0 −1 deps/openssl/openssl/util/domd
  67. +1 −0 deps/openssl/openssl/util/libeay.num
  68. +20 −0 doc/api/http.md
  69. +7 −0 doc/api/https.md
  70. +42 −0 doc/changelogs/CHANGELOG_V8.md
  71. +12 −3 lib/_http_client.js
  72. +21 −1 lib/_http_server.js
  73. +2 −0 lib/https.js
  74. +23 −10 lib/internal/http.js
  75. +2 −2 lib/url.js
  76. +3 −3 src/node_http_parser.cc
  77. +2 −2 src/node_revert.h
  78. +1 −1 src/node_version.h
  79. +1 −1 test/async-hooks/test-graph.http.js
  80. +12 −0 test/parallel/test-http-client-invalid-path.js
  81. +3 −3 test/parallel/test-http-max-headers-count.js
  82. +56 −0 test/parallel/test-http-slow-headers.js
  83. +69 −0 test/parallel/test-https-slow-headers.js
  84. +55 −0 test/parallel/test-url-parse-format.js
  85. +155 −0 test/sequential/test-http-max-http-headers.js
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -27,7 +27,8 @@ release.
</tr>
<tr>
<td valign="top">
<b><a href="doc/changelogs/CHANGELOG_V8.md#8.13.0">8.13.0</a></b><br/>
<b><a href="doc/changelogs/CHANGELOG_V8.md#8.14.0">8.14.0</a><br/>
<a href="doc/changelogs/CHANGELOG_V8.md#8.13.0">8.13.0</a></b><br/>
<a href="doc/changelogs/CHANGELOG_V8.md#8.12.0">8.12.0</a><br/>
<a href="doc/changelogs/CHANGELOG_V8.md#8.11.4">8.11.4</a><br/>
<a href="doc/changelogs/CHANGELOG_V8.md#8.11.3">8.11.3</a><br/>
4 changes: 2 additions & 2 deletions deps/http_parser/http_parser.gyp
Original file line number Diff line number Diff line change
@@ -56,7 +56,7 @@
'defines': [ 'HTTP_PARSER_STRICT=0' ],
'include_dirs': [ '.' ],
},
'defines': [ 'HTTP_PARSER_STRICT=0' ],
'defines': [ 'HTTP_MAX_HEADER_SIZE=8192', 'HTTP_PARSER_STRICT=0' ],
'sources': [ './http_parser.c', ],
'conditions': [
['OS=="win"', {
@@ -79,7 +79,7 @@
'defines': [ 'HTTP_PARSER_STRICT=1' ],
'include_dirs': [ '.' ],
},
'defines': [ 'HTTP_PARSER_STRICT=1' ],
'defines': [ 'HTTP_MAX_HEADER_SIZE=8192', 'HTTP_PARSER_STRICT=1' ],
'sources': [ './http_parser.c', ],
'conditions': [
['OS=="win"', {
1 change: 1 addition & 0 deletions deps/openssl/openssl.gypi
Original file line number Diff line number Diff line change
@@ -407,6 +407,7 @@
'openssl/crypto/evp/pmeth_lib.c',
'openssl/crypto/ex_data.c',
'openssl/crypto/fips_ers.c',
'openssl/crypto/getenv.c',
'openssl/crypto/hmac/hm_ameth.c',
'openssl/crypto/hmac/hm_pmeth.c',
'openssl/crypto/hmac/hmac.c',
30 changes: 30 additions & 0 deletions deps/openssl/openssl/CHANGES
Original file line number Diff line number Diff line change
@@ -7,6 +7,36 @@
https://github.com/openssl/openssl/commits/ and pick the appropriate
release branch.

Changes between 1.0.2p and 1.0.2q [20 Nov 2018]

*) Microarchitecture timing vulnerability in ECC scalar multiplication

OpenSSL ECC scalar multiplication, used in e.g. ECDSA and ECDH, has been
shown to be vulnerable to a microarchitecture timing side channel attack.
An attacker with sufficient access to mount local timing attacks during
ECDSA signature generation could recover the private key.

This issue was reported to OpenSSL on 26th October 2018 by Alejandro
Cabrera Aldaya, Billy Brumley, Sohaib ul Hassan, Cesar Pereida Garcia and
Nicola Tuveri.
(CVE-2018-5407)
[Billy Brumley]

*) Timing vulnerability in DSA signature generation

The OpenSSL DSA signature algorithm has been shown to be vulnerable to a
timing side channel attack. An attacker could use variations in the signing
algorithm to recover the private key.

This issue was reported to OpenSSL on 16th October 2018 by Samuel Weiser.
(CVE-2018-0734)
[Paul Dale]

*) Resolve a compatibility issue in EC_GROUP handling with the FIPS Object
Module, accidentally introduced while backporting security fixes from the
development branch and hindering the use of ECC in FIPS mode.
[Nicola Tuveri]

Changes between 1.0.2o and 1.0.2p [14 Aug 2018]

*) Client DoS due to large DH parameter
46 changes: 23 additions & 23 deletions deps/openssl/openssl/Makefile
Original file line number Diff line number Diff line change
@@ -4,18 +4,18 @@
## Makefile for OpenSSL
##

VERSION=1.0.2p
VERSION=1.0.2q
MAJOR=1
MINOR=0.2
SHLIB_VERSION_NUMBER=1.0.0
SHLIB_VERSION_HISTORY=
SHLIB_MAJOR=1
SHLIB_MINOR=0.0
SHLIB_EXT=
PLATFORM=dist
OPTIONS= no-ec_nistp_64_gcc_128 no-gmp no-jpake no-krb5 no-libunbound no-md2 no-rc5 no-rfc3779 no-sctp no-shared no-ssl-trace no-ssl2 no-store no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic static-engine
CONFIGURE_ARGS=dist
SHLIB_TARGET=
SHLIB_EXT=.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
PLATFORM=linux-x86_64
OPTIONS=-Wa,--noexecstack no-ec_nistp_64_gcc_128 no-gmp no-jpake no-krb5 no-libunbound no-md2 no-rc5 no-rfc3779 no-sctp no-shared no-ssl-trace no-ssl2 no-store no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic static-engine
CONFIGURE_ARGS=linux-x86_64 -Wa,--noexecstack
SHLIB_TARGET=linux-shared

# HERE indicates where this Makefile lives. This can be used to indicate
# where sub-Makefiles are expected to be. Currently has very limited usage,
@@ -59,11 +59,11 @@ OPENSSLDIR=/usr/local/ssl
# equal 4.
# PKCS1_CHECK - pkcs1 tests.

CC= cc
CFLAG= -O
CC= gcc
CFLAG= -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -Wa,--noexecstack -m64 -DL_ENDIAN -O3 -Wall -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 -DOPENSSL_BN_ASM_GF2m -DRC4_ASM -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DAES_ASM -DVPAES_ASM -DBSAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM -DECP_NISTZ256_ASM
DEPFLAG= -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_LIBUNBOUND -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_SSL_TRACE -DOPENSSL_NO_SSL2 -DOPENSSL_NO_STORE -DOPENSSL_NO_UNIT_TEST -DOPENSSL_NO_WEAK_SSL_CIPHERS
PEX_LIBS=
EX_LIBS=
EX_LIBS= -ldl
EXE_EXT=
ARFLAGS=
AR= ar $(ARFLAGS) r
@@ -73,7 +73,7 @@ NM= nm
PERL= /usr/bin/perl
TAR= tar
TARFLAGS= --no-recursion
MAKEDEPPROG= cc
MAKEDEPPROG= gcc
LIBDIR=lib

# We let the C compiler driver to take care of .s files. This is done in
@@ -89,23 +89,23 @@ ASFLAG=$(CFLAG)
PROCESSOR=

# CPUID module collects small commonly used assembler snippets
CPUID_OBJ= mem_clr.o
BN_ASM= bn_asm.o
EC_ASM=
CPUID_OBJ= x86_64cpuid.o
BN_ASM= x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
EC_ASM= ecp_nistz256.o ecp_nistz256-x86_64.o
DES_ENC= des_enc.o fcrypt_b.o
AES_ENC= aes_core.o aes_cbc.o
AES_ENC= aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
BF_ENC= bf_enc.o
CAST_ENC= c_enc.o
RC4_ENC= rc4_enc.o rc4_skey.o
RC4_ENC= rc4-x86_64.o rc4-md5-x86_64.o
RC5_ENC= rc5_enc.o
MD5_ASM_OBJ=
SHA1_ASM_OBJ=
MD5_ASM_OBJ= md5-x86_64.o
SHA1_ASM_OBJ= sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
RMD160_ASM_OBJ=
WP_ASM_OBJ= wp_block.o
CMLL_ENC= camellia.o cmll_misc.o cmll_cbc.o
MODES_ASM_OBJ=
WP_ASM_OBJ= wp-x86_64.o
CMLL_ENC= cmll-x86_64.o cmll_misc.o
MODES_ASM_OBJ= ghash-x86_64.o aesni-gcm-x86_64.o
ENGINES_ASM_OBJ=
PERLASM_SCHEME=
PERLASM_SCHEME= elf

# KRB5 stuff
KRB5_INCLUDES=
@@ -177,8 +177,8 @@ LIBS= libcrypto.a libssl.a
SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
SHARED_SSL=libssl$(SHLIB_EXT)
SHARED_LIBS=
SHARED_LIBS_LINK_EXTS=
SHARED_LDFLAGS=
SHARED_LIBS_LINK_EXTS=.so.$(SHLIB_MAJOR) .so
SHARED_LDFLAGS=-m64

GENERAL= Makefile
BASENAME= openssl
42 changes: 21 additions & 21 deletions deps/openssl/openssl/Makefile.bak
Original file line number Diff line number Diff line change
@@ -4,18 +4,18 @@
## Makefile for OpenSSL
##

VERSION=1.0.2p
VERSION=1.0.2q-dev
MAJOR=1
MINOR=0.2
SHLIB_VERSION_NUMBER=1.0.0
SHLIB_VERSION_HISTORY=
SHLIB_MAJOR=1
SHLIB_MINOR=0.0
SHLIB_EXT=.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
PLATFORM=linux-x86_64
OPTIONS=-Wa,--noexecstack no-ec_nistp_64_gcc_128 no-gmp no-jpake no-krb5 no-libunbound no-md2 no-rc5 no-rfc3779 no-sctp no-shared no-ssl-trace no-ssl2 no-store no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic static-engine
CONFIGURE_ARGS=linux-x86_64 -Wa,--noexecstack
SHLIB_TARGET=linux-shared
SHLIB_EXT=
PLATFORM=gcc
OPTIONS= no-ec_nistp_64_gcc_128 no-gmp no-jpake no-krb5 no-libunbound no-md2 no-rc5 no-rfc3779 no-sctp no-shared no-ssl-trace no-ssl2 no-store no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic static-engine
CONFIGURE_ARGS=gcc
SHLIB_TARGET=

# HERE indicates where this Makefile lives. This can be used to indicate
# where sub-Makefiles are expected to be. Currently has very limited usage,
@@ -60,10 +60,10 @@ OPENSSLDIR=/usr/local/ssl
# PKCS1_CHECK - pkcs1 tests.

CC= gcc
CFLAG= -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -Wa,--noexecstack -m64 -DL_ENDIAN -O3 -Wall -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 -DOPENSSL_BN_ASM_GF2m -DRC4_ASM -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DAES_ASM -DVPAES_ASM -DBSAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM -DECP_NISTZ256_ASM
CFLAG= -O3
DEPFLAG= -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_LIBUNBOUND -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_SSL_TRACE -DOPENSSL_NO_SSL2 -DOPENSSL_NO_STORE -DOPENSSL_NO_UNIT_TEST -DOPENSSL_NO_WEAK_SSL_CIPHERS
PEX_LIBS=
EX_LIBS= -ldl
EX_LIBS=
EXE_EXT=
ARFLAGS=
AR= ar $(ARFLAGS) r
@@ -89,23 +89,23 @@ ASFLAG=$(CFLAG)
PROCESSOR=

# CPUID module collects small commonly used assembler snippets
CPUID_OBJ= x86_64cpuid.o
BN_ASM= x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o
EC_ASM= ecp_nistz256.o ecp_nistz256-x86_64.o
CPUID_OBJ= mem_clr.o
BN_ASM= bn_asm.o
EC_ASM=
DES_ENC= des_enc.o fcrypt_b.o
AES_ENC= aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o
AES_ENC= aes_core.o aes_cbc.o
BF_ENC= bf_enc.o
CAST_ENC= c_enc.o
RC4_ENC= rc4-x86_64.o rc4-md5-x86_64.o
RC4_ENC= rc4_enc.o rc4_skey.o
RC5_ENC= rc5_enc.o
MD5_ASM_OBJ= md5-x86_64.o
SHA1_ASM_OBJ= sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o
MD5_ASM_OBJ=
SHA1_ASM_OBJ=
RMD160_ASM_OBJ=
WP_ASM_OBJ= wp-x86_64.o
CMLL_ENC= cmll-x86_64.o cmll_misc.o
MODES_ASM_OBJ= ghash-x86_64.o aesni-gcm-x86_64.o
WP_ASM_OBJ= wp_block.o
CMLL_ENC= camellia.o cmll_misc.o cmll_cbc.o
MODES_ASM_OBJ=
ENGINES_ASM_OBJ=
PERLASM_SCHEME= elf
PERLASM_SCHEME=

# KRB5 stuff
KRB5_INCLUDES=
@@ -177,8 +177,8 @@ LIBS= libcrypto.a libssl.a
SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
SHARED_SSL=libssl$(SHLIB_EXT)
SHARED_LIBS=
SHARED_LIBS_LINK_EXTS=.so.$(SHLIB_MAJOR) .so
SHARED_LDFLAGS=-m64
SHARED_LIBS_LINK_EXTS=
SHARED_LDFLAGS=

GENERAL= Makefile
BASENAME= openssl
5 changes: 5 additions & 0 deletions deps/openssl/openssl/NEWS
Original file line number Diff line number Diff line change
@@ -5,6 +5,11 @@
This file gives a brief overview of the major changes between each OpenSSL
release. For more details please read the CHANGES file.

Major changes between OpenSSL 1.0.2p and OpenSSL 1.0.2q [20 Nov 2018]

o Microarchitecture timing vulnerability in ECC scalar multiplication (CVE-2018-5407)
o Timing vulnerability in DSA signature generation (CVE-2018-0734)

Major changes between OpenSSL 1.0.2o and OpenSSL 1.0.2p [14 Aug 2018]

o Client DoS due to large DH parameter (CVE-2018-0732)
2 changes: 1 addition & 1 deletion deps/openssl/openssl/README
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

OpenSSL 1.0.2p 14 Aug 2018
OpenSSL 1.0.2q 20 Nov 2018

Copyright (c) 1998-2018 The OpenSSL Project
Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
Loading