From: Neil Horman Date: Thu, 11 Sep 2025 20:09:56 +0000 (-0400) Subject: remove dasync engine test from test_rand X-Git-Url: https://git.feebdaed.xyz/?a=commitdiff_plain;h=9b2b31102998f9006a8bd7e31a82500542758eab;p=0xmirror%2Fopenssl.git remove dasync engine test from test_rand We're removing the engine, so we don't need to test this anymore. NOTE: This also removes the engine skip check from the test, and this breaks testing until such time as PR #28461 is merged (which replaces the remaining engine test with a provider). Reviewed-by: Richard Levitte Reviewed-by: Tomas Mraz Reviewed-by: Saša Nedvědický Reviewed-by: Eugene Syromiatnikov Reviewed-by: Matt Caswell Reviewed-by: Norbert Pocs (Merged from https://github.com/openssl/openssl/pull/29305) --- diff --git a/test/recipes/05-test_rand.t b/test/recipes/05-test_rand.t index 3a1bac8726..73a163d4d1 100644 --- a/test/recipes/05-test_rand.t +++ b/test/recipes/05-test_rand.t @@ -13,7 +13,7 @@ use OpenSSL::Test::Utils; use OpenSSL::Test qw/:DEFAULT srctop_file bldtop_dir/; use Cwd qw(abs_path); -plan tests => 6; +plan tests => 5; setup("test_rand"); ok(run(test(["rand_test", srctop_file("test", "default.cnf")]))); @@ -28,16 +28,16 @@ ok(run(test(["drbgtest"]))); ok(run(test(["rand_status_test"]))); SKIP: { - skip "engine is not supported by this OpenSSL build", 2 - if disabled("engine") || disabled("dynamic-engine"); - my $success; my @randdata; my $expected = '0102030405060708090a0b0c0d0e0f10'; $ENV{OPENSSL_MODULES} = abs_path(bldtop_dir("test")); - @randdata = run(app(['openssl', 'rand', '-provider', 'p_ossltest', '-provider', 'default', '-propquery', '?provider=p_ossltest', '-hex', '16' ]), - capture => 1, statusvar => \$success); + skip "provider modules are not supported by this OpenSSL build", 1 + if disabled("module"); + + @randdata = run(app(['openssl', 'rand', '-provider', 'p_ossltest', '-provider', 'default', '-propquery', '?provider=p_ossltest', '-hex', '16' ]), capture => 1, statusvar => \$success); + chomp(@randdata); ok($success && $randdata[0] eq $expected, "rand with ossltest provider: Check rand output is as expected"); @@ -45,10 +45,4 @@ SKIP: { @randdata = run(app(['openssl', 'rand', '-hex', '2K' ]), capture => 1, statusvar => \$success); chomp(@randdata); - - @randdata = run(app(['openssl', 'rand', '-engine', 'dasync', '-hex', '16' ]), - capture => 1, statusvar => \$success); - chomp(@randdata); - ok($success && length($randdata[0]) == 32, - "rand with dasync: Check rand output is of expected length"); }