Skip to content

Upgrade to OpenSSL-1.1.0h #19794

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

Closed
shigeki wants to merge 11 commits into from
Closed

Upgrade to OpenSSL-1.1.0h #19794

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b7d3416
deps: upgrade openssl sources to 1.1.0h
shigeki Mar 29, 2018
15c567a
deps: delete files of OpenSSL-1.0.2
shigeki Mar 7, 2018
5073858
deps: add s390 asm rules for OpenSSL-1.1.0
shigeki Mar 7, 2018
98acc7b
deps: add gyp, header and Makefile for openssl110
shigeki Mar 7, 2018
0b367c9
deps: update archs files for OpenSSL-1.1.0
shigeki Mar 29, 2018
3f13148
build: add OpenSSL-1.1.0 support
shigeki Mar 7, 2018
63280f5
test: remove openssl -no_rand_screen opts
shigeki Feb 25, 2018
5bcef7b
tools: install all header files OpenSSL-1.1.0
shigeki Mar 14, 2018
a1a78fe
crypto: remove deperecated methods of TLS version
shigeki Mar 14, 2018
e4751ac
doc: fix API descriptions for OpenSSL-1.1.0
shigeki Mar 14, 2018
f584f35
build, tools, win: add nasm detection for OpenSSL
joaocgreis Mar 24, 2018
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
build, tools, win: add nasm detection for OpenSSL 
OpenSSL-1.1.0 requires the nasm assembler for building asm files on
Windows. This finds nasm at \Program Files\NASM\nasm.exe or
\ProgramFiles(x86)\NASM\nasm.exe in vcbuild.bat for users who did not
add its path in their enviroments.

Fixes: nodejs/build#1190
  • Loading branch information
@joaocgreis @shigeki
joaocgreis authored and shigeki committed Apr 9, 2018
commit f584f354770ab44c79c1294f81a915f255d677e2
3 changes: 3 additions & 0 deletions BUILDING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,9 @@ Prerequisites:
* Basic Unix tools required for some tests,
[Git for Windows](http://git-scm.com/download/win) includes Git Bash
and tools which can be included in the global `PATH`.
* **Optional** (for OpenSSL assembler modules): the [NetWide Assembler](http://www.nasm.us/),
if not installed in the default location it needs to be manually added
to `PATH`.
* **Optional** (to build the MSI): the [WiX Toolset v3.11](http://wixtoolset.org/releases/)
and the [Wix Toolset Visual Studio 2017 Extension](https://marketplace.visualstudio.com/items?itemName=RobMensching.WixToolsetVisualStudio2017Extension).

Expand Down
19 changes: 19 additions & 0 deletions tools/msvs/find_nasm.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
@IF NOT DEFINED DEBUG_HELPER @ECHO OFF

ECHO Looking for NASM

FOR /F "delims=" %%a IN ('where nasm 2^> NUL') DO (
EXIT /B 0
)

IF EXIST "%ProgramFiles%\NASM\nasm.exe" (
SET "Path=%Path%;%ProgramFiles%\NASM"
EXIT /B 0
)

IF EXIST "%ProgramFiles(x86)%\NASM\nasm.exe" (
SET "Path=%Path%;%ProgramFiles(x86)%\NASM"
EXIT /B 0
)

EXIT /B 1
3 changes: 3 additions & 0 deletions vcbuild.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,9 @@ if "%target%"=="Clean" rmdir /S /Q %~dp0deps\icu
call tools\msvs\find_python.cmd
if errorlevel 1 goto :exit

call tools\msvs\find_nasm.cmd
if errorlevel 1 echo Could not find NASM, it will not be used.

call :getnodeversion || exit /b 1

if defined TAG set configure_flags=%configure_flags% --tag=%TAG%
Expand Down