Skip to content

Commit

Permalink
deps: update archs files for OpenSSL-1.1.1i
Browse files Browse the repository at this point in the history 
After an OpenSSL source update, all the config files need to be
regenerated and comitted by:
    $ cd deps/openssl/config
    $ make
    $ git add deps/openssl/config/archs
    $ git add deps/openssl/openssl/include/crypto/bn_conf.h
    $ git add deps/openssl/openssl/include/crypto/dso_conf.h
    $ git add deps/openssl/openssl/include/openssl/opensslconf.h
    $ git commit

PR-URL: #36541
Reviewed-By: Michael Dawson <[email protected]>
  • Loading branch information
@richardlau
richardlau committed Dec 22, 2020
1 parent d936e18 commit b0608b5
Show file tree
Hide file tree
Showing 323 changed files with 2,934 additions and 1,495 deletions.
27 changes: 23 additions & 4 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 @@ -60,9 +60,9 @@ our %config = (
openssl_thread_defines => [ "OPENSSL_THREADS" ],
openssldir => "",
options => " no-afalgeng no-asan no-buildtest-c++ 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_archname => "x86_64-linux-thread-multi",
perl_cmd => "/usr/bin/perl",
perl_version => "5.28.1",
perl_version => "5.32.0",
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "BSD-x86_64" ],
perlenv => {
"AR" => undef,
Expand Down Expand Up @@ -111,8 +111,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86_64",
tdirs => [ "ossl_shim" ],
version => "1.1.1g",
version_num => "0x1010107fL",
version => "1.1.1i",
version_num => "0x1010109fL",
);

