Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[v14.x] deps: update OpenSSL 1.1.1t #46566

Closed
wants to merge 3 commits into from
Closed

[v14.x] deps: update OpenSSL 1.1.1t #46566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb3f38c
deps: upgrade openssl sources to 1.1.1t
RafaelGSS Feb 8, 2023
6858395
deps: update archs files for OpenSSL-1.1.1t
RafaelGSS Feb 8, 2023
d4a55f1
deps: cherry-pick Windows ARM64 fix for openssl
richardlau Feb 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
15 changes: 13 additions & 2 deletions deps/openssl/config/archs/BSD-x86/asm/configdata.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86",
tdirs => [ "ossl_shim" ],
version => "1.1.1s",
version_num => "0x1010113fL",
version => "1.1.1t",
version_num => "0x1010114fL",
);

our %target = (
Expand Down Expand Up @@ -1944,6 +1944,7 @@ our %unified_info = (
"crypto/bn/bn_word.o",
"crypto/bn/bn_x931p.o",
"crypto/bn/co-586.o",
"crypto/bn/rsa_sup_mul.o",
"crypto/bn/x86-gf2m.o",
"crypto/bn/x86-mont.o",
],
Expand Down Expand Up @@ -5635,6 +5636,11 @@ our %unified_info = (
[
"crypto",
],
"crypto/bn/rsa_sup_mul.o" =>
[
".",
"include",
],
"crypto/bn/sparct4-mont.o" =>
[
"crypto",
Expand Down Expand Up @@ -10574,6 +10580,10 @@ our %unified_info = (
[
"crypto/bn/co-586.s",
],
"crypto/bn/rsa_sup_mul.o" =>
[
"crypto/bn/rsa_sup_mul.c",
],
"crypto/bn/x86-gf2m.o" =>
[
"crypto/bn/x86-gf2m.s",
Expand Down Expand Up @@ -12844,6 +12854,7 @@ our %unified_info = (
"crypto/bn/bn_word.o",
"crypto/bn/bn_x931p.o",
"crypto/bn/co-586.o",
"crypto/bn/rsa_sup_mul.o",
"crypto/bn/x86-gf2m.o",
"crypto/bn/x86-mont.o",
"crypto/buffer/buf_err.o",
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86"
#define DATE "built on: Wed Nov 2 12:51:26 2022 UTC"
#define DATE "built on: Wed Feb 8 12:42:33 2023 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
2 changes: 2 additions & 0 deletions deps/openssl/config/archs/BSD-x86/asm/engines/e_padlock-x86.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ _padlock_key_bswap:
L_padlock_key_bswap_begin:
movl 4(%esp),%edx
movl 240(%edx),%ecx
incl %ecx
shll $2,%ecx
L003bswap_loop:
movl (%edx),%eax
bswap %eax
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/asm/include/progs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by apps/progs.pl
*
* Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
Expand Down
1 change: 1 addition & 0 deletions deps/openssl/config/archs/BSD-x86/asm/openssl.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@
'openssl/crypto/bn/bn_srp.c',
'openssl/crypto/bn/bn_word.c',
'openssl/crypto/bn/bn_x931p.c',
'openssl/crypto/bn/rsa_sup_mul.c',
'openssl/crypto/buffer/buf_err.c',
'openssl/crypto/buffer/buffer.c',
'openssl/crypto/camellia/cmll_cfb.c',
Expand Down
15 changes: 13 additions & 2 deletions deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86",
tdirs => [ "ossl_shim" ],
version => "1.1.1s",
version_num => "0x1010113fL",
version => "1.1.1t",
version_num => "0x1010114fL",
);

our %target = (
Expand Down Expand Up @@ -1944,6 +1944,7 @@ our %unified_info = (
"crypto/bn/bn_word.o",
"crypto/bn/bn_x931p.o",
"crypto/bn/co-586.o",
"crypto/bn/rsa_sup_mul.o",
"crypto/bn/x86-gf2m.o",
"crypto/bn/x86-mont.o",
],
Expand Down Expand Up @@ -5635,6 +5636,11 @@ our %unified_info = (
[
"crypto",
],
"crypto/bn/rsa_sup_mul.o" =>
[
".",
"include",
],
"crypto/bn/sparct4-mont.o" =>
[
"crypto",
Expand Down Expand Up @@ -10574,6 +10580,10 @@ our %unified_info = (
[
"crypto/bn/co-586.s",
],
"crypto/bn/rsa_sup_mul.o" =>
[
"crypto/bn/rsa_sup_mul.c",
],
"crypto/bn/x86-gf2m.o" =>
[
"crypto/bn/x86-gf2m.s",
Expand Down Expand Up @@ -12844,6 +12854,7 @@ our %unified_info = (
"crypto/bn/bn_word.o",
"crypto/bn/bn_x931p.o",
"crypto/bn/co-586.o",
"crypto/bn/rsa_sup_mul.o",
"crypto/bn/x86-gf2m.o",
"crypto/bn/x86-mont.o",
"crypto/buffer/buf_err.o",
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86"
#define DATE "built on: Wed Nov 2 12:51:29 2022 UTC"
#define DATE "built on: Wed Feb 8 12:42:35 2023 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
2 changes: 2 additions & 0 deletions deps/openssl/config/archs/BSD-x86/asm_avx2/engines/e_padlock-x86.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ _padlock_key_bswap:
L_padlock_key_bswap_begin:
movl 4(%esp),%edx
movl 240(%edx),%ecx
incl %ecx
shll $2,%ecx
L003bswap_loop:
movl (%edx),%eax
bswap %eax
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/asm_avx2/include/progs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by apps/progs.pl
*
* Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
Expand Down
1 change: 1 addition & 0 deletions deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@
'openssl/crypto/bn/bn_srp.c',
'openssl/crypto/bn/bn_word.c',
'openssl/crypto/bn/bn_x931p.c',
'openssl/crypto/bn/rsa_sup_mul.c',
'openssl/crypto/buffer/buf_err.c',
'openssl/crypto/buffer/buffer.c',
'openssl/crypto/camellia/cmll_cfb.c',
Expand Down
15 changes: 13 additions & 2 deletions deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86",
tdirs => [ "ossl_shim" ],
version => "1.1.1s",
version_num => "0x1010113fL",
version => "1.1.1t",
version_num => "0x1010114fL",
);

our %target = (
Expand Down Expand Up @@ -1939,6 +1939,7 @@ our %unified_info = (
"crypto/bn/bn_srp.o",
"crypto/bn/bn_word.o",
"crypto/bn/bn_x931p.o",
"crypto/bn/rsa_sup_mul.o",
],
"products" =>
{
Expand Down Expand Up @@ -5605,6 +5606,11 @@ our %unified_info = (
[
"crypto",
],
"crypto/bn/rsa_sup_mul.o" =>
[
".",
"include",
],
"crypto/bn/sparct4-mont.o" =>
[
"crypto",
Expand Down Expand Up @@ -10482,6 +10488,10 @@ our %unified_info = (
[
"crypto/bn/bn_x931p.c",
],
"crypto/bn/rsa_sup_mul.o" =>
[
"crypto/bn/rsa_sup_mul.c",
],
"crypto/buffer/buf_err.o" =>
[
"crypto/buffer/buf_err.c",
Expand Down Expand Up @@ -12709,6 +12719,7 @@ our %unified_info = (
"crypto/bn/bn_srp.o",
"crypto/bn/bn_word.o",
"crypto/bn/bn_x931p.o",
"crypto/bn/rsa_sup_mul.o",
"crypto/buffer/buf_err.o",
"crypto/buffer/buffer.o",
"crypto/camellia/camellia.o",
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86"
#define DATE "built on: Wed Nov 2 12:51:31 2022 UTC"
#define DATE "built on: Wed Feb 8 12:42:36 2023 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/no-asm/include/progs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by apps/progs.pl
*
* Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
Expand Down
1 change: 1 addition & 0 deletions deps/openssl/config/archs/BSD-x86/no-asm/openssl.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@
'openssl/crypto/bn/bn_srp.c',
'openssl/crypto/bn/bn_word.c',
'openssl/crypto/bn/bn_x931p.c',
'openssl/crypto/bn/rsa_sup_mul.c',
'openssl/crypto/buffer/buf_err.c',
'openssl/crypto/buffer/buffer.c',
'openssl/crypto/camellia/camellia.c',
Expand Down
15 changes: 13 additions & 2 deletions deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86_64",
tdirs => [ "ossl_shim" ],
version => "1.1.1s",
version_num => "0x1010113fL",
version => "1.1.1t",
version_num => "0x1010114fL",
);

our %target = (
Expand Down Expand Up @@ -1954,6 +1954,7 @@ our %unified_info = (
"crypto/bn/bn_srp.o",
"crypto/bn/bn_word.o",
"crypto/bn/bn_x931p.o",
"crypto/bn/rsa_sup_mul.o",
"crypto/bn/rsaz-avx2.o",
"crypto/bn/rsaz-x86_64.o",
"crypto/bn/rsaz_exp.o",
Expand Down Expand Up @@ -5689,6 +5690,11 @@ our %unified_info = (
[
"crypto",
],
"crypto/bn/rsa_sup_mul.o" =>
[
".",
"include",
],
"crypto/bn/rsaz-avx2.o" =>
[
".",
Expand Down Expand Up @@ -10676,6 +10682,10 @@ our %unified_info = (
[
"crypto/bn/bn_x931p.c",
],
"crypto/bn/rsa_sup_mul.o" =>
[
"crypto/bn/rsa_sup_mul.c",
],
"crypto/bn/rsaz-avx2.o" =>
[
"crypto/bn/rsaz-avx2.s",
Expand Down Expand Up @@ -12980,6 +12990,7 @@ our %unified_info = (
"crypto/bn/bn_srp.o",
"crypto/bn/bn_word.o",
"crypto/bn/bn_x931p.o",
"crypto/bn/rsa_sup_mul.o",
"crypto/bn/rsaz-avx2.o",
"crypto/bn/rsaz-x86_64.o",
"crypto/bn/rsaz_exp.o",
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86_64"
#define DATE "built on: Wed Nov 2 12:51:32 2022 UTC"
#define DATE "built on: Wed Feb 8 12:42:38 2023 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
2 changes: 2 additions & 0 deletions deps/openssl/config/archs/BSD-x86_64/asm/engines/e_padlock-x86_64.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ padlock_capability:
.align 16
padlock_key_bswap:
movl 240(%rdi),%edx
incl %edx
shll $2,%edx
.Lbswap_loop:
movl (%rdi),%eax
bswapl %eax
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86_64/asm/include/progs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by apps/progs.pl
*
* Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
Expand Down
1 change: 1 addition & 0 deletions deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@
'openssl/crypto/bn/bn_srp.c',
'openssl/crypto/bn/bn_word.c',
'openssl/crypto/bn/bn_x931p.c',
'openssl/crypto/bn/rsa_sup_mul.c',
'openssl/crypto/bn/rsaz_exp.c',
'openssl/crypto/buffer/buf_err.c',
'openssl/crypto/buffer/buffer.c',
Expand Down
15 changes: 13 additions & 2 deletions deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86_64",
tdirs => [ "ossl_shim" ],
version => "1.1.1s",
version_num => "0x1010113fL",
version => "1.1.1t",
version_num => "0x1010114fL",
);

our %target = (
Expand Down Expand Up @@ -1954,6 +1954,7 @@ our %unified_info = (
"crypto/bn/bn_srp.o",
"crypto/bn/bn_word.o",
"crypto/bn/bn_x931p.o",
"crypto/bn/rsa_sup_mul.o",
"crypto/bn/rsaz-avx2.o",
"crypto/bn/rsaz-x86_64.o",
"crypto/bn/rsaz_exp.o",
Expand Down Expand Up @@ -5689,6 +5690,11 @@ our %unified_info = (
[
"crypto",
],
"crypto/bn/rsa_sup_mul.o" =>
[
".",
"include",
],
"crypto/bn/rsaz-avx2.o" =>
[
".",
Expand Down Expand Up @@ -10676,6 +10682,10 @@ our %unified_info = (
[
"crypto/bn/bn_x931p.c",
],
"crypto/bn/rsa_sup_mul.o" =>
[
"crypto/bn/rsa_sup_mul.c",
],
"crypto/bn/rsaz-avx2.o" =>
[
"crypto/bn/rsaz-avx2.s",
Expand Down Expand Up @@ -12980,6 +12990,7 @@ our %unified_info = (
"crypto/bn/bn_srp.o",
"crypto/bn/bn_word.o",
"crypto/bn/bn_x931p.o",
"crypto/bn/rsa_sup_mul.o",
"crypto/bn/rsaz-avx2.o",
"crypto/bn/rsaz-x86_64.o",
"crypto/bn/rsaz_exp.o",
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86_64"
#define DATE "built on: Wed Nov 2 12:51:36 2022 UTC"
#define DATE "built on: Wed Feb 8 12:42:42 2023 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
2 changes: 2 additions & 0 deletions deps/openssl/config/archs/BSD-x86_64/asm_avx2/engines/e_padlock-x86_64.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ padlock_capability:
.align 16
padlock_key_bswap:
movl 240(%rdi),%edx
incl %edx
shll $2,%edx
.Lbswap_loop:
movl (%rdi),%eax
bswapl %eax
Expand Down