Commit d719f87
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: #32328
Fixes: #32210
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent 3878d8d commit d719f87
5 files changed
Lines changed: 18 additions & 18 deletions
File tree
- deps/openssl/config
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -38,7 +38,7 @@ OPSSL_SRC = ../openssl | |||
| 38 | 38 | CFG = opensslconf.h | |
| 39 | 39 | SRC_CFG = $(OPSSL_SRC)/include/openssl/$(CFG) | |
| 40 | 40 | INT_CFGS = bn_conf.h dso_conf.h | |
| 41 | - INT_CFG_DIR = $(OPSSL_SRC)/crypto/include/internal | ||
| 41 | + INT_CFG_DIR = $(OPSSL_SRC)/include/crypto | ||
| 42 | 42 | ||
| 43 | 43 | PHONY = all clean replace | |
| 44 | 44 | .PHONY: $(PHONY) | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,7 +1,7 @@ | |||
| 1 | 1 | BLDDIR=. | |
| 2 | 2 | PERL=perl | |
| 3 | 3 | RM= rm -f | |
| 4 | - GENERATED_MANDATORY=crypto/include/internal/bn_conf.h crypto/include/internal/dso_conf.h include/openssl/opensslconf.h | ||
| 4 | + GENERATED_MANDATORY=include/crypto/bn_conf.h include/crypto/dso_conf.h include/openssl/opensslconf.h | ||
| 5 | 5 | 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 | |
| 6 | 6 | ||
| 7 | 7 | # Variables starting with LIB_ are used to build library object files | |
@@ -35,12 +35,12 @@ APPS_OPENSSL=apps/openssl | |||
| 35 | 35 | # see https://github.com/openssl/openssl/blob/master/crypto/sha/asm/sha256-586.pl#L82 | |
| 36 | 36 | CFLAGS += -DOPENSSL_IA32_SSE2 | |
| 37 | 37 | ||
| 38 | - crypto/include/internal/bn_conf.h: crypto/include/internal/bn_conf.h.in configdata.pm | ||
| 38 | + include/crypto/bn_conf.h: include/crypto/bn_conf.h.in configdata.pm | ||
| 39 | 39 | $(PERL) -I$(BLDDIR) -Mconfigdata util/dofile.pl \ | |
| 40 | - -omakefile crypto/include/internal/bn_conf.h.in > $@ | ||
| 41 | - crypto/include/internal/dso_conf.h: crypto/include/internal/dso_conf.h.in configdata.pm | ||
| 40 | + -omakefile include/crypto/bn_conf.h.in > $@ | ||
| 41 | + include/crypto/dso_conf.h: include/crypto/dso_conf.h.in configdata.pm | ||
| 42 | 42 | $(PERL) -I$(BLDDIR) -Mconfigdata util/dofile.pl \ | |
| 43 | - -omakefile crypto/include/internal/dso_conf.h.in > $@ | ||
| 43 | + -omakefile include/crypto/dso_conf.h.in > $@ | ||
| 44 | 44 | include/openssl/opensslconf.h: include/openssl/opensslconf.h.in configdata.pm | |
| 45 | 45 | $(PERL) -I$(BLDDIR) -Mconfigdata util/dofile.pl \ | |
| 46 | 46 | -omakefile include/openssl/opensslconf.h.in > $@ | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -16,7 +16,7 @@ MINOR=1.1 | |||
| 16 | 16 | ||
| 17 | 17 | SHLIB_VERSION_NUMBER=1.1 | |
| 18 | 18 | ||
| 19 | - GENERATED_MANDATORY=crypto/include/internal/bn_conf.h crypto/include/internal/dso_conf.h include/openssl/opensslconf.h | ||
| 19 | + GENERATED_MANDATORY=include/crypto/bn_conf.h include/crypto/dso_conf.h include/openssl/opensslconf.h | ||
| 20 | 20 | GENERATED=crypto/buildinf.h apps/progs.h | |
| 21 | 21 | ||
| 22 | 22 | INSTALL_LIBS="libcrypto.lib" "libssl.lib" | |
@@ -132,12 +132,12 @@ crypto/buildinf.h: | |||
| 132 | 132 | apps/progs.h: | |
| 133 | 133 | "$(PERL)" "apps/progs.pl" $(APPS_OPENSSL) > $@ | |
| 134 | 134 | ||
| 135 | - crypto/include/internal/bn_conf.h: | ||
| 135 | + include/crypto/bn_conf.h: | ||
| 136 | 136 | "$(PERL)" "-I$(BLDDIR)" -Mconfigdata "util/dofile.pl" \ | |
| 137 | - "-omakefile" "crypto/include/internal/bn_conf.h.in" > $@ | ||
| 138 | - crypto/include/internal/dso_conf.h: | ||
| 137 | + "-omakefile" "include/crypto/bn_conf.h.in" > $@ | ||
| 138 | + include/crypto/dso_conf.h: | ||
| 139 | 139 | "$(PERL)" "-I$(BLDDIR)" -Mconfigdata "util/dofile.pl" \ | |
| 140 | - "-omakefile" "crypto/include/internal/dso_conf.h.in" > $@ | ||
| 140 | + "-omakefile" "include/crypto/dso_conf.h.in" > $@ | ||
| 141 | 141 | include/openssl/opensslconf.h: | |
| 142 | 142 | "$(PERL)" "-I$(BLDDIR)" -Mconfigdata "util/dofile.pl" \ | |
| 143 | 143 | "-omakefile" "include/openssl/opensslconf.h.in" > $@ | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -5,18 +5,18 @@ RM= rm -f | |||
| 5 | 5 | AS=nasm | |
| 6 | 6 | ASFLAGS=-g | |
| 7 | 7 | ||
| 8 | - GENERATED_MANDATORY=crypto/include/internal/bn_conf.h crypto/include/internal/dso_conf.h include/openssl/opensslconf.h | ||
| 8 | + GENERATED_MANDATORY=include/crypto/bn_conf.h include/crypto/dso_conf.h include/openssl/opensslconf.h | ||
| 9 | 9 | 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 | |
| 10 | 10 | ||
| 11 | 11 | PERLASM_SCHEME= auto | |
| 12 | 12 | APPS_OPENSSL=apps/openssl | |
| 13 | 13 | ||
| 14 | - crypto/include/internal/bn_conf.h: crypto/include/internal/bn_conf.h.in configdata.pm | ||
| 14 | + include/crypto/bn_conf.h: include/crypto/bn_conf.h.in configdata.pm | ||
| 15 | 15 | "$(PERL)" "-I$(BLDDIR)" -Mconfigdata "util/dofile.pl" \ | |
| 16 | - "-omakefile" "crypto/include/internal/bn_conf.h.in" > $@ | ||
| 17 | - crypto/include/internal/dso_conf.h: crypto/include/internal/dso_conf.h.in configdata.pm | ||
| 16 | + "-omakefile" "include/crypto/bn_conf.h.in" > $@ | ||
| 17 | + include/crypto/dso_conf.h: include/crypto/dso_conf.h.in configdata.pm | ||
| 18 | 18 | "$(PERL)" "-I$(BLDDIR)" -Mconfigdata "util/dofile.pl" \ | |
| 19 | - "-omakefile" "crypto/include/internal/dso_conf.h.in" > $@ | ||
| 19 | + "-omakefile" "include/crypto/dso_conf.h.in" > $@ | ||
| 20 | 20 | include/openssl/opensslconf.h: include/openssl/opensslconf.h.in configdata.pm | |
| 21 | 21 | "$(PERL)" "-I$(BLDDIR)" -Mconfigdata "util/dofile.pl" \ | |
| 22 | 22 | "-omakefile" "include/openssl/opensslconf.h.in" > $@ | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -62,9 +62,9 @@ | |||
| 62 | 62 | copy("$src_dir/configdata.pm", "$base_dir/") or die "Copy failed: $!"; | |
| 63 | 63 | copy("$src_dir/include/openssl/opensslconf.h", | |
| 64 | 64 | "$base_dir/include/openssl/") or die "Copy failed: $!"; | |
| 65 | - move("$src_dir/crypto/include/internal/bn_conf.h", | ||
| 65 | + move("$src_dir/include/crypto/bn_conf.h", | ||
| 66 | 66 | "$base_dir/crypto/include/internal/") or die "Move failed: $!"; | |
| 67 | - move("$src_dir/crypto/include/internal/dso_conf.h", | ||
| 67 | + move("$src_dir/include/crypto/dso_conf.h", | ||
| 68 | 68 | "$base_dir/crypto/include/internal/") or die "Move failed: $!"; | |
| 69 | 69 | copy("$src_dir/$buildinf", | |
| 70 | 70 | "$base_dir/crypto/") or die "Copy failed: $!"; | |
0 commit comments