Skip to content

Commit b0b73fa

Browse files
sam-githubBethGriggs
sam-github
authored and
BethGriggs
committed
deps: update archs files for OpenSSL-1.1.1a
`cd deps/openssl/config; make` updates all archs dependant files. Backport-PR-URL: #26270 PR-URL: #25381 Reviewed-By: Daniel Bevenius <[email protected]> Reviewed-By: Shigeki Ohtsu <[email protected]>
1 parent fe8e07d commit b0b73fa

File tree

1,192 files changed

+1445003
-35478
lines changed

Some content is hidden

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

1,192 files changed

+1445003
-35478
lines changed

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

Lines changed: 3836 additions & 348 deletions
Large diffs are not rendered by default.

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

Lines changed: 124 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -332,15 +332,23 @@ _x86_64_AES_encrypt_compact:
332332
.hidden asm_AES_encrypt
333333
asm_AES_encrypt:
334334
AES_encrypt:
335+
.cfi_startproc
336+
movq %rsp,%rax
337+
.cfi_def_cfa_register %rax
335338
pushq %rbx
339+
.cfi_offset %rbx,-16
336340
pushq %rbp
341+
.cfi_offset %rbp,-24
337342
pushq %r12
343+
.cfi_offset %r12,-32
338344
pushq %r13
345+
.cfi_offset %r13,-40
339346
pushq %r14
347+
.cfi_offset %r14,-48
340348
pushq %r15
349+
.cfi_offset %r15,-56
341350

342351

343-
movq %rsp,%r10
344352
leaq -63(%rdx),%rcx
345353
andq $-64,%rsp
346354
subq %rsp,%rcx
@@ -350,7 +358,8 @@ AES_encrypt:
350358
subq $32,%rsp
351359

352360
movq %rsi,16(%rsp)
353-
movq %r10,24(%rsp)
361+
movq %rax,24(%rsp)
362+
.cfi_escape 0x0f,0x05,0x77,0x18,0x06,0x23,0x08
354363
.Lenc_prologue:
355364

356365
movq %rdx,%r15
@@ -377,20 +386,29 @@ AES_encrypt:
377386

378387
movq 16(%rsp),%r9
379388
movq 24(%rsp),%rsi
389+
.cfi_def_cfa %rsi,8
380390
movl %eax,0(%r9)
381391
movl %ebx,4(%r9)
382392
movl %ecx,8(%r9)
383393
movl %edx,12(%r9)
384394

385-
movq (%rsi),%r15
386-
movq 8(%rsi),%r14
387-
movq 16(%rsi),%r13
388-
movq 24(%rsi),%r12
389-
movq 32(%rsi),%rbp
390-
movq 40(%rsi),%rbx
391-
leaq 48(%rsi),%rsp
395+
movq -48(%rsi),%r15
396+
.cfi_restore %r15
397+
movq -40(%rsi),%r14
398+
.cfi_restore %r14
399+
movq -32(%rsi),%r13
400+
.cfi_restore %r13
401+
movq -24(%rsi),%r12
402+
.cfi_restore %r12
403+
movq -16(%rsi),%rbp
404+
.cfi_restore %rbp
405+
movq -8(%rsi),%rbx
406+
.cfi_restore %rbx
407+
leaq (%rsi),%rsp
408+
.cfi_def_cfa_register %rsp
392409
.Lenc_epilogue:
393410
.byte 0xf3,0xc3
411+
.cfi_endproc
394412
.size AES_encrypt,.-AES_encrypt
395413
.type _x86_64_AES_decrypt,@function
396414
.align 16
@@ -779,15 +797,23 @@ _x86_64_AES_decrypt_compact:
779797
.hidden asm_AES_decrypt
780798
asm_AES_decrypt:
781799
AES_decrypt:
800+
.cfi_startproc
801+
movq %rsp,%rax
802+
.cfi_def_cfa_register %rax
782803
pushq %rbx
804+
.cfi_offset %rbx,-16
783805
pushq %rbp
806+
.cfi_offset %rbp,-24
784807
pushq %r12
808+
.cfi_offset %r12,-32
785809
pushq %r13
810+
.cfi_offset %r13,-40
786811
pushq %r14
812+
.cfi_offset %r14,-48
787813
pushq %r15
814+
.cfi_offset %r15,-56
788815

789816

790-
movq %rsp,%r10
791817
leaq -63(%rdx),%rcx
792818
andq $-64,%rsp
793819
subq %rsp,%rcx
@@ -797,7 +823,8 @@ AES_decrypt:
797823
subq $32,%rsp
798824

