Skip to content

Commit 91fe38e

Browse files
RafaelGSSRafaelGSS
committed
deps: update archs files for quictls/openssl-3.0.5+quic
After an OpenSSL source update, all the config files need to be regenerated and committed by: $ find archs \( -name \*.s \) -exec rm "{}" \; Edit deps/openssl/openssl/crypto/perlasm/x86asm.pl changing #ifdef to %ifdef to make it compatible to nasm on windows 32. $ make -C deps/openssl/config $ git add deps/openssl/config/archs $ git add deps/openssl/openssl $ git commit Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Richard Lau <[email protected]> PR-URL: #43693
1 parent 05d8a5f commit 91fe38e

636 files changed

Lines changed: 15410 additions & 197562 deletions

File tree

Some content is hidden

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

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

Lines changed: 169 additions & 110 deletions
Large diffs are not rendered by default.

deps/openssl/config/archs/BSD-x86/asm/crypto/aes/aes-586.s renamed to deps/openssl/config/archs/BSD-x86/asm/crypto/aes/aes-586.S

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
.type __x86_AES_encrypt_compact,@function
33
.align 4
44
__x86_AES_encrypt_compact:
5+
%ifdef __CET__
6+
57
.byte 243,15,30,251
8+
%endif
9+
610
movl %edi,20(%esp)
711
xorl (%edi),%eax
812
xorl 4(%edi),%ebx
@@ -261,7 +265,11 @@ L000loop:
261265
.type __sse_AES_encrypt_compact,@function
262266
.align 4
263267
__sse_AES_encrypt_compact:
268+
%ifdef __CET__
269+
264270
.byte 243,15,30,251
271+
%endif
272+
265273
pxor (%edi),%mm0
266274
pxor 8(%edi),%mm4
267275
movl 240(%edi),%esi
@@ -418,7 +426,11 @@ L002out:
418426
.type __x86_AES_encrypt,@function
419427
.align 4
420428
__x86_AES_encrypt:
429+
%ifdef __CET__
430+
421431
.byte 243,15,30,251
432+
%endif
433+
422434
movl %edi,20(%esp)
423435
xorl (%edi),%eax
424436
xorl 4(%edi),%ebx
@@ -968,7 +980,11 @@ LAES_Te:
968980
.align 4
969981
_AES_encrypt:
970982
L_AES_encrypt_begin:
983+
%ifdef __CET__
984+
971985
.byte 243,15,30,251
986+
%endif
987+
972988
pushl %ebp
973989
pushl %ebx
974990
pushl %esi
@@ -1032,7 +1048,11 @@ L005x86:
10321048
.type __x86_AES_decrypt_compact,@function
10331049
.align 4
10341050
__x86_AES_decrypt_compact:
1051+
%ifdef __CET__
1052+
10351053
.byte 243,15,30,251
1054+
%endif
1055+
10361056
movl %edi,20(%esp)
10371057
xorl (%edi),%eax
10381058
xorl 4(%edi),%ebx
@@ -1387,7 +1407,11 @@ L006loop:
13871407
.type __sse_AES_decrypt_compact,@function
13881408
.align 4
13891409
__sse_AES_decrypt_compact:
1410+
%ifdef __CET__
1411+
13901412
.byte 243,15,30,251
1413+
%endif
1414+
13911415
pxor (%edi),%mm0
13921416
pxor 8(%edi),%mm4
13931417
movl 240(%edi),%esi
@@ -1603,7 +1627,11 @@ L008out:
16031627
.type __x86_AES_decrypt,@function
16041628
.align 4
16051629
__x86_AES_decrypt:
1630+
%ifdef __CET__
1631+
16061632
.byte 243,15,30,251
1633+
%endif
1634+
16071635
movl %edi,20(%esp)
16081636
xorl (%edi),%eax
16091637
xorl 4(%edi),%ebx
@@ -2157,7 +2185,11 @@ LAES_Td:
21572185
.align 4
21582186
_AES_decrypt:
21592187
L_AES_decrypt_begin:
2188+
%ifdef __CET__
2189+
21602190
.byte 243,15,30,251
2191+
%endif
2192+
21612193
pushl %ebp
21622194
pushl %ebx
21632195
pushl %esi
@@ -2223,7 +2255,11 @@ L011x86:
22232255
.align 4
22242256
_AES_cbc_encrypt:
22252257
L_AES_cbc_encrypt_begin:
2258+
%ifdef __CET__
2259+
22262260
.byte 243,15,30,251
2261+
%endif
2262+
22272263
pushl %ebp
22282264
pushl %ebx
22292265
pushl %esi
@@ -2755,7 +2791,11 @@ L039slow_dec_partial_x86:
27552791
.type __x86_AES_set_encrypt_key,@function
27562792
.align 4
27572793
__x86_AES_set_encrypt_key:
2794+
%ifdef __CET__
2795+
27582796
.byte 243,15,30,251
2797+
%endif
2798+
27592799
pushl %ebp
27602800
pushl %ebx
27612801
pushl %esi
@@ -2987,15 +3027,23 @@ L045exit:
29873027
.align 4
29883028
_AES_set_encrypt_key:
29893029
L_AES_set_encrypt_key_begin:
3030+
%ifdef __CET__
3031+
29903032
.byte 243,15,30,251
3033+
%endif
3034+
29913035
call __x86_AES_set_encrypt_key
29923036
ret
29933037
.globl _AES_set_decrypt_key
29943038
.type _AES_set_decrypt_key,@function
29953039
.align 4
29963040
_AES_set_decrypt_key:
29973041
L_AES_set_decrypt_key_begin:
3042+
%ifdef __CET__
3043+
29983044
.byte 243,15,30,251
3045+
%endif
3046+
29993047
call __x86_AES_set_encrypt_key
30003048
cmpl $0,%eax
30013049
je L054proceed

0 commit comments

Comments
 (0)