Skip to content

Commit 230a773

Browse files
sam-githubtargos
sam-github
authored and
targos
committed
deps: update archs files for OpenSSL-1.1.1b
Ran: $ cd deps/openssl/config; make to update deps/openssl/config/archs/ with current configuration. PR-URL: #27376 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Richard Lau <[email protected]>
1 parent b68132e commit 230a773

File tree

248 files changed

+1224
-1625
lines changed

Some content is hidden

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

248 files changed

+1224
-1625
lines changed

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ 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_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_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-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 => "enable-ssl-trace 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-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",
64-
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "BSD-x86_64" ],
64+
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "BSD-x86_64" ],
6565
perlenv => {
6666
"AR" => undef,
6767
"ARFLAGS" => undef,
@@ -332,7 +332,6 @@ our %disabled = (
332332
"rc5" => "default",
333333
"sctp" => "default",
334334
"shared" => "option",
335-
"ssl-trace" => "default",
336335
"ssl3" => "default",
337336
"ssl3-method" => "default",
338337
"ubsan" => "default",
@@ -15960,9 +15959,6 @@ my %disabled_info = (
1596015959
'sctp' => {
1596115960
macro => 'OPENSSL_NO_SCTP',
1596215961
},
15963-
'ssl-trace' => {
15964-
macro => 'OPENSSL_NO_SSL_TRACE',
15965-
},
1596615962
'ssl3' => {
1596715963
macro => 'OPENSSL_NO_SSL3',
1596815964
},

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +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
158+
.cfi_startproc
159159
leaq 128(%r14),%r8
160160
movl 0-128(%r8),%edi
161161
movl 32-128(%r8),%ebp
@@ -325,7 +325,7 @@ _x86_64_AES_encrypt_compact:
325325
xorl 8(%r15),%ecx
326326
xorl 12(%r15),%edx
327327
.byte 0xf3,0xc3
328-
.cfi_endproc
328+
.cfi_endproc
329329
.size _x86_64_AES_encrypt_compact,.-_x86_64_AES_encrypt_compact
330330
.globl AES_encrypt
331331
.type AES_encrypt,@function
@@ -570,7 +570,7 @@ _x86_64_AES_decrypt:
570570
.type _x86_64_AES_decrypt_compact,@function
571571
.align 16
572572
_x86_64_AES_decrypt_compact:
573-
.cfi_startproc
573+
.cfi_startproc
574574
leaq 128(%r14),%r8
575575
movl 0-128(%r8),%edi
576576
movl 32-128(%r8),%ebp
@@ -792,7 +792,7 @@ _x86_64_AES_decrypt_compact:
792792
xorl 8(%r15),%ecx
793793
xorl 12(%r15),%edx
794794
.byte 0xf3,0xc3
795-
.cfi_endproc
795+
.cfi_endproc
796796
.size _x86_64_AES_decrypt_compact,.-_x86_64_AES_decrypt_compact
797797
.globl AES_decrypt
798798
.type AES_decrypt,@function
@@ -924,7 +924,7 @@ AES_set_encrypt_key:
924924
.type _x86_64_AES_set_encrypt_key,@function
925925
.align 16
926926
_x86_64_AES_set_encrypt_key:
927-
.cfi_startproc
927+
.cfi_startproc
928928
movl %esi,%ecx
929929
movq %rdi,%rsi
930930
movq %rdx,%rdi
@@ -1160,7 +1160,7 @@ _x86_64_AES_set_encrypt_key:
11601160
movq $-1,%rax
11611161
.Lexit:
11621162
.byte 0xf3,0xc3
1163-
.cfi_endproc
1163+
.cfi_endproc
11641164
.size _x86_64_AES_set_encrypt_key,.-_x86_64_AES_set_encrypt_key
11651165
.globl AES_set_decrypt_key
11661166
.type AES_set_decrypt_key,@function
@@ -1414,7 +1414,7 @@ AES_cbc_encrypt:
14141414
cmpq $0,%r9
14151415
cmoveq %r10,%r14
14161416

1417-
.cfi_remember_state
1417+
.cfi_remember_state
14181418
movl OPENSSL_ia32cap_P(%rip),%r10d
14191419
cmpq $512,%rdx
14201420
jb .Lcbc_slow_prologue
@@ -1650,7 +1650,7 @@ AES_cbc_encrypt:
16501650

16511651
.align 16
16521652
.Lcbc_slow_prologue:
1653-
.cfi_restore_state
1653+
.cfi_restore_state
16541654

16551655
leaq -88(%rsp),%rbp
16561656
andq $-64,%rbp

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

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
.type aesni_encrypt,@function
55
.align 16
66
aesni_encrypt:
7-
.cfi_startproc
7+
.cfi_startproc
88
movups (%rdi),%xmm2
99
movl 240(%rdx),%eax
1010
movups (%rdx),%xmm0
@@ -23,14 +23,14 @@ aesni_encrypt:
2323
movups %xmm2,(%rsi)
2424
pxor %xmm2,%xmm2
2525
.byte 0xf3,0xc3
26-
.cfi_endproc
26+
.cfi_endproc
2727
.size aesni_encrypt,.-aesni_encrypt
2828

2929
.globl aesni_decrypt
3030
.type aesni_decrypt,@function
3131
.align 16
3232
aesni_decrypt:
33-
.cfi_startproc
33+
.cfi_startproc
3434
movups (%rdi),%xmm2
3535
movl 240(%rdx),%eax
3636
movups (%rdx),%xmm0
@@ -49,12 +49,12 @@ aesni_decrypt:
4949
movups %xmm2,(%rsi)
5050
pxor %xmm2,%xmm2
5151
.byte 0xf3,0xc3
52-
.cfi_endproc
52+
.cfi_endproc
5353
.size aesni_decrypt, .-aesni_decrypt
5454
.type _aesni_encrypt2,@function
5555
.align 16
5656
_aesni_encrypt2:
57-
.cfi_startproc
57+
.cfi_startproc
5858
movups (%rcx),%xmm0
5959
shll $4,%eax
6060
movups 16(%rcx),%xmm1
@@ -80,12 +80,12 @@ _aesni_encrypt2:
8080
.byte 102,15,56,221,208
8181
.byte 102,15,56,221,216
8282
.byte 0xf3,0xc3
83-
.cfi_endproc
83+
.cfi_endproc
8484
.size _aesni_encrypt2,.-_aesni_encrypt2
8585
.type _aesni_decrypt2,@function
8686
.align 16
8787
_aesni_decrypt2:
88-
.cfi_startproc
88+
.cfi_startproc
8989
movups (%rcx),%xmm0
9090
shll $4,%eax
9191
movups 16(%rcx),%xmm1
@@ -111,12 +111,12 @@ _aesni_decrypt2:
111111
.byte 102,15,56,223,208
112112
.byte 102,15,56,223,216
113113
.byte 0xf3,0xc3
114-
.cfi_endproc
114+
.cfi_endproc
115115
.size _aesni_decrypt2,.-_aesni_decrypt2
116116
.type _aesni_encrypt3,@function
117117
.align 16
118118
_aesni_encrypt3:
119-
.cfi_startproc
119+
.cfi_startproc
120120
movups (%rcx),%xmm0
121121
shll $4,%eax
122122
movups 16(%rcx),%xmm1
@@ -147,12 +147,12 @@ _aesni_encrypt3:
147147
.byte 102,15,56,221,216
148148
.byte 102,15,56,221,224
149149
.byte 0xf3,0xc3
150-
.cfi_endproc
150+
.cfi_endproc
151151
.size _aesni_encrypt3,.-_aesni_encrypt3
152152
.type _aesni_decrypt3,@function
153153
.align 16
154154
_aesni_decrypt3:
155-
.cfi_startproc
155+
.cfi_startproc
156156
movups (%rcx),%xmm0
157157
shll $4,%eax
158158
movups 16(%rcx),%xmm1
@@ -183,12 +183,12 @@ _aesni_decrypt3:
183183
.byte 102,15,56,223,216
184184
.byte 102,15,56,223,224
185185
.byte 0xf3,0xc3
186-
.cfi_endproc
186+
.cfi_endproc
187187
.size _aesni_decrypt3,.-_aesni_decrypt3
188188
.type _aesni_encrypt4,@function
189189
.align 16
190190
_aesni_encrypt4:
191-
.cfi_startproc
191+
.cfi_startproc
192192
movups (%rcx),%xmm0
193193
shll $4,%eax
194194
movups 16(%rcx),%xmm1
@@ -225,12 +225,12 @@ _aesni_encrypt4:
225225
.byte 102,15,56,221,224
226226
.byte 102,15,56,221,232
227227
.byte 0xf3,0xc3
228-
.cfi_endproc
228+
.cfi_endproc
229229
.size _aesni_encrypt4,.-_aesni_encrypt4
230230
.type _aesni_decrypt4,@function
231231
.align 16
232232
_aesni_decrypt4:
233-
.cfi_startproc
233+
.cfi_startproc
234234
movups (%rcx),%xmm0
235235
shll $4,%eax
236236
movups 16(%rcx),%xmm1
@@ -267,12 +267,12 @@ _aesni_decrypt4:
267267
.byte 102,15,56,223,224
268268
.byte 102,15,56,223,232
269269
.byte 0xf3,0xc3
270-
.cfi_endproc
270+
.cfi_endproc
271271
.size _aesni_decrypt4,.-_aesni_decrypt4
272272
.type _aesni_encrypt6,@function
273273
.align 16
274274
_aesni_encrypt6:
275-
.cfi_startproc
275+
.cfi_startproc
276276
movups (%rcx),%xmm0
277277
shll $4,%eax
278278
movups 16(%rcx),%xmm1
@@ -323,12 +323,12 @@ _aesni_encrypt6:
323323
.byte 102,15,56,221,240
324324
.byte 102,15,56,221,248
325325
.byte 0xf3,0xc3
326-
.cfi_endproc
326+
.cfi_endproc
327327
.size _aesni_encrypt6,.-_aesni_encrypt6
328328
.type _aesni_decrypt6,@function
329329
.align 16
330330
_aesni_decrypt6:
331-
.cfi_startproc
331+
.cfi_startproc
332332
movups (%rcx),%xmm0
333333
shll $4,%eax
334334
movups 16(%rcx),%xmm1
@@ -379,12 +379,12 @@ _aesni_decrypt6:
379379
.byte 102,15,56,223,240
380380
.byte 102,15,56,223,248
381381
.byte 0xf3,0xc3
382-
.cfi_endproc
382+
.cfi_endproc
383383
.size _aesni_decrypt6,.-_aesni_decrypt6
384384
.type _aesni_encrypt8,@function
385385
.align 16
386386
_aesni_encrypt8:
387-
.cfi_startproc
387+
.cfi_startproc
388388
movups (%rcx),%xmm0
389389
shll $4,%eax
390390
movups 16(%rcx),%xmm1
@@ -445,12 +445,12 @@ _aesni_encrypt8:
445445
.byte 102,68,15,56,221,192
446446
.byte 102,68,15,56,221,200
447447
.byte 0xf3,0xc3
448-
.cfi_endproc
448+
.cfi_endproc
449449
.size _aesni_encrypt8,.-_aesni_encrypt8
450450
.type _aesni_decrypt8,@function
451451
.align 16
452452
_aesni_decrypt8:
453-
.cfi_startproc
453+
.cfi_startproc
454454
movups (%rcx),%xmm0
455455
shll $4,%eax
456456
movups 16(%rcx),%xmm1
@@ -511,13 +511,13 @@ _aesni_decrypt8:
511511
.byte 102,68,15,56,223,192
512512
.byte 102,68,15,56,223,200
513513
.byte 0xf3,0xc3
514-
.cfi_endproc
514+
.cfi_endproc
515515
.size _aesni_decrypt8,.-_aesni_decrypt8
516516
.globl aesni_ecb_encrypt
517517
.type aesni_ecb_encrypt,@function
518518
.align 16
519519
aesni_ecb_encrypt:
520-
.cfi_startproc
520+
.cfi_startproc
521521
andq $-16,%rdx
522522
jz .Lecb_ret
523523

@@ -855,7 +855,7 @@ aesni_ecb_encrypt:
855855
xorps %xmm0,%xmm0
856856
pxor %xmm1,%xmm1
857857
.byte 0xf3,0xc3
858-
.cfi_endproc
858+
.cfi_endproc
859859
.size aesni_ecb_encrypt,.-aesni_ecb_encrypt
860860
.globl aesni_ccm64_encrypt_blocks
861861
.type aesni_ccm64_encrypt_blocks,@function

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
.type _bsaes_encrypt8,@function
77
.align 64
88
_bsaes_encrypt8:
9-
.cfi_startproc
9+
.cfi_startproc
1010
leaq .LBS0(%rip),%r11
1111

1212
movdqa (%rax),%xmm8
@@ -474,13 +474,13 @@ _bsaes_encrypt8_bitslice:
474474
pxor %xmm7,%xmm15
475475
pxor %xmm7,%xmm0
476476
.byte 0xf3,0xc3
477-
.cfi_endproc
477+
.cfi_endproc
478478
.size _bsaes_encrypt8,.-_bsaes_encrypt8
479479

480480
.type _bsaes_decrypt8,@function
481481
.align 64
482482
_bsaes_decrypt8:
483-
.cfi_startproc
483+
.cfi_startproc
484484
leaq .LBS0(%rip),%r11
485485

486486
movdqa (%rax),%xmm8
@@ -982,12 +982,12 @@ _bsaes_decrypt8:
982982
pxor %xmm7,%xmm15
983983
pxor %xmm7,%xmm0
984984
.byte 0xf3,0xc3
985-
.cfi_endproc
985+
.cfi_endproc
986986
.size _bsaes_decrypt8,.-_bsaes_decrypt8
987987
.type _bsaes_key_convert,@function
988988
.align 16
989989
_bsaes_key_convert:
990-
.cfi_startproc
990+
.cfi_startproc
991991
leaq .Lmasks(%rip),%r11
992992
movdqu (%rcx),%xmm7
993993
leaq 16(%rcx),%rcx
@@ -1066,7 +1066,7 @@ _bsaes_key_convert:
10661066
movdqa 80(%r11),%xmm7
10671067

10681068
.byte 0xf3,0xc3
1069-
.cfi_endproc
1069+
.cfi_endproc
10701070
.size _bsaes_key_convert,.-_bsaes_key_convert
10711071

10721072
.globl bsaes_cbc_encrypt

0 commit comments

Comments
 (0)