799825
movq %rsi,16(%rsp)
800-
movq %r10,24(%rsp)
826+
movq %rax,24(%rsp)
827+
.cfi_escape 0x0f,0x05,0x77,0x18,0x06,0x23,0x08
801828
.Ldec_prologue:
802829

803830
movq %rdx,%r15
@@ -826,41 +853,68 @@ AES_decrypt:
826853

827854
movq 16(%rsp),%r9
828855
movq 24(%rsp),%rsi
856+
.cfi_def_cfa %rsi,8
829857
movl %eax,0(%r9)
830858
movl %ebx,4(%r9)
831859
movl %ecx,8(%r9)
832860
movl %edx,12(%r9)
833861

834-
movq (%rsi),%r15
835-
movq 8(%rsi),%r14
836-
movq 16(%rsi),%r13
837-
movq 24(%rsi),%r12
838-
movq 32(%rsi),%rbp
839-
movq 40(%rsi),%rbx
840-
leaq 48(%rsi),%rsp
862+
movq -48(%rsi),%r15
863+
.cfi_restore %r15
864+
movq -40(%rsi),%r14
865+
.cfi_restore %r14
866+
movq -32(%rsi),%r13
867+
.cfi_restore %r13
868+
movq -24(%rsi),%r12
869+
.cfi_restore %r12
870+
movq -16(%rsi),%rbp
871+
.cfi_restore %rbp
872+
movq -8(%rsi),%rbx
873+
.cfi_restore %rbx
874+
leaq (%rsi),%rsp
875+
.cfi_def_cfa_register %rsp
841876
.Ldec_epilogue:
842877
.byte 0xf3,0xc3
878+
.cfi_endproc
843879
.size AES_decrypt,.-AES_decrypt
844880
.globl AES_set_encrypt_key
845881
.type AES_set_encrypt_key,@function
846882
.align 16
847883
AES_set_encrypt_key:
884+
.cfi_startproc
848885
pushq %rbx
886+
.cfi_adjust_cfa_offset 8
887+
.cfi_offset %rbx,-16
849888
pushq %rbp
889+
.cfi_adjust_cfa_offset 8
890+
.cfi_offset %rbp,-24
850891
pushq %r12
892+
.cfi_adjust_cfa_offset 8
893+
.cfi_offset %r12,-32
851894
pushq %r13
895+
.cfi_adjust_cfa_offset 8
896+
.cfi_offset %r13,-40
852897
pushq %r14
898+
.cfi_adjust_cfa_offset 8
899+
.cfi_offset %r14,-48
853900
pushq %r15
901+
.cfi_adjust_cfa_offset 8
902+
.cfi_offset %r15,-56
854903
subq $8,%rsp
904+
.cfi_adjust_cfa_offset 8
855905
.Lenc_key_prologue:
856906

857907
call _x86_64_AES_set_encrypt_key
858908

859909
movq 40(%rsp),%rbp
910+
.cfi_restore %rbp
860911
movq 48(%rsp),%rbx
912+
.cfi_restore %rbx
861913
addq $56,%rsp
914+
.cfi_adjust_cfa_offset -56
862915
.Lenc_key_epilogue:
863916
.byte 0xf3,0xc3
917+
.cfi_endproc
864918
.size AES_set_encrypt_key,.-AES_set_encrypt_key
865919

866920
.type _x86_64_AES_set_encrypt_key,@function
@@ -1106,13 +1160,27 @@ _x86_64_AES_set_encrypt_key:
11061160
.type AES_set_decrypt_key,@function
11071161
.align 16
11081162
AES_set_decrypt_key:
1163+
.cfi_startproc
11091164
pushq %rbx
1165+
.cfi_adjust_cfa_offset 8
1166+
.cfi_offset %rbx,-16
11101167
pushq %rbp
1168+
.cfi_adjust_cfa_offset 8
1169+
.cfi_offset %rbp,-24
11111170
pushq %r12
1171+
.cfi_adjust_cfa_offset 8
1172+
.cfi_offset %r12,-32
11121173
pushq %r13
1174+
.cfi_adjust_cfa_offset 8
1175+
.cfi_offset %r13,-40
11131176
pushq %r14
1177+
.cfi_adjust_cfa_offset 8
1178+
.cfi_offset %r14,-48
11141179
pushq %r15
1180+
.cfi_adjust_cfa_offset 8
1181+
.cfi_offset %r15,-56
11151182
pushq %rdx
1183+
.cfi_adjust_cfa_offset 8
11161184
.Ldec_key_prologue:
11171185

