Skip to content

Upgrade openssl-1.1.0e for Node-v8 (DO NOT LAND THIS) #11828

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 10 commits into from
Closed

Upgrade openssl-1.1.0e for Node-v8 (DO NOT LAND THIS) #11828

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
107d344
deps: add openssl-1.1.0e sources
shigeki Mar 10, 2017
de4293c
deps,openssl: add new make rule for asm of *.S
shigeki Dec 28, 2016
694bcf3
deps: add gyp, header and Makefile for openssl110
shigeki Mar 10, 2017
a51b158
deps: update all openssl110e configs
shigeki Mar 10, 2017
878968a
build: add new flag to build with openssl110
shigeki Mar 10, 2017
89d748f
crypto,tls,test: Make it build using openssl 1.1.0
kroeckx Sep 10, 2016
f1b3da8
tls,crypto: fix lint err, api changes openssl110
shigeki Mar 10, 2017
03ebc23
tools: add install rules and fix for openssl110
shigeki Mar 14, 2017
3cc0242
test: fix tests work on both openssl102 and 110
shigeki Mar 10, 2017
45dc7f7
build: temporary enabled --use_openssl110 for CI
shigeki Mar 10, 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
build: temporary enabled --use_openssl110 for CI 
This always enables use_openssl110 flag true. It has fallback to add
no_asm option on Windows when nasm is not installed.

This is a tentative fix for running on CI.
  • Loading branch information
@shigeki
shigeki committed Mar 14, 2017
commit 45dc7f7dcf476e7ab94250894826b94e52ca7833
5 changes: 4 additions & 1 deletion configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ parser.add_option('--openssl-fips',
parser.add_option('--use-openssl110',
action='store_true',
dest='use_openssl110',
default=True,
help='Build with OpenSSL-1.1.0 (Experimental)')

parser.add_option('--openssl-use-def-ca-store',
Expand Down Expand Up @@ -597,7 +598,9 @@ def get_nasm_version(asm):
Please make sure you have installed nasm from http://www.nasm.us
or add an option of openssl_no_asm.
''')
sys.exit()
# sys.exit()
# fallback to openssl_no_asm when nasm is not installed
return 0

match = re.match(r"NASM version ([2-9]\.[0-9][0-9]+)",
proc.communicate()[0])
Expand Down