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
=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}, $_])));
+}