Skip to content
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

Jump to bottom

Openssl update v5 #6552

Merged
merged 8 commits into from
May 4, 2016
Merged

Openssl update v5 #6552

merged 8 commits into from
May 4, 2016

Commits on May 4, 2016

  1. deps: upgrade openssl sources to 1.0.2h 

    This replaces all sources of openssl-1.0.2h.tar.gz into
deps/openssl/openssl

PR-URL: nodejs#6552
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
    Shigeki Ohtsu authored and Myles Borins committed May 4, 2016
    Configuration menu
    Copy the full SHA
    cdad83a View commit details
    Browse the repository at this point in the history

  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.

PR-URL: nodejs#6552
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
    Shigeki Ohtsu authored and Myles Borins committed May 4, 2016
    Configuration menu
    Copy the full SHA
    ba49b63 View commit details
    Browse the repository at this point in the history

  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: nodejs#589
PR-URL: nodejs#1389
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
    @indutny
    indutny authored and Myles Borins committed May 4, 2016
    Configuration menu
    Copy the full SHA
    889d115 View commit details
    Browse the repository at this point in the history

  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: nodejs#589
PR-URL: nodejs#1389
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
    Shigeki Ohtsu authored and Myles Borins committed May 4, 2016
    Configuration menu
    Copy the full SHA
    263cc34 View commit details
    Browse the repository at this point in the history

  5. openssl: fix keypress requirement in apps on win32 

    Reapply b910613 .

Fixes: nodejs#589
PR-URL: nodejs#1389
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
    Shigeki Ohtsu authored and Myles Borins committed May 4, 2016
    Configuration menu
    Copy the full SHA
    c1ddefd View commit details
    Browse the repository at this point in the history

  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: nodejs#1461
PR-URL: nodejs#1836
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
    Shigeki Ohtsu authored and Myles Borins committed May 4, 2016
    Configuration menu
    Copy the full SHA
    f316fd2 View commit details
    Browse the repository at this point in the history

  7. 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 assembler are regenerated without CC and ASM envs.

PR-URL: nodejs#6552
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
    Shigeki Ohtsu authored and Myles Borins committed May 4, 2016
    Configuration menu
    Copy the full SHA
    d9f7b02 View commit details
    Browse the repository at this point in the history

  8. test: fix alpn tests for openssl1.0.2h 

    openssl/openssl@af2db04
changed some ALPN behaviors. The tests when ALPN has no selection
should be fixed because openssl was changed NPN callback to be invoked
in this case.

PR-URL: nodejs#6552
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
    Shigeki Ohtsu authored and Myles Borins committed May 4, 2016
    Configuration menu
    Copy the full SHA
    bec5d50 View commit details
    Browse the repository at this point in the history