Skip to content

Commit be219bd

Browse files
sam-githubMylesBorins
sam-github
authored and
MylesBorins
committed
deps: update archs files for OpenSSL-1.1.1b
`cd deps/openssl/config; make` updates all archs dependant files. Backport-PR-URL: #27419 PR-URL: #26327 Reviewed-By: Gireesh Punathil <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]>
1 parent 6a6aa6f commit be219bd

File tree

581 files changed

+26703
-4177
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

581 files changed

+26703
-4177
lines changed

‎deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm‎

Lines changed: 56 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ our %config = (
5353
minor => "1.1",
5454
openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
5555
openssl_api_defines => [ ],
56-
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" ],
56+
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" ],
5757
openssl_sys_defines => [ ],
5858
openssl_thread_defines => [ "OPENSSL_THREADS" ],
5959
openssldir => "",
60-
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",
60+
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",
6161
perl_archname => "x86_64-linux-gnu-thread-multi",
6262
perl_cmd => "/usr/bin/perl",
6363
perl_version => "5.26.2",
@@ -109,8 +109,8 @@ our %config = (
109109
sourcedir => ".",
110110
target => "BSD-x86_64",
111111
tdirs => [ "ossl_shim" ],
112-
version => "1.1.1a",
113-
version_num => "0x1010101fL",
112+
version => "1.1.1b",
113+
version_num => "0x1010102fL",
114114
);
115115

116116
our %target = (
@@ -259,6 +259,7 @@ our @disablables = (
259259
"msan",
260260
"multiblock",
261261
"nextprotoneg",
262+
"pinshared",
262263
"ocb",
263264
"ocsp",
264265
"pic",
@@ -319,7 +320,6 @@ our %disabled = (
319320
"comp" => "option",
320321
"crypto-mdebug" => "default",
321322
"crypto-mdebug-backtrace" => "default",
322-
"devcryptoeng" => "default",
323323
"dynamic-engine" => "forced",
324324
"ec_nistp_64_gcc_128" => "default",
325325
"egd" => "default",
@@ -783,6 +783,11 @@ our %unified_info = (
783783
"libcrypto",
784784
"test/libtestutil.a",
785785
],
786+
"test/bio_memleak_test" =>
787+
[
788+
"libcrypto",
789+
"test/libtestutil.a",
790+
],
786791
"test/bioprinttest" =>
787792
[
788793
"libcrypto",
@@ -1266,6 +1271,11 @@ our %unified_info = (
12661271
"libssl",
12671272
"test/libtestutil.a",
12681273
],
1274+
"test/ec_internal_test" =>
1275+
[
1276+
"libcrypto.a",
1277+
"test/libtestutil.a",
1278+
],
12691279
"test/ecdsatest" =>
12701280
[
12711281
"libcrypto",
@@ -2303,6 +2313,7 @@ our %unified_info = (
23032313
"crypto/engine/eng_all.o",
23042314
"crypto/engine/eng_cnf.o",
23052315
"crypto/engine/eng_ctrl.o",
2316+
"crypto/engine/eng_devcrypto.o",
23062317
"crypto/engine/eng_dyn.o",
23072318
"crypto/engine/eng_err.o",
23082319
"crypto/engine/eng_fat.o",
@@ -6815,6 +6826,12 @@ our %unified_info = (
68156826
"crypto/include",
68166827
"include",
68176828
],
6829+
"crypto/engine/eng_devcrypto.o" =>
6830+
[
6831+
".",
6832+
"crypto/include",
6833+
"include",
6834+
],
68186835
"crypto/engine/eng_dyn.o" =>
68196836
[
68206837
".",
@@ -9407,6 +9424,10 @@ our %unified_info = (
94079424
[
94089425
"include",
94099426
],
9427+
"test/bio_memleak_test.o" =>
9428+
[
9429+
"include",
9430+
],
94109431
"test/bioprinttest.o" =>
94119432
[
94129433
"include",
@@ -9803,6 +9824,12 @@ our %unified_info = (
98039824
[
98049825
"include",
98059826
],
9827+
"test/ec_internal_test.o" =>
9828+
[
9829+
"include",
9830+
"crypto/ec",
9831+
"crypto/include",
9832+
],
98069833
"test/ecdsatest.o" =>
98079834
[
98089835
"include",
@@ -10210,6 +10237,7 @@ our %unified_info = (
1021010237
"test/bftest",
1021110238
"test/bio_callback_test",
1021210239
"test/bio_enc_test",
10240+
"test/bio_memleak_test",
1021310241
"test/bioprinttest",
1021410242
"test/bntest",
1021510243
"test/buildtest_aes",
@@ -10305,6 +10333,7 @@ our %unified_info = (
1030510333
"test/dtls_mtu_test",
1030610334
"test/dtlstest",
1030710335
"test/dtlsv1listentest",
10336+
"test/ec_internal_test",
1030810337
"test/ecdsatest",
1030910338
"test/ecstresstest",
1031010339
"test/ectest",
@@ -11914,6 +11943,10 @@ our %unified_info = (
1191411943
[
1191511944
"crypto/engine/eng_ctrl.c",
1191611945
],
11946+
"crypto/engine/eng_devcrypto.o" =>
11947+
[
11948+
"crypto/engine/eng_devcrypto.c",
11949+
],
1191711950
"crypto/engine/eng_dyn.o" =>
1191811951
[
1191911952
"crypto/engine/eng_dyn.c",
@@ -13746,6 +13779,7 @@ our %unified_info = (
1374613779
"crypto/engine/eng_all.o",
1374713780
"crypto/engine/eng_cnf.o",
1374813781
"crypto/engine/eng_ctrl.o",
13782+
"crypto/engine/eng_devcrypto.o",
1374913783
"crypto/engine/eng_dyn.o",
1375013784
"crypto/engine/eng_err.o",
1375113785
"crypto/engine/eng_fat.o",
@@ -14431,6 +14465,14 @@ our %unified_info = (
1443114465
[
1443214466
"test/bio_enc_test.c",
1443314467
],
14468+
"test/bio_memleak_test" =>
14469+
[
14470+
"test/bio_memleak_test.o",
14471+
],
14472+
"test/bio_memleak_test.o" =>
14473+
[
14474+
"test/bio_memleak_test.c",
14475+
],
1443414476
"test/bioprinttest" =>
1443514477
[
1443614478
"test/bioprinttest.o",
@@ -15198,6 +15240,14 @@ our %unified_info = (
1519815240
[
1519915241
"test/dtlsv1listentest.c",
1520015242
],
15243+
"test/ec_internal_test" =>
15244+
[
15245+
"test/ec_internal_test.o",
15246+
],
15247+
"test/ec_internal_test.o" =>
15248+
[
15249+
"test/ec_internal_test.c",
15250+
],
1520115251
"test/ecdsatest" =>
1520215252
[
1520315253
"test/ecdsatest.o",
@@ -15878,9 +15928,6 @@ my %disabled_info = (
1587815928
'crypto-mdebug-backtrace' => {
1587915929
macro => 'OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE',
1588015930
},
15881-
'devcryptoeng' => {
15882-
macro => 'OPENSSL_NO_DEVCRYPTOENG',
15883-
},
1588415931
'ec_nistp_64_gcc_128' => {
1588515932
macro => 'OPENSSL_NO_EC_NISTP_64_GCC_128',
1588615933
},
@@ -16188,3 +16235,4 @@ Verbose output.
1618816235
=back
1618916236
1619016237
=cut
16238+

‎deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aes-x86_64.s‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ _x86_64_AES_encrypt:
155155
.type _x86_64_AES_encrypt_compact,@function
156156
.align 16
157157
_x86_64_AES_encrypt_compact:
158+
.cfi_startproc
158159
leaq 128(%r14),%r8
159160
movl 0-128(%r8),%edi
160161
movl 32-128(%r8),%ebp
@@ -324,6 +325,7 @@ _x86_64_AES_encrypt_compact:
324325
xorl 8(%r15),%ecx
325326
xorl 12(%r15),%edx
326327
.byte 0xf3,0xc3
328+
.cfi_endproc
327329
.size _x86_64_AES_encrypt_compact,.-_x86_64_AES_encrypt_compact
328330
.globl AES_encrypt
329331
.type AES_encrypt,@function
@@ -332,7 +334,7 @@ _x86_64_AES_encrypt_compact:
332334
.hidden asm_AES_encrypt
333335
asm_AES_encrypt:
334336
AES_encrypt:
335-
.cfi_startproc
337+
.cfi_startproc
336338
movq %rsp,%rax
337339
.cfi_def_cfa_register %rax
338340
pushq %rbx
@@ -408,7 +410,7 @@ AES_encrypt:
408410
.cfi_def_cfa_register %rsp
409411
.Lenc_epilogue:
410412
.byte 0xf3,0xc3
411-
.cfi_endproc
413+
.cfi_endproc
412414
.size AES_encrypt,.-AES_encrypt
413415
.type _x86_64_AES_decrypt,@function
414416
.align 16
@@ -568,6 +570,7 @@ _x86_64_AES_decrypt:
568570
.type _x86_64_AES_decrypt_compact,@function
569571
.align 16
570572
_x86_64_AES_decrypt_compact:
573+
.cfi_startproc
571574
leaq 128(%r14),%r8
572575
movl 0-128(%r8),%edi
573576
movl 32-128(%r8),%ebp
@@ -789,6 +792,7 @@ _x86_64_AES_decrypt_compact:
789792
xorl 8(%r15),%ecx
790793
xorl 12(%r15),%edx
791794
.byte 0xf3,0xc3
795+
.cfi_endproc
792796
.size _x86_64_AES_decrypt_compact,.-_x86_64_AES_decrypt_compact
793797
.globl AES_decrypt
794798
.type AES_decrypt,@function
@@ -797,7 +801,7 @@ _x86_64_AES_decrypt_compact:
797801
.hidden asm_AES_decrypt
798802
asm_AES_decrypt:
799803
AES_decrypt:
800-
.cfi_startproc
804+
.cfi_startproc
801805
movq %rsp,%rax
802806
.cfi_def_cfa_register %rax
803807
pushq %rbx
@@ -875,13 +879,13 @@ AES_decrypt:
875879
.cfi_def_cfa_register %rsp
876880
.Ldec_epilogue:
877881
.byte 0xf3,0xc3
878-
.cfi_endproc
882+
.cfi_endproc
879883
.size AES_decrypt,.-AES_decrypt
880884
.globl AES_set_encrypt_key
881885
.type AES_set_encrypt_key,@function
882886
.align 16
883887
AES_set_encrypt_key:
884-
.cfi_startproc
888+
.cfi_startproc
885889
pushq %rbx
886890
.cfi_adjust_cfa_offset 8
887891
.cfi_offset %rbx,-16
@@ -914,12 +918,13 @@ AES_set_encrypt_key:
914918
.cfi_adjust_cfa_offset -56
915919
.Lenc_key_epilogue:
916920
.byte 0xf3,0xc3
917-
.cfi_endproc
921+
.cfi_endproc
918922
.size AES_set_encrypt_key,.-AES_set_encrypt_key
919923

920924
.type _x86_64_AES_set_encrypt_key,@function
921925
.align 16
922926
_x86_64_AES_set_encrypt_key:
927+
.cfi_startproc
923928
movl %esi,%ecx
924929
movq %rdi,%rsi
925930
movq %rdx,%rdi
@@ -1155,12 +1160,13 @@ _x86_64_AES_set_encrypt_key:
11551160
movq $-1,%rax
11561161
.Lexit:
11571162
.byte 0xf3,0xc3
1163+
.cfi_endproc
11581164
.size _x86_64_AES_set_encrypt_key,.-_x86_64_AES_set_encrypt_key
11591165
.globl AES_set_decrypt_key
11601166
.type AES_set_decrypt_key,@function
11611167
.align 16
11621168
AES_set_decrypt_key:
1163-
.cfi_startproc
1169+
.cfi_startproc
11641170
pushq %rbx
11651171
.cfi_adjust_cfa_offset 8
11661172
.cfi_offset %rbx,-16
@@ -1363,7 +1369,7 @@ AES_set_decrypt_key:
13631369
.cfi_adjust_cfa_offset -56
13641370
.Ldec_key_epilogue:
13651371
.byte 0xf3,0xc3
1366-
.cfi_endproc
1372+
.cfi_endproc
13671373
.size AES_set_decrypt_key,.-AES_set_decrypt_key
13681374
.globl AES_cbc_encrypt
13691375
.type AES_cbc_encrypt,@function
@@ -1373,12 +1379,13 @@ AES_set_decrypt_key:
13731379
.hidden asm_AES_cbc_encrypt
13741380
asm_AES_cbc_encrypt:
13751381
AES_cbc_encrypt:
1376-
.cfi_startproc
1382+
.cfi_startproc
13771383
cmpq $0,%rdx
13781384
je .Lcbc_epilogue
13791385
pushfq
1386+
1387+
13801388
.cfi_adjust_cfa_offset 8
1381-
.cfi_offset 49,-16
13821389
pushq %rbx
13831390
.cfi_adjust_cfa_offset 8
13841391
.cfi_offset %rbx,-24
@@ -1407,6 +1414,7 @@ AES_cbc_encrypt:
14071414
cmpq $0,%r9
14081415
cmoveq %r10,%r14
14091416

1417+
.cfi_remember_state
14101418
movl OPENSSL_ia32cap_P(%rip),%r10d
14111419
cmpq $512,%rdx
14121420
jb .Lcbc_slow_prologue
@@ -1642,6 +1650,7 @@ AES_cbc_encrypt:
16421650

16431651
.align 16
16441652
.Lcbc_slow_prologue:
1653+
.cfi_restore_state
16451654

16461655
leaq -88(%rsp),%rbp
16471656
andq $-64,%rbp
@@ -1653,8 +1662,10 @@ AES_cbc_encrypt:
16531662
subq %r10,%rbp
16541663

16551664
xchgq %rsp,%rbp
1665+
.cfi_def_cfa_register %rbp
16561666

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

16601671

@@ -1843,11 +1854,12 @@ AES_cbc_encrypt:
18431854
.cfi_def_cfa %rsp,16
18441855
.Lcbc_popfq:
18451856
popfq
1857+
1858+
18461859
.cfi_adjust_cfa_offset -8
1847-
.cfi_restore 49
18481860
.Lcbc_epilogue:
18491861
.byte 0xf3,0xc3
1850-
.cfi_endproc
1862+
.cfi_endproc
18511863
.size AES_cbc_encrypt,.-AES_cbc_encrypt
18521864
.align 64
18531865
.LAES_Te:

0 commit comments

Comments
 (0)