our %target = (
Expand Down Expand Up @@ -1182,6 +1182,11 @@ our %unified_info = (
"libssl",
"test/libtestutil.a",
],
"test/cmactest" =>
[
"libcrypto.a",
"test/libtestutil.a",
],
"test/cmsapitest" =>
[
"libcrypto",
Expand Down Expand Up @@ -9085,6 +9090,11 @@ our %unified_info = (
[
"include",
],
"test/cmactest.o" =>
[
"include",
"apps/include",
],
"test/cmsapitest.o" =>
[
"include",
Expand Down Expand Up @@ -9662,6 +9672,7 @@ our %unified_info = (
"test/cipherlist_test",
"test/ciphername_test",
"test/clienthellotest",
"test/cmactest",
"test/cmsapitest",
"test/conf_include_test",
"test/constant_time_test",
Expand Down Expand Up @@ -14437,6 +14448,14 @@ our %unified_info = (
[
"test/clienthellotest.c",
],
"test/cmactest" =>
[
"test/cmactest.o",
],
"test/cmactest.o" =>
[
"test/cmactest.c",
],
"test/cmsapitest" =>
[
"test/cmsapitest.o",
Expand Down
8 changes: 4 additions & 4 deletions deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
.type aesni_cbc_sha1_enc,@function
.align 32
aesni_cbc_sha1_enc:
.cfi_startproc
.cfi_startproc

movl OPENSSL_ia32cap_P+0(%rip),%r10d
movq OPENSSL_ia32cap_P+4(%rip),%r11
Expand All @@ -18,7 +18,7 @@ aesni_cbc_sha1_enc:
je aesni_cbc_sha1_enc_avx
jmp aesni_cbc_sha1_enc_ssse3
.byte 0xf3,0xc3
.cfi_endproc
.cfi_endproc
.size aesni_cbc_sha1_enc,.-aesni_cbc_sha1_enc
.type aesni_cbc_sha1_enc_ssse3,@function
.align 32
Expand Down Expand Up @@ -2732,7 +2732,7 @@ K_XX_XX:
.type aesni_cbc_sha1_enc_shaext,@function
.align 32
aesni_cbc_sha1_enc_shaext:
.cfi_startproc
.cfi_startproc
movq 8(%rsp),%r10
movdqu (%r9),%xmm8
movd 16(%r9),%xmm9
Expand Down Expand Up @@ -3031,5 +3031,5 @@ aesni_cbc_sha1_enc_shaext:
movdqu %xmm8,(%r9)
movd %xmm9,16(%r9)
.byte 0xf3,0xc3
.cfi_endproc
.cfi_endproc
.size aesni_cbc_sha1_enc_shaext,.-aesni_cbc_sha1_enc_shaext
8 changes: 4 additions & 4 deletions deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
.type aesni_cbc_sha256_enc,@function
.align 16
aesni_cbc_sha256_enc:
.cfi_startproc
.cfi_startproc
leaq OPENSSL_ia32cap_P(%rip),%r11
movl $1,%eax
cmpq $0,%rdi
Expand All @@ -31,7 +31,7 @@ aesni_cbc_sha256_enc:
ud2
.Lprobe:
.byte 0xf3,0xc3
.cfi_endproc
.cfi_endproc
.size aesni_cbc_sha256_enc,.-aesni_cbc_sha256_enc

.align 64
Expand Down Expand Up @@ -4081,7 +4081,7 @@ aesni_cbc_sha256_enc_avx2:
.type aesni_cbc_sha256_enc_shaext,@function
.align 32
aesni_cbc_sha256_enc_shaext:
.cfi_startproc
.cfi_startproc
movq 8(%rsp),%r10
leaq K256+128(%rip),%rax
movdqu (%r9),%xmm1
Expand Down Expand Up @@ -4431,5 +4431,5 @@ aesni_cbc_sha256_enc_shaext:
movdqu %xmm1,(%r9)
movdqu %xmm2,16(%r9)
.byte 0xf3,0xc3
.cfi_endproc
.cfi_endproc
.size aesni_cbc_sha256_enc_shaext,.-aesni_cbc_sha256_enc_shaext
34 changes: 17 additions & 17 deletions deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-x86_64.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -861,7 +861,7 @@ aesni_ecb_encrypt:
.type aesni_ccm64_encrypt_blocks,@function
.align 16
aesni_ccm64_encrypt_blocks:
.cfi_startproc
.cfi_startproc
movl 240(%rcx),%eax
movdqu (%r8),%xmm6
movdqa .Lincrement64(%rip),%xmm9
Expand Down Expand Up @@ -920,13 +920,13 @@ aesni_ccm64_encrypt_blocks:
pxor %xmm8,%xmm8
pxor %xmm6,%xmm6
.byte 0xf3,0xc3
.cfi_endproc
.cfi_endproc
.size aesni_ccm64_encrypt_blocks,.-aesni_ccm64_encrypt_blocks
.globl aesni_ccm64_decrypt_blocks
.type aesni_ccm64_decrypt_blocks,@function
.align 16
aesni_ccm64_decrypt_blocks:
.cfi_startproc
.cfi_startproc
movl 240(%rcx),%eax
movups (%r8),%xmm6
movdqu (%r9),%xmm3
Expand Down Expand Up @@ -1019,7 +1019,7 @@ aesni_ccm64_decrypt_blocks:
pxor %xmm8,%xmm8
pxor %xmm6,%xmm6
.byte 0xf3,0xc3
.cfi_endproc
.cfi_endproc
.size aesni_ccm64_decrypt_blocks,.-aesni_ccm64_decrypt_blocks
.globl aesni_ctr32_encrypt_blocks
.type aesni_ctr32_encrypt_blocks,@function
Expand Down Expand Up @@ -2794,7 +2794,7 @@ aesni_ocb_encrypt:
.type __ocb_encrypt6,@function
.align 32
__ocb_encrypt6:
.cfi_startproc
.cfi_startproc
pxor %xmm9,%xmm15
movdqu (%rbx,%r12,1),%xmm11
movdqa %xmm10,%xmm12
Expand Down Expand Up @@ -2892,13 +2892,13 @@ __ocb_encrypt6:
.byte 102,65,15,56,221,246
.byte 102,65,15,56,221,255
.byte 0xf3,0xc3
.cfi_endproc
.cfi_endproc
.size __ocb_encrypt6,.-__ocb_encrypt6

.type __ocb_encrypt4,@function
.align 32
__ocb_encrypt4:
.cfi_startproc
.cfi_startproc
pxor %xmm9,%xmm15
movdqu (%rbx,%r12,1),%xmm11
movdqa %xmm10,%xmm12
Expand Down Expand Up @@ -2963,13 +2963,13 @@ __ocb_encrypt4:
.byte 102,65,15,56,221,228
.byte 102,65,15,56,221,237
.byte 0xf3,0xc3
.cfi_endproc
.cfi_endproc
.size __ocb_encrypt4,.-__ocb_encrypt4

.type __ocb_encrypt1,@function
.align 32
__ocb_encrypt1:
.cfi_startproc
.cfi_startproc
pxor %xmm15,%xmm7
pxor %xmm9,%xmm7
pxor %xmm2,%xmm8
Expand Down Expand Up @@ -3000,7 +3000,7 @@ __ocb_encrypt1:

.byte 102,15,56,221,215
.byte 0xf3,0xc3
.cfi_endproc
.cfi_endproc
.size __ocb_encrypt1,.-__ocb_encrypt1

.globl aesni_ocb_decrypt
Expand Down Expand Up @@ -3243,7 +3243,7 @@ aesni_ocb_decrypt:
.type __ocb_decrypt6,@function
.align 32
__ocb_decrypt6:
.cfi_startproc
.cfi_startproc
pxor %xmm9,%xmm15
movdqu (%rbx,%r12,1),%xmm11
movdqa %xmm10,%xmm12
Expand Down Expand Up @@ -3335,13 +3335,13 @@ __ocb_decrypt6:
.byte 102,65,15,56,223,246
.byte 102,65,15,56,223,255
.byte 0xf3,0xc3
.cfi_endproc
.cfi_endproc
.size __ocb_decrypt6,.-__ocb_decrypt6

.type __ocb_decrypt4,@function
.align 32
__ocb_decrypt4:
.cfi_startproc
.cfi_startproc
pxor %xmm9,%xmm15
movdqu (%rbx,%r12,1),%xmm11
movdqa %xmm10,%xmm12
Expand Down Expand Up @@ -3402,13 +3402,13 @@ __ocb_decrypt4:
.byte 102,65,15,56,223,228
.byte 102,65,15,56,223,237
.byte 0xf3,0xc3
.cfi_endproc
.cfi_endproc
.size __ocb_decrypt4,.-__ocb_decrypt4

.type __ocb_decrypt1,@function
.align 32
__ocb_decrypt1:
.cfi_startproc
.cfi_startproc
pxor %xmm15,%xmm7
pxor %xmm9,%xmm7
pxor %xmm7,%xmm2
Expand Down Expand Up @@ -3438,7 +3438,7 @@ __ocb_decrypt1:

.byte 102,15,56,223,215
.byte 0xf3,0xc3
.cfi_endproc
.cfi_endproc
.size __ocb_decrypt1,.-__ocb_decrypt1
.globl aesni_cbc_encrypt
.type aesni_cbc_encrypt,@function
Expand Down Expand Up @@ -4447,7 +4447,7 @@ __aesni_set_encrypt_key:
shufps $170,%xmm1,%xmm1
xorps %xmm1,%xmm2
.byte 0xf3,0xc3
.cfi_endproc
.cfi_endproc
.size aesni_set_encrypt_key,.-aesni_set_encrypt_key
.size __aesni_set_encrypt_key,.-__aesni_set_encrypt_key
.align 64
Expand Down
28 changes: 14 additions & 14 deletions deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/rsaz-x86_64.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1453,7 +1453,7 @@ rsaz_512_mul_by_one:
.type __rsaz_512_reduce,@function
.align 32
__rsaz_512_reduce:
.cfi_startproc
.cfi_startproc
movq %r8,%rbx
imulq 128+8(%rsp),%rbx
movq 0(%rbp),%rax
Expand Down Expand Up @@ -1533,12 +1533,12 @@ __rsaz_512_reduce:
jne .Lreduction_loop

.byte 0xf3,0xc3
.cfi_endproc
.cfi_endproc
.size __rsaz_512_reduce,.-__rsaz_512_reduce
.type __rsaz_512_reducex,@function
.align 32
__rsaz_512_reducex:
.cfi_startproc
.cfi_startproc

imulq %r8,%rdx
xorq %rsi,%rsi
Expand Down Expand Up @@ -1591,12 +1591,12 @@ __rsaz_512_reducex:
jne .Lreduction_loopx

.byte 0xf3,0xc3
.cfi_endproc
.cfi_endproc
.size __rsaz_512_reducex,.-__rsaz_512_reducex
.type __rsaz_512_subtract,@function
.align 32
__rsaz_512_subtract:
.cfi_startproc
.cfi_startproc
movq %r8,(%rdi)
movq %r9,8(%rdi)
movq %r10,16(%rdi)
Expand Down Expand Up @@ -1650,12 +1650,12 @@ __rsaz_512_subtract:
movq %r15,56(%rdi)

.byte 0xf3,0xc3
.cfi_endproc
.cfi_endproc
.size __rsaz_512_subtract,.-__rsaz_512_subtract
.type __rsaz_512_mul,@function
.align 32
__rsaz_512_mul:
.cfi_startproc
.cfi_startproc
leaq 8(%rsp),%rdi

movq (%rsi),%rax
Expand Down Expand Up @@ -1794,12 +1794,12 @@ __rsaz_512_mul:
movq %r15,56(%rdi)

.byte 0xf3,0xc3
.cfi_endproc
.cfi_endproc
.size __rsaz_512_mul,.-__rsaz_512_mul
.type __rsaz_512_mulx,@function
.align 32
__rsaz_512_mulx:
.cfi_startproc
.cfi_startproc
mulxq (%rsi),%rbx,%r8
movq $-6,%rcx

Expand Down Expand Up @@ -1916,13 +1916,13 @@ __rsaz_512_mulx:
movq %r15,8+64+56(%rsp)

.byte 0xf3,0xc3
.cfi_endproc
.cfi_endproc
.size __rsaz_512_mulx,.-__rsaz_512_mulx
.globl rsaz_512_scatter4
.type rsaz_512_scatter4,@function
.align 16
rsaz_512_scatter4:
.cfi_startproc
.cfi_startproc
leaq (%rdi,%rdx,8),%rdi
movl $8,%r9d
jmp .Loop_scatter
Expand All @@ -1935,14 +1935,14 @@ rsaz_512_scatter4:
decl %r9d
jnz .Loop_scatter
.byte 0xf3,0xc3
.cfi_endproc
.cfi_endproc
.size rsaz_512_scatter4,.-rsaz_512_scatter4

.globl rsaz_512_gather4
.type rsaz_512_gather4,@function
.align 16
rsaz_512_gather4:
.cfi_startproc
.cfi_startproc
movd %edx,%xmm8
movdqa .Linc+16(%rip),%xmm1
movdqa .Linc(%rip),%xmm0
Expand Down Expand Up @@ -2006,7 +2006,7 @@ rsaz_512_gather4:
jnz .Loop_gather
.byte 0xf3,0xc3
.LSEH_end_rsaz_512_gather4:
.cfi_endproc
.cfi_endproc
.size rsaz_512_gather4,.-rsaz_512_gather4

.align 64
Expand Down
Loading

0 comments on commit b0608b5

Please sign in to comment.