From 64c184836b8194ac7318f7dc82e7742d6e4724f8 Mon Sep 17 00:00:00 2001 From: Hassaan Pasha Date: Wed, 18 Mar 2020 10:17:22 +0500 Subject: [PATCH] deps: adjust openssl configuration for 1.1.1e The scripts used by make were modified to correctly reference the source files that were originially in crypto/include/internal, but got moved to include/crypto. The base path has been left unaltered since that would require too many changes PR-URL: https://github.com/nodejs/node/pull/32328 Backport-PR-URL: https://github.com/nodejs/node/pull/32443 Fixes: https://github.com/nodejs/node/issues/32210 Reviewed-By: Sam Roberts Reviewed-By: James M Snell --- deps/openssl/config/Makefile | 2 +- deps/openssl/config/Makefile_VC-WIN32 | 10 +++++----- deps/openssl/config/Makefile_VC-WIN64-ARM | 11 ++++++----- deps/openssl/config/Makefile_VC-WIN64A | 10 +++++----- deps/openssl/config/generate_gypi.pl | 4 ++-- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/deps/openssl/config/Makefile b/deps/openssl/config/Makefile index ff87bba7126534..f2c0cc7dbfaf83 100644 --- a/deps/openssl/config/Makefile +++ b/deps/openssl/config/Makefile @@ -37,7 +37,7 @@ OPSSL_SRC = ../openssl CFG = opensslconf.h SRC_CFG = $(OPSSL_SRC)/include/openssl/$(CFG) INT_CFGS = bn_conf.h dso_conf.h -INT_CFG_DIR = $(OPSSL_SRC)/crypto/include/internal +INT_CFG_DIR = $(OPSSL_SRC)/include/crypto PHONY = all clean replace .PHONY: $(PHONY) diff --git a/deps/openssl/config/Makefile_VC-WIN32 b/deps/openssl/config/Makefile_VC-WIN32 index f7debe23833036..42151a00e92446 100644 --- a/deps/openssl/config/Makefile_VC-WIN32 +++ b/deps/openssl/config/Makefile_VC-WIN32 @@ -1,7 +1,7 @@ BLDDIR=. PERL=perl RM= rm -f -GENERATED_MANDATORY=crypto/include/internal/bn_conf.h crypto/include/internal/dso_conf.h include/openssl/opensslconf.h +GENERATED_MANDATORY=include/crypto/bn_conf.h include/crypto/dso_conf.h include/openssl/opensslconf.h GENERATED=apps/CA.pl apps/openssl.rc apps/progs.h apps/tsget.pl crypto/aes/aes-586.asm crypto/aes/aesni-x86.asm crypto/aes/vpaes-x86.asm crypto/bf/bf-586.asm crypto/bn/bn-586.asm crypto/bn/co-586.asm crypto/bn/x86-gf2m.asm crypto/bn/x86-mont.asm crypto/buildinf.h crypto/camellia/cmll-x86.asm crypto/chacha/chacha-x86.asm crypto/des/crypt586.asm crypto/des/des-586.asm crypto/ec/ecp_nistz256-x86.asm crypto/md5/md5-586.asm crypto/modes/ghash-x86.asm crypto/poly1305/poly1305-x86.asm crypto/rc4/rc4-586.asm crypto/ripemd/rmd-586.asm crypto/sha/sha1-586.asm crypto/sha/sha256-586.asm crypto/sha/sha512-586.asm crypto/whrlpool/wp-mmx.asm crypto/x86cpuid.asm engines/capi.def engines/dasync.def engines/e_padlock-x86.asm engines/ossltest.def engines/padlock.def libcrypto.def libcrypto.rc libssl.def libssl.rc test/buildtest_aes.c test/buildtest_asn1.c test/buildtest_asn1t.c test/buildtest_async.c test/buildtest_bio.c test/buildtest_blowfish.c test/buildtest_bn.c test/buildtest_buffer.c test/buildtest_camellia.c test/buildtest_cast.c test/buildtest_cmac.c test/buildtest_cms.c test/buildtest_comp.c test/buildtest_conf.c test/buildtest_conf_api.c test/buildtest_crypto.c test/buildtest_ct.c test/buildtest_des.c test/buildtest_dh.c test/buildtest_dsa.c test/buildtest_dtls1.c test/buildtest_e_os2.c test/buildtest_ebcdic.c test/buildtest_ec.c test/buildtest_ecdh.c test/buildtest_ecdsa.c test/buildtest_engine.c test/buildtest_evp.c test/buildtest_hmac.c test/buildtest_idea.c test/buildtest_kdf.c test/buildtest_lhash.c test/buildtest_md4.c test/buildtest_md5.c test/buildtest_mdc2.c test/buildtest_modes.c test/buildtest_obj_mac.c test/buildtest_objects.c test/buildtest_ocsp.c test/buildtest_opensslv.c test/buildtest_ossl_typ.c test/buildtest_pem.c test/buildtest_pem2.c test/buildtest_pkcs12.c test/buildtest_pkcs7.c test/buildtest_rand.c test/buildtest_rand_drbg.c test/buildtest_rc2.c test/buildtest_rc4.c test/buildtest_ripemd.c test/buildtest_rsa.c test/buildtest_safestack.c test/buildtest_seed.c test/buildtest_sha.c test/buildtest_srp.c test/buildtest_srtp.c test/buildtest_ssl.c test/buildtest_ssl2.c test/buildtest_stack.c test/buildtest_store.c test/buildtest_symhacks.c test/buildtest_tls1.c test/buildtest_ts.c test/buildtest_txt_db.c test/buildtest_ui.c test/buildtest_whrlpool.c test/buildtest_x509.c test/buildtest_x509_vfy.c test/buildtest_x509v3.c tools/c_rehash.pl # Variables starting with LIB_ are used to build library object files @@ -35,12 +35,12 @@ APPS_OPENSSL=apps/openssl # see https://github.com/openssl/openssl/blob/master/crypto/sha/asm/sha256-586.pl#L82 CFLAGS += -DOPENSSL_IA32_SSE2 -crypto/include/internal/bn_conf.h: crypto/include/internal/bn_conf.h.in configdata.pm +include/crypto/bn_conf.h: include/crypto/bn_conf.h.in configdata.pm $(PERL) -I$(BLDDIR) -Mconfigdata util/dofile.pl \ - -omakefile crypto/include/internal/bn_conf.h.in > $@ -crypto/include/internal/dso_conf.h: crypto/include/internal/dso_conf.h.in configdata.pm + -omakefile include/crypto/bn_conf.h.in > $@ +include/crypto/dso_conf.h: include/crypto/dso_conf.h.in configdata.pm $(PERL) -I$(BLDDIR) -Mconfigdata util/dofile.pl \ - -omakefile crypto/include/internal/dso_conf.h.in > $@ + -omakefile include/crypto/dso_conf.h.in > $@ include/openssl/opensslconf.h: include/openssl/opensslconf.h.in configdata.pm $(PERL) -I$(BLDDIR) -Mconfigdata util/dofile.pl \ -omakefile include/openssl/opensslconf.h.in > $@ diff --git a/deps/openssl/config/Makefile_VC-WIN64-ARM b/deps/openssl/config/Makefile_VC-WIN64-ARM index 9937bd5492a39b..006a303465f140 100644 --- a/deps/openssl/config/Makefile_VC-WIN64-ARM +++ b/deps/openssl/config/Makefile_VC-WIN64-ARM @@ -16,7 +16,8 @@ MINOR=1.1 SHLIB_VERSION_NUMBER=1.1 -GENERATED_MANDATORY=crypto/include/internal/bn_conf.h crypto/include/internal/dso_conf.h include/openssl/opensslconf.h +GENERATED_MANDATORY=include/crypto/bn_conf.h include/crypto/dso_conf.h include/openssl/opensslconf.h +GENERATED=crypto/buildinf.h apps/progs.h INSTALL_LIBS="libcrypto.lib" "libssl.lib" INSTALL_SHLIBS="libcrypto-1_1-arm64.dll" "libssl-1_1-arm64.dll" @@ -131,12 +132,12 @@ crypto/buildinf.h: apps/progs.h: "$(PERL)" "apps/progs.pl" $(APPS_OPENSSL) > $@ -crypto/include/internal/bn_conf.h: +include/crypto/bn_conf.h: "$(PERL)" "-I$(BLDDIR)" -Mconfigdata "util/dofile.pl" \ - "-omakefile" "crypto/include/internal/bn_conf.h.in" > $@ -crypto/include/internal/dso_conf.h: + "-omakefile" "include/crypto/bn_conf.h.in" > $@ +include/crypto/dso_conf.h: "$(PERL)" "-I$(BLDDIR)" -Mconfigdata "util/dofile.pl" \ - "-omakefile" "crypto/include/internal/dso_conf.h.in" > $@ + "-omakefile" "include/crypto/dso_conf.h.in" > $@ include/openssl/opensslconf.h: "$(PERL)" "-I$(BLDDIR)" -Mconfigdata "util/dofile.pl" \ "-omakefile" "include/openssl/opensslconf.h.in" > $@ diff --git a/deps/openssl/config/Makefile_VC-WIN64A b/deps/openssl/config/Makefile_VC-WIN64A index fa66acfd517dfb..d610b0646a5e97 100644 --- a/deps/openssl/config/Makefile_VC-WIN64A +++ b/deps/openssl/config/Makefile_VC-WIN64A @@ -5,18 +5,18 @@ RM= rm -f AS=nasm ASFLAGS=-g -GENERATED_MANDATORY=crypto/include/internal/bn_conf.h crypto/include/internal/dso_conf.h include/openssl/opensslconf.h +GENERATED_MANDATORY=include/crypto/bn_conf.h include/crypto/dso_conf.h include/openssl/opensslconf.h GENERATED=apps/CA.pl apps/openssl.rc apps/progs.h apps/tsget.pl crypto/aes/aes-x86_64.asm crypto/aes/aesni-mb-x86_64.asm crypto/aes/aesni-sha1-x86_64.asm crypto/aes/aesni-sha256-x86_64.asm crypto/aes/aesni-x86_64.asm crypto/aes/bsaes-x86_64.asm crypto/aes/vpaes-x86_64.asm crypto/bn/rsaz-avx2.asm crypto/bn/rsaz-x86_64.asm crypto/bn/x86_64-gf2m.asm crypto/bn/x86_64-mont.asm crypto/bn/x86_64-mont5.asm crypto/buildinf.h crypto/camellia/cmll-x86_64.asm crypto/chacha/chacha-x86_64.asm crypto/ec/ecp_nistz256-x86_64.asm crypto/ec/x25519-x86_64.asm crypto/md5/md5-x86_64.asm crypto/modes/aesni-gcm-x86_64.asm crypto/modes/ghash-x86_64.asm crypto/poly1305/poly1305-x86_64.asm crypto/rc4/rc4-md5-x86_64.asm crypto/rc4/rc4-x86_64.asm crypto/sha/keccak1600-x86_64.asm crypto/sha/sha1-mb-x86_64.asm crypto/sha/sha1-x86_64.asm crypto/sha/sha256-mb-x86_64.asm crypto/sha/sha256-x86_64.asm crypto/sha/sha512-x86_64.asm crypto/uplink-x86_64.asm crypto/whrlpool/wp-x86_64.asm crypto/x86_64cpuid.asm engines/e_padlock-x86_64.asm libcrypto.def libcrypto.rc libssl.def libssl.rc test/buildtest_aes.c test/buildtest_asn1.c test/buildtest_asn1t.c test/buildtest_async.c test/buildtest_bio.c test/buildtest_blowfish.c test/buildtest_bn.c test/buildtest_buffer.c test/buildtest_camellia.c test/buildtest_cast.c test/buildtest_cmac.c test/buildtest_cms.c test/buildtest_comp.c test/buildtest_conf.c test/buildtest_conf_api.c test/buildtest_crypto.c test/buildtest_ct.c test/buildtest_des.c test/buildtest_dh.c test/buildtest_dsa.c test/buildtest_dtls1.c test/buildtest_e_os2.c test/buildtest_ebcdic.c test/buildtest_ec.c test/buildtest_ecdh.c test/buildtest_ecdsa.c test/buildtest_engine.c test/buildtest_evp.c test/buildtest_hmac.c test/buildtest_idea.c test/buildtest_kdf.c test/buildtest_lhash.c test/buildtest_md4.c test/buildtest_md5.c test/buildtest_mdc2.c test/buildtest_modes.c test/buildtest_obj_mac.c test/buildtest_objects.c test/buildtest_ocsp.c test/buildtest_opensslv.c test/buildtest_ossl_typ.c test/buildtest_pem.c test/buildtest_pem2.c test/buildtest_pkcs12.c test/buildtest_pkcs7.c test/buildtest_rand.c test/buildtest_rand_drbg.c test/buildtest_rc2.c test/buildtest_rc4.c test/buildtest_ripemd.c test/buildtest_rsa.c test/buildtest_safestack.c test/buildtest_seed.c test/buildtest_sha.c test/buildtest_srp.c test/buildtest_srtp.c test/buildtest_ssl.c test/buildtest_ssl2.c test/buildtest_stack.c test/buildtest_store.c test/buildtest_symhacks.c test/buildtest_tls1.c test/buildtest_ts.c test/buildtest_txt_db.c test/buildtest_ui.c test/buildtest_whrlpool.c test/buildtest_x509.c test/buildtest_x509_vfy.c test/buildtest_x509v3.c tools/c_rehash.pl PERLASM_SCHEME= auto APPS_OPENSSL=apps/openssl -crypto/include/internal/bn_conf.h: crypto/include/internal/bn_conf.h.in configdata.pm +include/crypto/bn_conf.h: include/crypto/bn_conf.h.in configdata.pm "$(PERL)" "-I$(BLDDIR)" -Mconfigdata "util/dofile.pl" \ - "-omakefile" "crypto/include/internal/bn_conf.h.in" > $@ -crypto/include/internal/dso_conf.h: crypto/include/internal/dso_conf.h.in configdata.pm + "-omakefile" "include/crypto/bn_conf.h.in" > $@ +include/crypto/dso_conf.h: include/crypto/dso_conf.h.in configdata.pm "$(PERL)" "-I$(BLDDIR)" -Mconfigdata "util/dofile.pl" \ - "-omakefile" "crypto/include/internal/dso_conf.h.in" > $@ + "-omakefile" "include/crypto/dso_conf.h.in" > $@ include/openssl/opensslconf.h: include/openssl/opensslconf.h.in configdata.pm "$(PERL)" "-I$(BLDDIR)" -Mconfigdata "util/dofile.pl" \ "-omakefile" "include/openssl/opensslconf.h.in" > $@ diff --git a/deps/openssl/config/generate_gypi.pl b/deps/openssl/config/generate_gypi.pl index 891ccb62bbf6d4..f5df5ecdd8b9e9 100755 --- a/deps/openssl/config/generate_gypi.pl +++ b/deps/openssl/config/generate_gypi.pl @@ -62,9 +62,9 @@ copy("$src_dir/configdata.pm", "$base_dir/") or die "Copy failed: $!"; copy("$src_dir/include/openssl/opensslconf.h", "$base_dir/include/openssl/") or die "Copy failed: $!"; -move("$src_dir/crypto/include/internal/bn_conf.h", +move("$src_dir/include/crypto/bn_conf.h", "$base_dir/crypto/include/internal/") or die "Move failed: $!"; -move("$src_dir/crypto/include/internal/dso_conf.h", +move("$src_dir/include/crypto/dso_conf.h", "$base_dir/crypto/include/internal/") or die "Move failed: $!"; copy("$src_dir/$buildinf", "$base_dir/crypto/") or die "Copy failed: $!";