Skip to content

Commit b0608b5

Browse files
committedDec 22, 2020
deps: update archs files for OpenSSL-1.1.1i
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 <midawson@redhat.com>
1 parent d936e18 commit b0608b5

File tree

323 files changed

+2934
-1495
lines changed

Some content is hidden

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

323 files changed

+2934
-1495
lines changed
 

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

+23-4
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ our %config = (
6060
openssl_thread_defines => [ "OPENSSL_THREADS" ],
6161
openssldir => "",
6262
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",
63-
perl_archname => "x86_64-linux-gnu-thread-multi",
63+
perl_archname => "x86_64-linux-thread-multi",
6464
perl_cmd => "/usr/bin/perl",
65-
perl_version => "5.28.1",
65+
perl_version => "5.32.0",
6666
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "BSD-x86_64" ],
6767
perlenv => {
6868
"AR" => undef,
@@ -111,8 +111,8 @@ our %config = (
111111
sourcedir => ".",
112112
target => "BSD-x86_64",
113113
tdirs => [ "ossl_shim" ],
114-
version => "1.1.1g",
115-
version_num => "0x1010107fL",
114+
version => "1.1.1i",
115+
version_num => "0x1010109fL",
116116
);
117117

118118
our %target = (
@@ -1182,6 +1182,11 @@ our %unified_info = (
11821182
"libssl",
11831183
"test/libtestutil.a",
11841184
],
1185+
"test/cmactest" =>
1186+
[
1187+
"libcrypto.a",
1188+
"test/libtestutil.a",
1189+
],
11851190
"test/cmsapitest" =>
11861191
[
11871192
"libcrypto",
@@ -9085,6 +9090,11 @@ our %unified_info = (
90859090
[
90869091
"include",
90879092
],
9093+
"test/cmactest.o" =>
9094+
[
9095+
"include",
9096+
"apps/include",
9097+
],
90889098
"test/cmsapitest.o" =>
90899099
[
90909100
"include",
@@ -9662,6 +9672,7 @@ our %unified_info = (
96629672
"test/cipherlist_test",
96639673
"test/ciphername_test",
96649674
"test/clienthellotest",
9675+
"test/cmactest",
96659676
"test/cmsapitest",
96669677
"test/conf_include_test",
96679678
"test/constant_time_test",
@@ -14437,6 +14448,14 @@ our %unified_info = (
1443714448
[
1443814449
"test/clienthellotest.c",
1443914450
],
14451+
"test/cmactest" =>
14452+
[
14453+
"test/cmactest.o",
14454+
],
14455+
"test/cmactest.o" =>
14456+
[
14457+
"test/cmactest.c",
14458+
],
1444014459
"test/cmsapitest" =>
1444114460
[
1444214461
"test/cmsapitest.o",

Diff for: ‎deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
.type aesni_cbc_sha1_enc,@function
66
.align 32
77
aesni_cbc_sha1_enc:
8-
.cfi_startproc
8+
.cfi_startproc
99

1010
movl OPENSSL_ia32cap_P+0(%rip),%r10d
1111
movq OPENSSL_ia32cap_P+4(%rip),%r11
@@ -18,7 +18,7 @@ aesni_cbc_sha1_enc:
1818
je aesni_cbc_sha1_enc_avx
1919
jmp aesni_cbc_sha1_enc_ssse3
2020
.byte 0xf3,0xc3
21-
.cfi_endproc
21+
.cfi_endproc
2222
.size aesni_cbc_sha1_enc,.-aesni_cbc_sha1_enc
2323
.type aesni_cbc_sha1_enc_ssse3,@function
2424
.align 32
@@ -2732,7 +2732,7 @@ K_XX_XX:
27322732
.type aesni_cbc_sha1_enc_shaext,@function
27332733
.align 32
27342734
aesni_cbc_sha1_enc_shaext:
2735-
.cfi_startproc
2735+
.cfi_startproc
27362736
movq 8(%rsp),%r10
27372737
movdqu (%r9),%xmm8
27382738
movd 16(%r9),%xmm9
@@ -3031,5 +3031,5 @@ aesni_cbc_sha1_enc_shaext:
30313031
movdqu %xmm8,(%r9)
30323032
movd %xmm9,16(%r9)
30333033
.byte 0xf3,0xc3
3034-
.cfi_endproc
3034+
.cfi_endproc
30353035
.size aesni_cbc_sha1_enc_shaext,.-aesni_cbc_sha1_enc_shaext

0 commit comments

Comments
 (0)
Please sign in to comment.