From abdb2278d2b65ae87bee3121be83322e4219b396 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 10 Mar 2022 13:29:25 +0100 Subject: [PATCH] Make ossltest engine use in test/recipes/20-test_dgst.t platform agnostic Reviewed-by: Paul Dale Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/17861) --- test/recipes/20-test_dgst.t | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/recipes/20-test_dgst.t b/test/recipes/20-test_dgst.t index e72038d852..ff067155c4 100644 --- a/test/recipes/20-test_dgst.t +++ b/test/recipes/20-test_dgst.t @@ -12,7 +12,7 @@ use warnings; use File::Spec; use File::Basename; -use OpenSSL::Test qw/:DEFAULT with srctop_file bldtop_file/; +use OpenSSL::Test qw/:DEFAULT with srctop_file bldtop_dir/; use OpenSSL::Test::Utils; setup("test_dgst"); @@ -113,8 +113,8 @@ SKIP: { my $testdata = srctop_file('test', 'data.bin'); # intentionally using -engine twice, please do not remove the duplicate line my @macdata = run(app(['openssl', 'dgst', '-sha1', - '-engine', $^O eq 'linux' ? bldtop_file("engines", "ossltest.so") : "ossltest", - '-engine', $^O eq 'linux' ? bldtop_file("engines", "ossltest.so") : "ossltest", + '-engine', "ossltest", + '-engine', "ossltest", $testdata]), capture => 1); chomp(@macdata); my $expected = qr/SHA1\(\Q$testdata\E\)= 000102030405060708090a0b0c0d0e0f10111213/;