Skip to content

[v11.x backport] Update openssl to 1.1.1a #25688

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
sam-github wants to merge 13 commits into from
Closed

[v11.x backport] Update openssl to 1.1.1a #25688

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2d0fc10
deps: upgrade openssl sources to 1.1.1a
sam-github Jan 24, 2019
e78e4c0
deps: fix gyp/gypi for openssl-1.1.1
shigeki May 5, 2018
bc7caaf
deps: fix MacOS and Win build for OpenSSL-1.1.1
shigeki Nov 1, 2018
6c0417e
deps: add s390 asm rules for OpenSSL-1.1.1
shigeki Mar 7, 2018
706deb5
deps: add only avx2 configs for OpenSSL-1.1.1
shigeki Nov 8, 2018
580dc0f
deps: fix for non GNU assembler in AIX
shigeki Nov 15, 2018
1a00628
doc: fix assembler requirement for OpenSSL-1.1.1
shigeki Nov 10, 2018
9cd76e6
deps: update archs files for OpenSSL-1.1.1a
sam-github Jan 24, 2019
45e0616
tls: make ossl 1.1.1 cipher list throw error
sam-github Nov 26, 2018
839f177
tls: workaround handshakedone in renegotiation
shigeki Sep 12, 2018
8ecdc03
test: assert on client and server side seperately
sam-github Jan 7, 2019
6fe20ec
fixup! test: assert on client and server side seperately
sam-github Jan 24, 2019
dffd719
fixup! fixup! test: assert on client and server side seperately
sam-github Jan 25, 2019
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: fix MacOS and Win build for OpenSSL-1.1.1 
Because llvm on MacOS does not support AVX-512, asm files need to be limited to
AVX-2 support even when they are generated on Linux.  fake_gcc.pl returns the
fake llvm banner version for MacOS as if the assembler supports upto AVX-2.

For Windows, makefiles for nmake were updated in OpenSSL-1.1.1 and they are
rewritten into GNU makefile format by hand.

PR-URL: #25381
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org>
  • Loading branch information
@shigeki @sam-github
shigeki authored and sam-github committed Jan 24, 2019
commit bc7caafeb3ff85a939a0a7f6bc400b916eaf34b5
10 changes: 7 additions & 3 deletions deps/openssl/config/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ linux-armv4 linux-elf linux-x32 linux-x86_64 linux-ppc \
linux-ppc64 linux-ppc64le linux32-s390x linux64-s390x \
solaris-x86-gcc solaris64-x86_64-gcc VC-WIN64A VC-WIN32

CC = gcc
CONFIGURE = ./Configure
# no-comp: against CRIME attack
# no-shared: openssl-cli needs static link
Expand Down Expand Up @@ -44,8 +45,11 @@ all: $(ARCHS) replace
$(ARCHS):
# Remove openssl .gitignore to follow nodejs .gitignore
if [ -e $(GITIGNORE) ]; then rm $(GITIGNORE); fi
# Confgure asm and generate asm sources
cd $(OPSSL_SRC); $(NO_WARN_ENV) $(PERL) $(CONFIGURE) $(COPTS) $@;
if [ "$(findstring darwin, $@)" = "" ]; then \
cd $(OPSSL_SRC); $(NO_WARN_ENV) ARC=$@ CC=$(CC) $(PERL) $(CONFIGURE) $(COPTS) $@; \
else \
cd $(OPSSL_SRC); $(NO_WARN_ENV) ARC=$@ CC=./fake_gcc.pl $(PERL) $(CONFIGURE) $(COPTS) $@; \
fi
$(PERL) -w -I$(OPSSL_SRC) $(GENERATE) asm $@
# Confgure no-asm and generate no-asm sources
cd $(OPSSL_SRC); $(NO_WARN_ENV) $(PERL) $(CONFIGURE) $(COPTS) \
Expand All @@ -61,4 +65,4 @@ replace:

clean:
find archs \( -name \*.S -o -name \*.s -o -name \*.asm -o \
-name \*.gypi -o -name \*.h -o -name \*.pm \) -exec rm "{}" \;
-name \*.gypi -o -name \*.h -o -name \*.pm -o -name \*.rc \) -exec rm "{}" \;
Loading