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

src: add --openssl-legacy-provider option #40478

Closed
wants to merge 4 commits into from
Closed

src: add --openssl-legacy-provider option #40478

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d10df9
deps: add missing legacyprov.c source
danbev Oct 16, 2021
9bb7bd8
deps: regenerate OpenSSL arch files
danbev Oct 16, 2021
86d1c0c
src: add --openssl-legacy-provider option
danbev Oct 16, 2021
780b643
squash! src: add --openssl-legacy-provider option
danbev Oct 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Prev Previous commit
Next Next commit
deps: regenerate OpenSSL arch files 
Co-authored-by: Richard Lau <[email protected]>
  • Loading branch information
@danbev @richardlau
danbev and richardlau committed Oct 18, 2021
commit 9bb7bd8f17002dbe60fa739e90290760ff333dd7
12 changes: 6 additions & 6 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 @@ -206,7 +206,7 @@ our %config = (
"patch" => "0",
"perl_archname" => "x86_64-linux-thread-multi",
"perl_cmd" => "/usr/bin/perl",
"perl_version" => "5.30.3",
"perl_version" => "5.32.1",
"perlargv" => [
"no-comp",
"no-shared",
Expand Down Expand Up @@ -27216,8 +27216,8 @@ unless (caller) {
use File::Copy;
use Pod::Usage;

use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl';
use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt';

my $here = dirname($0);

Expand All @@ -27244,7 +27244,7 @@ unless (caller) {
);

use lib '.';
use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
use gentemplate;

print 'Creating ',$buildfile_template,"\n";
Expand All @@ -27261,8 +27261,8 @@ unless (caller) {

my $prepend = <<'_____';
use File::Spec::Functions;
use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl';
use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
use lib '.';
use platform;
_____
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 Sep 8 06:02:47 2021 UTC"
#define DATE "built on: Mon Oct 18 06:50:11 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
5 changes: 3 additions & 2 deletions deps/openssl/config/archs/BSD-x86/asm/openssl-fips.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@
'./config/archs/BSD-x86/asm/crypto/des/crypt586.s',
'./config/archs/BSD-x86/asm/crypto/des/des-586.s',
'./config/archs/BSD-x86/asm/crypto/md5/md5-586.s',
'./config/archs/BSD-x86/asm/providers/legacy.ld',
'./config/archs/BSD-x86/asm/providers/fips.ld',

],
Expand Down Expand Up @@ -337,7 +338,7 @@
'openssl_ex_libs_BSD-x86': [
'-pthread',
],
'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config'
'linker_script': ''
},
'include_dirs': [
'.',
Expand All @@ -349,7 +350,7 @@
'defines': ['<@(openssl_defines_BSD-x86)'],
'cflags': ['<@(openssl_cflags_BSD-x86)'],
'libraries': ['<@(openssl_ex_libs_BSD-x86)'],
'ldflags': ['-Wl,--version-script=<@(linker_script)'],

'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86)'],
'direct_dependent_settings': {
'include_dirs': ['./include', '.'],
Expand Down
2 changes: 2 additions & 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 @@ -940,6 +940,7 @@
'openssl/providers/implementations/digests/wp_prov.c',
'openssl/providers/implementations/kdfs/pbkdf1.c',
'openssl/providers/prov_running.c',
'openssl/providers/legacyprov.c',
],
'openssl_sources_BSD-x86': [
'./config/archs/BSD-x86/asm/crypto/aes/aes-586.s',
Expand Down Expand Up @@ -980,6 +981,7 @@
'./config/archs/BSD-x86/asm/crypto/des/crypt586.s',
'./config/archs/BSD-x86/asm/crypto/des/des-586.s',
'./config/archs/BSD-x86/asm/crypto/md5/md5-586.s',
'./config/archs/BSD-x86/asm/providers/legacy.ld',
'./config/archs/BSD-x86/asm/providers/fips.ld',
],
'openssl_defines_BSD-x86': [
Expand Down
5 changes: 5 additions & 0 deletions deps/openssl/config/archs/BSD-x86/asm/providers/legacy.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
global:
OSSL_provider_init;
local: *;
};
16 changes: 8 additions & 8 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 @@ -206,7 +206,7 @@ our %config = (
"patch" => "0",
"perl_archname" => "x86_64-linux-thread-multi",
"perl_cmd" => "/usr/bin/perl",
"perl_version" => "5.30.3",
"perl_version" => "5.32.1",
"perlargv" => [
"no-comp",
"no-shared",
Expand Down Expand Up @@ -9714,10 +9714,10 @@ our %unified_info = (
},
"providers/fips" => {
"deps" => [
"providers/fips/fips-dso-fips_entry.o",
"providers/fips/libfips-lib-fipsprov.o",
"providers/fips/libfips-lib-self_test.o",
"providers/fips/libfips-lib-self_test_kats.o"
"providers/fips/libfips-lib-self_test_kats.o",
"providers/fips/fips-dso-fips_entry.o"
],
"products" => {
"dso" => [
Expand Down Expand Up @@ -27216,8 +27216,8 @@ unless (caller) {
use File::Copy;
use Pod::Usage;

use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl';
use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt';

my $here = dirname($0);

Expand All @@ -27244,7 +27244,7 @@ unless (caller) {
);

use lib '.';
use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
use gentemplate;

print 'Creating ',$buildfile_template,"\n";
Expand All @@ -27261,8 +27261,8 @@ unless (caller) {

my $prepend = <<'_____';
use File::Spec::Functions;
use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl';
use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
use lib '.';
use platform;
_____
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 Sep 8 06:02:59 2021 UTC"
#define DATE "built on: Mon Oct 18 06:50:27 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
5 changes: 3 additions & 2 deletions deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-fips.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@
'./config/archs/BSD-x86/asm_avx2/crypto/des/crypt586.s',
'./config/archs/BSD-x86/asm_avx2/crypto/des/des-586.s',
'./config/archs/BSD-x86/asm_avx2/crypto/md5/md5-586.s',
'./config/archs/BSD-x86/asm_avx2/providers/legacy.ld',
'./config/archs/BSD-x86/asm_avx2/providers/fips.ld',

],
Expand Down Expand Up @@ -337,7 +338,7 @@
'openssl_ex_libs_BSD-x86': [
'-pthread',
],
'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config'
'linker_script': ''
},
'include_dirs': [
'.',
Expand All @@ -349,7 +350,7 @@
'defines': ['<@(openssl_defines_BSD-x86)'],
'cflags': ['<@(openssl_cflags_BSD-x86)'],
'libraries': ['<@(openssl_ex_libs_BSD-x86)'],
'ldflags': ['-Wl,--version-script=<@(linker_script)'],

'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86)'],
'direct_dependent_settings': {
'include_dirs': ['./include', '.'],
Expand Down
2 changes: 2 additions & 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 @@ -940,6 +940,7 @@
'openssl/providers/implementations/digests/wp_prov.c',
'openssl/providers/implementations/kdfs/pbkdf1.c',
'openssl/providers/prov_running.c',
'openssl/providers/legacyprov.c',
],
'openssl_sources_BSD-x86': [
'./config/archs/BSD-x86/asm_avx2/crypto/aes/aes-586.s',
Expand Down Expand Up @@ -980,6 +981,7 @@
'./config/archs/BSD-x86/asm_avx2/crypto/des/crypt586.s',
'./config/archs/BSD-x86/asm_avx2/crypto/des/des-586.s',
'./config/archs/BSD-x86/asm_avx2/crypto/md5/md5-586.s',
'./config/archs/BSD-x86/asm_avx2/providers/legacy.ld',
'./config/archs/BSD-x86/asm_avx2/providers/fips.ld',
],
'openssl_defines_BSD-x86': [
Expand Down
5 changes: 5 additions & 0 deletions deps/openssl/config/archs/BSD-x86/asm_avx2/providers/legacy.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
global:
OSSL_provider_init;
local: *;
};
24 changes: 12 additions & 12 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 @@ -205,7 +205,7 @@ our %config = (
"patch" => "0",
"perl_archname" => "x86_64-linux-thread-multi",
"perl_cmd" => "/usr/bin/perl",
"perl_version" => "5.30.3",
"perl_version" => "5.32.1",
"perlargv" => [
"no-comp",
"no-shared",
Expand Down Expand Up @@ -7937,9 +7937,6 @@ our %unified_info = (
},
"apps/lib" => {
"deps" => [
"apps/lib/openssl-bin-cmp_mock_srv.o",
"apps/lib/cmp_client_test-bin-cmp_mock_srv.o",
"apps/lib/uitest-bin-apps_ui.o",
"apps/lib/libapps-lib-app_libctx.o",
"apps/lib/libapps-lib-app_params.o",
"apps/lib/libapps-lib-app_provider.o",
Expand All @@ -7957,7 +7954,10 @@ our %unified_info = (
"apps/lib/libapps-lib-s_cb.o",
"apps/lib/libapps-lib-s_socket.o",
"apps/lib/libapps-lib-tlssrp_depr.o",
"apps/lib/libtestutil-lib-opt.o"
"apps/lib/libtestutil-lib-opt.o",
"apps/lib/openssl-bin-cmp_mock_srv.o",
"apps/lib/cmp_client_test-bin-cmp_mock_srv.o",
"apps/lib/uitest-bin-apps_ui.o"
],
"products" => {
"bin" => [
Expand Down Expand Up @@ -9632,10 +9632,10 @@ our %unified_info = (
},
"providers/fips" => {
"deps" => [
"providers/fips/fips-dso-fips_entry.o",
"providers/fips/libfips-lib-fipsprov.o",
"providers/fips/libfips-lib-self_test.o",
"providers/fips/libfips-lib-self_test_kats.o"
"providers/fips/libfips-lib-self_test_kats.o",
"providers/fips/fips-dso-fips_entry.o"
],
"products" => {
"dso" => [
Expand Down Expand Up @@ -27033,8 +27033,8 @@ unless (caller) {
use File::Copy;
use Pod::Usage;

use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl';
use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt';

my $here = dirname($0);

Expand All @@ -27061,7 +27061,7 @@ unless (caller) {
);

use lib '.';
use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
use gentemplate;

print 'Creating ',$buildfile_template,"\n";
Expand All @@ -27078,8 +27078,8 @@ unless (caller) {

my $prepend = <<'_____';
use File::Spec::Functions;
use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl';
use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
use lib '.';
use platform;
_____
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 Sep 8 06:03:11 2021 UTC"
#define DATE "built on: Mon Oct 18 06:50:42 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
5 changes: 3 additions & 2 deletions deps/openssl/config/archs/BSD-x86/no-asm/openssl-fips.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@
'./config/archs/BSD-x86/no-asm/providers/common/der/der_ecx_gen.c',
'./config/archs/BSD-x86/no-asm/providers/common/der/der_rsa_gen.c',
'./config/archs/BSD-x86/no-asm/providers/common/der/der_wrap_gen.c',
'./config/archs/BSD-x86/no-asm/providers/legacy.ld',
'./config/archs/BSD-x86/no-asm/providers/fips.ld',

],
Expand All @@ -297,7 +298,7 @@
'openssl_ex_libs_BSD-x86': [
'-pthread',
],
'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config'
'linker_script': ''
},
'include_dirs': [
'.',
Expand All @@ -309,7 +310,7 @@
'defines': ['<@(openssl_defines_BSD-x86)'],
'cflags': ['<@(openssl_cflags_BSD-x86)'],
'libraries': ['<@(openssl_ex_libs_BSD-x86)'],
'ldflags': ['-Wl,--version-script=<@(linker_script)'],

'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86)'],
'direct_dependent_settings': {
'include_dirs': ['./include', '.'],
Expand Down
2 changes: 2 additions & 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 @@ -955,6 +955,7 @@
'openssl/providers/implementations/digests/wp_prov.c',
'openssl/providers/implementations/kdfs/pbkdf1.c',
'openssl/providers/prov_running.c',
'openssl/providers/legacyprov.c',
],
'openssl_sources_BSD-x86': [
'./config/archs/BSD-x86/no-asm/providers/common/der/der_sm2_gen.c',
Expand All @@ -964,6 +965,7 @@
'./config/archs/BSD-x86/no-asm/providers/common/der/der_ecx_gen.c',
'./config/archs/BSD-x86/no-asm/providers/common/der/der_rsa_gen.c',
'./config/archs/BSD-x86/no-asm/providers/common/der/der_wrap_gen.c',
'./config/archs/BSD-x86/no-asm/providers/legacy.ld',
'./config/archs/BSD-x86/no-asm/providers/fips.ld',
],
'openssl_defines_BSD-x86': [
Expand Down
5 changes: 5 additions & 0 deletions deps/openssl/config/archs/BSD-x86/no-asm/providers/legacy.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
global:
OSSL_provider_init;
local: *;
};
Loading