11181186
call _x86_64_AES_set_encrypt_key
@@ -1280,14 +1348,22 @@ AES_set_decrypt_key:
12801348
xorq %rax,%rax
12811349
.Labort:
12821350
movq 8(%rsp),%r15
1351+
.cfi_restore %r15
12831352
movq 16(%rsp),%r14
1353+
.cfi_restore %r14
12841354
movq 24(%rsp),%r13
1355+
.cfi_restore %r13
12851356
movq 32(%rsp),%r12
1357+
.cfi_restore %r12
12861358
movq 40(%rsp),%rbp
1359+
.cfi_restore %rbp
12871360
movq 48(%rsp),%rbx
1361+
.cfi_restore %rbx
12881362
addq $56,%rsp
1363+
.cfi_adjust_cfa_offset -56
12891364
.Ldec_key_epilogue:
12901365
.byte 0xf3,0xc3
1366+
.cfi_endproc
12911367
.size AES_set_decrypt_key,.-AES_set_decrypt_key
12921368
.globl AES_cbc_encrypt
12931369
.type AES_cbc_encrypt,@function
@@ -1297,25 +1373,39 @@ AES_set_decrypt_key:
12971373
.hidden asm_AES_cbc_encrypt
12981374
asm_AES_cbc_encrypt:
12991375
AES_cbc_encrypt:
1376+
.cfi_startproc
13001377
cmpq $0,%rdx
13011378
je .Lcbc_epilogue
13021379
pushfq
1380+
.cfi_adjust_cfa_offset 8
1381+
.cfi_offset 49,-16
13031382
pushq %rbx
1383+
.cfi_adjust_cfa_offset 8
1384+
.cfi_offset %rbx,-24
13041385
pushq %rbp
1386+
.cfi_adjust_cfa_offset 8
1387+
.cfi_offset %rbp,-32
13051388
pushq %r12
1389+
.cfi_adjust_cfa_offset 8
1390+
.cfi_offset %r12,-40
13061391
pushq %r13
1392+
.cfi_adjust_cfa_offset 8
1393+
.cfi_offset %r13,-48
13071394
pushq %r14
1395+
.cfi_adjust_cfa_offset 8
1396+
.cfi_offset %r14,-56
13081397
pushq %r15
1398+
.cfi_adjust_cfa_offset 8
1399+
.cfi_offset %r15,-64
13091400
.Lcbc_prologue:
13101401

13111402
cld
13121403
movl %r9d,%r9d
13131404

13141405
leaq .LAES_Te(%rip),%r14
1406+
leaq .LAES_Td(%rip),%r10
13151407
cmpq $0,%r9
1316-
jne .Lcbc_picked_te
1317-
leaq .LAES_Td(%rip),%r14
1318-
.Lcbc_picked_te:
1408+
cmoveq %r10,%r14
13191409

13201410
movl OPENSSL_ia32cap_P(%rip),%r10d
13211411
cmpq $512,%rdx
@@ -1351,8 +1441,10 @@ AES_cbc_encrypt:
13511441
.Lcbc_te_ok:
13521442

13531443
xchgq %rsp,%r15
1444+
.cfi_def_cfa_register %r15
13541445

13551446
movq %r15,16(%rsp)
1447+
.cfi_escape 0x0f,0x05,0x77,0x10,0x06,0x23,0x40
13561448
.Lcbc_fast_body:
13571449
movq %rdi,24(%rsp)
13581450
movq %rsi,32(%rsp)
@@ -1734,17 +1826,28 @@ AES_cbc_encrypt:
17341826
.align 16
17351827
.Lcbc_exit:
17361828
movq 16(%rsp),%rsi
1829+
.cfi_def_cfa %rsi,64
17371830
movq (%rsi),%r15
1831+
.cfi_restore %r15
17381832
movq 8(%rsi),%r14
1833+
.cfi_restore %r14
17391834
movq 16(%rsi),%r13
1835+
.cfi_restore %r13
17401836
movq 24(%rsi),%r12
1837+
.cfi_restore %r12
17411838
movq 32(%rsi),%rbp
1839+
.cfi_restore %rbp
17421840
movq 40(%rsi),%rbx
1841+
.cfi_restore %rbx
17431842
leaq 48(%rsi),%rsp
1843+
.cfi_def_cfa %rsp,16
17441844
.Lcbc_popfq:
17451845
popfq
1846+
.cfi_adjust_cfa_offset -8
1847+
.cfi_restore 49
17461848
.Lcbc_epilogue:
17471849
.byte 0xf3,0xc3
1850+
.cfi_endproc
17481851
.size AES_cbc_encrypt,.-AES_cbc_encrypt
17491852
.align 64
17501853
.LAES_Te:

0 commit comments

Comments
 (0)