Skip to content
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

Jump to bottom

Update openssl1.1.1b #26327

Closed
wants to merge 5 commits into from
Closed

Update openssl1.1.1b #26327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5b59fb8
Revert "deps: remove OpenSSL git and travis configuration"
sam-github Feb 26, 2019
8c936cf
deps: upgrade openssl sources to 1.1.1b
sam-github Feb 26, 2019
c095c55
deps: add s390 asm rules for OpenSSL-1.1.1
shigeki Mar 7, 2018
679294f
deps: update archs files for OpenSSL-1.1.1b
sam-github Feb 26, 2019
960257a
deps: openssl-1.1.1b no longer packages .gitignore
sam-github Feb 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 0 additions & 3 deletions deps/openssl/config/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@ all: $(ARCHS) replace

# Configure and generate openssl asm files for each archs
$(ARCHS):
# Remove openssl git and travis configuration, nodejs has its own (and they
# should not have been packaged by upstream).
rm -rf $(OPSSL_SRC)/.git* $(OPSSL_SRC)/.travis*
cd $(OPSSL_SRC); $(NO_WARN_ENV) CC=$(CC) $(PERL) $(CONFIGURE) $(COPTS) $@;
$(PERL) -w -I$(OPSSL_SRC) $(GENERATE) asm $@
# Confgure asm_avx2 and generate upto avx2 support
Expand Down
1 change: 0 additions & 1 deletion deps/openssl/config/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ $ git add deps/openssl/config/archs
$ git add deps/openssl/openssl/crypto/include/internal/bn_conf.h
$ git add deps/openssl/openssl/crypto/include/internal/dso_conf.h
$ git add deps/openssl/openssl/include/openssl/opensslconf.h
$ git add deps/openssl/openssl/.gitignore
$ git commit
```

Expand Down
63 changes: 55 additions & 8 deletions deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ our %config = (
minor => "1.1",
openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
openssl_api_defines => [ ],
openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL_TRACE", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL_TRACE", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
openssl_sys_defines => [ ],
openssl_thread_defines => [ "OPENSSL_THREADS" ],
openssldir => "",
options => " no-afalgeng no-asan no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-md2 no-msan no-rc5 no-sctp no-shared no-ssl-trace no-ssl3 no-ssl3-method no-ubsan no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
options => " no-afalgeng no-asan no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-md2 no-msan no-rc5 no-sctp no-shared no-ssl-trace no-ssl3 no-ssl3-method no-ubsan no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
perl_archname => "x86_64-linux-gnu-thread-multi",
perl_cmd => "/usr/bin/perl",
perl_version => "5.26.2",
Expand Down Expand Up @@ -109,8 +109,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86_64",
tdirs => [ "ossl_shim" ],
version => "1.1.1a",
version_num => "0x1010101fL",
version => "1.1.1b",
version_num => "0x1010102fL",
);

our %target = (
Expand Down Expand Up @@ -259,6 +259,7 @@ our @disablables = (
"msan",
"multiblock",
"nextprotoneg",
"pinshared",
"ocb",
"ocsp",
"pic",
Expand Down Expand Up @@ -319,7 +320,6 @@ our %disabled = (
"comp" => "option",
"crypto-mdebug" => "default",
"crypto-mdebug-backtrace" => "default",
"devcryptoeng" => "default",
"dynamic-engine" => "forced",
"ec_nistp_64_gcc_128" => "default",
"egd" => "default",
Expand Down Expand Up @@ -783,6 +783,11 @@ our %unified_info = (
"libcrypto",
"test/libtestutil.a",
],
"test/bio_memleak_test" =>
[
"libcrypto",
"test/libtestutil.a",
],
"test/bioprinttest" =>
[
"libcrypto",
Expand Down Expand Up @@ -1266,6 +1271,11 @@ our %unified_info = (
"libssl",
"test/libtestutil.a",
],
"test/ec_internal_test" =>
[
"libcrypto.a",
"test/libtestutil.a",
],
"test/ecdsatest" =>
[
"libcrypto",
Expand Down Expand Up @@ -2303,6 +2313,7 @@ our %unified_info = (
"crypto/engine/eng_all.o",
"crypto/engine/eng_cnf.o",
"crypto/engine/eng_ctrl.o",
"crypto/engine/eng_devcrypto.o",
"crypto/engine/eng_dyn.o",
"crypto/engine/eng_err.o",
"crypto/engine/eng_fat.o",
Expand Down Expand Up @@ -6815,6 +6826,12 @@ our %unified_info = (
"crypto/include",
"include",
],
"crypto/engine/eng_devcrypto.o" =>
[
".",
"crypto/include",
"include",
],
"crypto/engine/eng_dyn.o" =>
[
".",
Expand Down Expand Up @@ -9407,6 +9424,10 @@ our %unified_info = (
[
"include",
],
"test/bio_memleak_test.o" =>
[
"include",
],
"test/bioprinttest.o" =>
[
"include",
Expand Down Expand Up @@ -9803,6 +9824,12 @@ our %unified_info = (
[
"include",
],
"test/ec_internal_test.o" =>
[
"include",
"crypto/ec",
"crypto/include",
],
"test/ecdsatest.o" =>
[
"include",
Expand Down Expand Up @@ -10210,6 +10237,7 @@ our %unified_info = (
"test/bftest",
"test/bio_callback_test",
"test/bio_enc_test",
"test/bio_memleak_test",
"test/bioprinttest",
"test/bntest",
"test/buildtest_aes",
Expand Down Expand Up @@ -10305,6 +10333,7 @@ our %unified_info = (
"test/dtls_mtu_test",
"test/dtlstest",
"test/dtlsv1listentest",
"test/ec_internal_test",
"test/ecdsatest",
"test/ecstresstest",
"test/ectest",
Expand Down Expand Up @@ -11914,6 +11943,10 @@ our %unified_info = (
[
"crypto/engine/eng_ctrl.c",
],
"crypto/engine/eng_devcrypto.o" =>
[
"crypto/engine/eng_devcrypto.c",
],
"crypto/engine/eng_dyn.o" =>
[
"crypto/engine/eng_dyn.c",
Expand Down Expand Up @@ -13746,6 +13779,7 @@ our %unified_info = (
"crypto/engine/eng_all.o",
"crypto/engine/eng_cnf.o",
"crypto/engine/eng_ctrl.o",
"crypto/engine/eng_devcrypto.o",
"crypto/engine/eng_dyn.o",
"crypto/engine/eng_err.o",
"crypto/engine/eng_fat.o",
Expand Down Expand Up @@ -14431,6 +14465,14 @@ our %unified_info = (
[
"test/bio_enc_test.c",
],
"test/bio_memleak_test" =>
[
"test/bio_memleak_test.o",
],
"test/bio_memleak_test.o" =>
[
"test/bio_memleak_test.c",
],
"test/bioprinttest" =>
[
"test/bioprinttest.o",
Expand Down Expand Up @@ -15198,6 +15240,14 @@ our %unified_info = (
[
"test/dtlsv1listentest.c",
],
"test/ec_internal_test" =>
[
"test/ec_internal_test.o",
],
"test/ec_internal_test.o" =>
[
"test/ec_internal_test.c",
],
"test/ecdsatest" =>
[
"test/ecdsatest.o",
Expand Down Expand Up @@ -15878,9 +15928,6 @@ my %disabled_info = (
'crypto-mdebug-backtrace' => {
macro => 'OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE',
},
'devcryptoeng' => {
macro => 'OPENSSL_NO_DEVCRYPTOENG',
},
'ec_nistp_64_gcc_128' => {
macro => 'OPENSSL_NO_EC_NISTP_64_GCC_128',
},
Expand Down
16 changes: 14 additions & 2 deletions deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aes-x86_64.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ _x86_64_AES_encrypt:
.type _x86_64_AES_encrypt_compact,@function
.align 16
_x86_64_AES_encrypt_compact:
.cfi_startproc
leaq 128(%r14),%r8
movl 0-128(%r8),%edi
movl 32-128(%r8),%ebp
Expand Down Expand Up @@ -324,6 +325,7 @@ _x86_64_AES_encrypt_compact:
xorl 8(%r15),%ecx
xorl 12(%r15),%edx
.byte 0xf3,0xc3
.cfi_endproc
.size _x86_64_AES_encrypt_compact,.-_x86_64_AES_encrypt_compact
.globl AES_encrypt
.type AES_encrypt,@function
Expand Down Expand Up @@ -568,6 +570,7 @@ _x86_64_AES_decrypt:
.type _x86_64_AES_decrypt_compact,@function
.align 16
_x86_64_AES_decrypt_compact:
.cfi_startproc
leaq 128(%r14),%r8
movl 0-128(%r8),%edi
movl 32-128(%r8),%ebp
Expand Down Expand Up @@ -789,6 +792,7 @@ _x86_64_AES_decrypt_compact:
xorl 8(%r15),%ecx
xorl 12(%r15),%edx
.byte 0xf3,0xc3
.cfi_endproc
.size _x86_64_AES_decrypt_compact,.-_x86_64_AES_decrypt_compact
.globl AES_decrypt
.type AES_decrypt,@function
Expand Down Expand Up @@ -920,6 +924,7 @@ AES_set_encrypt_key:
.type _x86_64_AES_set_encrypt_key,@function
.align 16
_x86_64_AES_set_encrypt_key:
.cfi_startproc
movl %esi,%ecx
movq %rdi,%rsi
movq %rdx,%rdi
Expand Down Expand Up @@ -1155,6 +1160,7 @@ _x86_64_AES_set_encrypt_key:
movq $-1,%rax
.Lexit:
.byte 0xf3,0xc3
.cfi_endproc
.size _x86_64_AES_set_encrypt_key,.-_x86_64_AES_set_encrypt_key
.globl AES_set_decrypt_key
.type AES_set_decrypt_key,@function
Expand Down Expand Up @@ -1377,8 +1383,9 @@ AES_cbc_encrypt:
cmpq $0,%rdx
je .Lcbc_epilogue
pushfq


.cfi_adjust_cfa_offset 8
.cfi_offset 49,-16
pushq %rbx
.cfi_adjust_cfa_offset 8
.cfi_offset %rbx,-24
Expand Down Expand Up @@ -1407,6 +1414,7 @@ AES_cbc_encrypt:
cmpq $0,%r9
cmoveq %r10,%r14

.cfi_remember_state
movl OPENSSL_ia32cap_P(%rip),%r10d
cmpq $512,%rdx
jb .Lcbc_slow_prologue
Expand Down Expand Up @@ -1642,6 +1650,7 @@ AES_cbc_encrypt:

.align 16
.Lcbc_slow_prologue:
.cfi_restore_state

leaq -88(%rsp),%rbp
andq $-64,%rbp
Expand All @@ -1653,8 +1662,10 @@ AES_cbc_encrypt:
subq %r10,%rbp

xchgq %rsp,%rbp
.cfi_def_cfa_register %rbp

movq %rbp,16(%rsp)
.cfi_escape 0x0f,0x05,0x77,0x10,0x06,0x23,0x40
.Lcbc_slow_body:


Expand Down Expand Up @@ -1843,8 +1854,9 @@ AES_cbc_encrypt:
.cfi_def_cfa %rsp,16
.Lcbc_popfq:
popfq


.cfi_adjust_cfa_offset -8
.cfi_restore 49
.Lcbc_epilogue:
.byte 0xf3,0xc3
.cfi_endproc
Expand Down
Loading