The branch master has been updated
via 5e26c3399d154b9ed29558129ca1916a1b5b095e (commit)
via e6a2596cdcb0137e268517f4ce01254b3cba8017 (commit)
from 53c4992e0b1c79bdf5904b84e77ca7d362cc4af0 (commit)
- Log -----------------------------------------------------------------
commit 5e26c3399d154b9ed29558129ca1916a1b5b095e
Author: Dr. David von Oheimb <david.von.ohe...@siemens.com>
Date: Mon Sep 28 10:57:00 2020 +0200
30-test_evp.t: On no-dh, no-dsa, no-ec, no-sm2, and no-gost configurations
disable respective tests
Reviewed-by: Paul Dale <paul.d...@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13022)
commit e6a2596cdcb0137e268517f4ce01254b3cba8017
Author: Dr. David von Oheimb <david.von.ohe...@siemens.com>
Date: Mon Sep 28 14:16:30 2020 +0200
appveyor.yml: Clean up minimal configuration, adding no-ec and pruning
cascaded no-*
Reviewed-by: Paul Dale <paul.d...@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13022)
-----------------------------------------------------------------------
Summary of changes:
appveyor.yml | 2 +-
test/recipes/30-test_evp.t | 25 ++++++++++++++++---------
2 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/appveyor.yml b/appveyor.yml
index ccca8bb22c..3ac6d12e26 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -34,7 +34,7 @@ before_build:
If ($env:Configuration -Match "shared") {
$env:SHARED="no-makedepend"
} ElseIf ($env:Configuration -Match "minimal") {
- $env:SHARED="no-shared no-dso no-makedepend no-aria no-async
no-autoload-config no-blake2 no-bf no-camellia no-cast no-chacha no-cmac no-cms
no-cmp no-comp no-ct no-des no-dgram no-dh no-dsa no-dtls no-ec2m no-engine
no-filenames no-gost no-idea no-ktls no-mdc2 no-md4 no-multiblock
no-nextprotoneg no-ocsp no-ocb no-poly1305 no-psk no-rc2 no-rc4 no-rmd160
no-seed no-siphash no-siv no-sm2 no-sm3 no-sm4 no-srp no-srtp no-ssl3
no-ssl3-method no-ts no-ui-console no-whirlpool no-asm
-DOPENSSL_SMALL_FOOTPRINT"
+ $env:SHARED="no-shared no-dso no-makedepend no-aria no-async
no-autoload-config no-blake2 no-bf no-camellia no-cast no-chacha no-cmac no-cms
no-cmp no-comp no-ct no-des no-dgram no-dh no-dsa no-ec no-ec2m no-engine
no-filenames no-idea no-ktls no-md4 no-multiblock no-nextprotoneg no-ocsp
no-ocb no-poly1305 no-psk no-rc2 no-rc4 no-rmd160 no-seed no-siphash no-siv
no-sm3 no-sm4 no-srp no-srtp no-ssl3-method no-ts no-ui-console no-whirlpool
no-asm -DOPENSSL_SMALL_FOOTPRINT"
} Else {
$env:SHARED="no-shared no-makedepend"
}
diff --git a/test/recipes/30-test_evp.t b/test/recipes/30-test_evp.t
index 4d9e9fd372..17e2d17007 100644
--- a/test/recipes/30-test_evp.t
+++ b/test/recipes/30-test_evp.t
@@ -23,6 +23,11 @@ use platform;
my $no_fips = disabled('fips') || ($ENV{NO_FIPS} // 0);
my $no_legacy = disabled('legacy') || ($ENV{NO_LEGACY} // 0);
+my $no_dh = disabled("dh");
+my $no_dsa = disabled("dsa");
+my $no_ec = disabled("ec");
+my $no_gost = disabled("gost");
+my $no_sm2 = disabled("sm2");
# Default config depends on if the legacy module is built or not
my $defaultcnf = $no_legacy ? 'default.cnf' : 'default-and-legacy.cnf';
@@ -46,18 +51,20 @@ my @files = qw(
evpmac_common.txt
evpmd_sha.txt
evppbe_pbkdf2.txt
- evppkey_dsa.txt
+ evppkey_kdf_hkdf.txt
+ evppkey_rsa_common.txt
+ evprand.txt
+ );
+push @files, qw(evppkey_ffdhe.txt) unless $no_dh;
+push @files, qw(evppkey_dsa.txt) unless $no_dsa;
+push @files, qw(evppkey_ecx.txt) unless $no_ec;
+push @files, qw(
evppkey_ecc.txt
evppkey_ecdh.txt
evppkey_ecdsa.txt
- evppkey_ecx.txt
- evppkey_ffdhe.txt
evppkey_kas.txt
- evppkey_kdf_hkdf.txt
evppkey_mismatch.txt
- evppkey_rsa_common.txt
- evprand.txt
- );
+ ) unless $no_ec || $no_gost;
# A list of tests that only run with the default provider
# (i.e. The algorithms are not present in the fips provider)
@@ -93,12 +100,12 @@ my @defltfiles = qw(
evpmd_whirlpool.txt
evppbe_scrypt.txt
evppbe_pkcs12.txt
- evppkey_brainpool.txt
evppkey_kdf_scrypt.txt
evppkey_kdf_tls1_prf.txt
evppkey_rsa.txt
- evppkey_sm2.txt
);
+push @defltfiles, qw(evppkey_brainpool.txt) unless $no_ec;
+push @defltfiles, qw(evppkey_sm2.txt) unless $no_sm2;
plan tests =>
($no_fips ? 0 : 1) # FIPS install test
