diff options
author | Matt Caswell <matt@openssl.org> | 2021-02-10 12:29:36 +0000 |
---|---|---|
committer | Shane Lontis <shane.lontis@oracle.com> | 2021-02-15 14:17:36 +1000 |
commit | 0217e53e33a9561c6d911df9ec7e99195be7de62 (patch) | |
tree | 553787fd66f948ffaa08815ada8ffae5ebdcbb53 /test | |
parent | 899e25643dc63a84a924d08f86d7d19613714431 (diff) |
Fix the dhparam_check test
genpkey can sometimes create files that fail "openssl dhparam -check". See
issue #14145. We had some instances of such invalid files in the
dhparam_check test. Now that "openssl dhparam -check" has been fixed to
work the same way as it did in 1.1.1 these tests were failing. We move the
invalid files inot the "invalid" directory. A future PR will have to fix
genpkey to not generate invalid files.
We also remove a "SKIP" block that was skipping tests in a no deprecated
build unnecessarily. Nothing being tested is deprecated.
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14146)
Diffstat (limited to 'test')
-rw-r--r-- | test/recipes/20-test_dhparam_check.t | 27 | ||||
-rw-r--r-- | test/recipes/20-test_dhparam_check_data/invalid/dh5114_1_pkcs3.pem (renamed from test/recipes/20-test_dhparam_check_data/valid/dh5114_1.pem) | 0 | ||||
-rw-r--r-- | test/recipes/20-test_dhparam_check_data/invalid/dh5114_2_pkcs3.pem (renamed from test/recipes/20-test_dhparam_check_data/valid/dh5114_2.pem) | 0 | ||||
-rw-r--r-- | test/recipes/20-test_dhparam_check_data/invalid/dh5114_3_pkcs3.pem (renamed from test/recipes/20-test_dhparam_check_data/valid/dh5114_3.pem) | 0 | ||||
-rw-r--r-- | test/recipes/20-test_dhparam_check_data/invalid/dh_p1024_t1862_pkcs3.pem (renamed from test/recipes/20-test_dhparam_check_data/valid/dh_p1024_t1862.pem) | 0 | ||||
-rw-r--r-- | test/recipes/20-test_dhparam_check_data/invalid/dh_p2048_t1862_pkcs3.pem (renamed from test/recipes/20-test_dhparam_check_data/valid/dh_p2048_t1862.pem) | 0 | ||||
-rw-r--r-- | test/recipes/20-test_dhparam_check_data/invalid/dh_p2048_t1864_pkcs3.pem (renamed from test/recipes/20-test_dhparam_check_data/valid/dh_p2048_t1864.pem) | 0 | ||||
-rw-r--r-- | test/recipes/20-test_dhparam_check_data/invalid/dh_p3072_t1862_pkcs3.pem (renamed from test/recipes/20-test_dhparam_check_data/valid/dh_p3072_t1862.pem) | 0 |
8 files changed, 9 insertions, 18 deletions
diff --git a/test/recipes/20-test_dhparam_check.t b/test/recipes/20-test_dhparam_check.t index 97e1506d8a..086e9de938 100644 --- a/test/recipes/20-test_dhparam_check.t +++ b/test/recipes/20-test_dhparam_check.t @@ -28,10 +28,12 @@ TESTDIR=test/recipes/20-test_dhparam_check_data/valid rm -rf $TESTDIR mkdir -p $TESTDIR +#TODO(3.0): These 3 currently create invalid output - see issue #14145 ./util/opensslwrap.sh genpkey -genparam -algorithm DH -pkeyopt dh_rfc5114:1 -out $TESTDIR/dh5114_1.pem ./util/opensslwrap.sh genpkey -genparam -algorithm DH -pkeyopt dh_rfc5114:2 -out $TESTDIR/dh5114_2.pem ./util/opensslwrap.sh genpkey -genparam -algorithm DH -pkeyopt dh_rfc5114:3 -out $TESTDIR/dh5114_3.pem +#TODO(3.0): These 4 currently create invalid output - see issue #14145 ./util/opensslwrap.sh genpkey -genparam -algorithm DH -pkeyopt pbits:1024 -pkeyopt type:fips186_2 -out $TESTDIR/dh_p1024_t1862.pem ./util/opensslwrap.sh genpkey -genparam -algorithm DH -pkeyopt pbits:2048 -pkeyopt type:fips186_2 -out $TESTDIR/dh_p2048_t1862.pem ./util/opensslwrap.sh genpkey -genparam -algorithm DH -pkeyopt pbits:2048 -pkeyopt type:fips186_4 -out $TESTDIR/dh_p2048_t1864.pem @@ -57,28 +59,17 @@ mkdir -p $TESTDIR =cut my @valid = glob(data_file("valid", "*.pem")); -#my @invalid = glob(data_file("invalid", "*.pem")); +my @invalid = glob(data_file("invalid", "*.pem")); -my $num_tests = scalar @valid;# + scalar @invalid; +my $num_tests = scalar @valid + scalar @invalid; plan tests => 2 * $num_tests; - SKIP: { - skip "Skipping DH tests", $num_tests - if disabled('deprecated-3.0'); - - foreach (@valid) { - ok(run(app([qw{openssl dhparam -noout -check -in}, $_]))); - } - -# foreach (@invalid) { -# ok(!run(app([qw{openssl dhparam -noout -check -in}, $_]))); -# } -} - foreach (@valid) { + ok(run(app([qw{openssl dhparam -noout -check -in}, $_]))); ok(run(app([qw{openssl pkeyparam -noout -check -in}, $_]))); } -#foreach (@invalid) { -# ok(!run(app([qw{openssl pkeyparam -noout -check -in}, $_]))); -#} +foreach (@invalid) { + ok(!run(app([qw{openssl dhparam -noout -check -in}, $_]))); + ok(!run(app([qw{openssl pkeyparam -noout -check -in}, $_]))); +} diff --git a/test/recipes/20-test_dhparam_check_data/valid/dh5114_1.pem b/test/recipes/20-test_dhparam_check_data/invalid/dh5114_1_pkcs3.pem index abc5225db8..abc5225db8 100644 --- a/test/recipes/20-test_dhparam_check_data/valid/dh5114_1.pem +++ b/test/recipes/20-test_dhparam_check_data/invalid/dh5114_1_pkcs3.pem diff --git a/test/recipes/20-test_dhparam_check_data/valid/dh5114_2.pem b/test/recipes/20-test_dhparam_check_data/invalid/dh5114_2_pkcs3.pem index d1fadc1a90..d1fadc1a90 100644 --- a/test/recipes/20-test_dhparam_check_data/valid/dh5114_2.pem +++ b/test/recipes/20-test_dhparam_check_data/invalid/dh5114_2_pkcs3.pem diff --git a/test/recipes/20-test_dhparam_check_data/valid/dh5114_3.pem b/test/recipes/20-test_dhparam_check_data/invalid/dh5114_3_pkcs3.pem index 514f7a9bcd..514f7a9bcd 100644 --- a/test/recipes/20-test_dhparam_check_data/valid/dh5114_3.pem +++ b/test/recipes/20-test_dhparam_check_data/invalid/dh5114_3_pkcs3.pem diff --git a/test/recipes/20-test_dhparam_check_data/valid/dh_p1024_t1862.pem b/test/recipes/20-test_dhparam_check_data/invalid/dh_p1024_t1862_pkcs3.pem index 2104af26e4..2104af26e4 100644 --- a/test/recipes/20-test_dhparam_check_data/valid/dh_p1024_t1862.pem +++ b/test/recipes/20-test_dhparam_check_data/invalid/dh_p1024_t1862_pkcs3.pem diff --git a/test/recipes/20-test_dhparam_check_data/valid/dh_p2048_t1862.pem b/test/recipes/20-test_dhparam_check_data/invalid/dh_p2048_t1862_pkcs3.pem index c8a9b6bbee..c8a9b6bbee 100644 --- a/test/recipes/20-test_dhparam_check_data/valid/dh_p2048_t1862.pem +++ b/test/recipes/20-test_dhparam_check_data/invalid/dh_p2048_t1862_pkcs3.pem diff --git a/test/recipes/20-test_dhparam_check_data/valid/dh_p2048_t1864.pem b/test/recipes/20-test_dhparam_check_data/invalid/dh_p2048_t1864_pkcs3.pem index 98940db55f..98940db55f 100644 --- a/test/recipes/20-test_dhparam_check_data/valid/dh_p2048_t1864.pem +++ b/test/recipes/20-test_dhparam_check_data/invalid/dh_p2048_t1864_pkcs3.pem diff --git a/test/recipes/20-test_dhparam_check_data/valid/dh_p3072_t1862.pem b/test/recipes/20-test_dhparam_check_data/invalid/dh_p3072_t1862_pkcs3.pem index 3aec9ff44d..3aec9ff44d 100644 --- a/test/recipes/20-test_dhparam_check_data/valid/dh_p3072_t1862.pem +++ b/test/recipes/20-test_dhparam_check_data/invalid/dh_p3072_t1862_pkcs3.pem |