Skip to content

Commit

Permalink
deps: update archs files for OpenSSL-1.1.1b
Browse files Browse the repository at this point in the history 
`cd deps/openssl/config; make` updates all archs dependant files.

Backport-PR-URL: #27419
PR-URL: #26327
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
  • Loading branch information
@sam-github @MylesBorins
sam-github authored and MylesBorins committed May 16, 2019
1 parent 6a6aa6f commit be219bd
Show file tree
Hide file tree
Showing 581 changed files with 26,703 additions and 4,177 deletions.
64 changes: 56 additions & 8 deletions deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm
View file
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 Expand Up @@ -16188,3 +16235,4 @@ Verbose output.
=back
=cut
36 changes: 24 additions & 12 deletions deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aes-x86_64.s
View file
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 All @@ -332,7 +334,7 @@ _x86_64_AES_encrypt_compact:
.hidden asm_AES_encrypt
asm_AES_encrypt:
AES_encrypt:
.cfi_startproc
.cfi_startproc
movq %rsp,%rax
.cfi_def_cfa_register %rax
pushq %rbx
Expand Down Expand Up @@ -408,7 +410,7 @@ AES_encrypt:
.cfi_def_cfa_register %rsp
.Lenc_epilogue:
.byte 0xf3,0xc3
.cfi_endproc
.cfi_endproc
.size AES_encrypt,.-AES_encrypt
.type _x86_64_AES_decrypt,@function
.align 16
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 All @@ -797,7 +801,7 @@ _x86_64_AES_decrypt_compact:
.hidden asm_AES_decrypt
asm_AES_decrypt:
AES_decrypt:
.cfi_startproc
.cfi_startproc
movq %rsp,%rax
.cfi_def_cfa_register %rax
pushq %rbx
Expand Down Expand Up @@ -875,13 +879,13 @@ AES_decrypt:
.cfi_def_cfa_register %rsp
.Ldec_epilogue:
.byte 0xf3,0xc3
.cfi_endproc
.cfi_endproc
.size AES_decrypt,.-AES_decrypt
.globl AES_set_encrypt_key
.type AES_set_encrypt_key,@function
.align 16
AES_set_encrypt_key:
.cfi_startproc
.cfi_startproc
pushq %rbx
.cfi_adjust_cfa_offset 8
.cfi_offset %rbx,-16
Expand Down Expand Up @@ -914,12 +918,13 @@ AES_set_encrypt_key:
.cfi_adjust_cfa_offset -56
.Lenc_key_epilogue:
.byte 0xf3,0xc3
.cfi_endproc
.cfi_endproc
.size AES_set_encrypt_key,.-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,12 +1160,13 @@ _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
.align 16
AES_set_decrypt_key:
.cfi_startproc
.cfi_startproc
pushq %rbx
.cfi_adjust_cfa_offset 8
.cfi_offset %rbx,-16
Expand Down Expand Up @@ -1363,7 +1369,7 @@ AES_set_decrypt_key:
.cfi_adjust_cfa_offset -56
.Ldec_key_epilogue:
.byte 0xf3,0xc3
.cfi_endproc
.cfi_endproc
.size AES_set_decrypt_key,.-AES_set_decrypt_key
.globl AES_cbc_encrypt
.type AES_cbc_encrypt,@function
Expand All @@ -1373,12 +1379,13 @@ AES_set_decrypt_key:
.hidden asm_AES_cbc_encrypt
asm_AES_cbc_encrypt:
AES_cbc_encrypt:
.cfi_startproc
.cfi_startproc
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,11 +1854,12 @@ 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
.cfi_endproc
.size AES_cbc_encrypt,.-AES_cbc_encrypt
.align 64
.LAES_Te:
Expand Down
Loading

0 comments on commit be219bd

Please sign in to comment.