[openssl] openssl-3.0 update
bernd.edlinger at hotmail.de
bernd.edlinger at hotmail.de
Tue Nov 23 05:10:51 UTC 2021
The branch openssl-3.0 has been updated
via 38e2957249c90317a26a080c7e7eb186dd5b6598 (commit)
from 81c11349c2a0e945aa3dfc6bd81c957363dd2011 (commit)
- Log -----------------------------------------------------------------
commit 38e2957249c90317a26a080c7e7eb186dd5b6598
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date: Fri Nov 19 16:38:55 2021 +0100
Add a test case for duplicate engine loading
Reviewed-by: Tomas Mraz <tomas at openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit at gmail.com>
(Merged from https://github.com/openssl/openssl/pull/17073)
(cherry picked from commit 2595eef82c2b67ea75cc3368529078b643a1ecb6)
-----------------------------------------------------------------------
Summary of changes:
test/recipes/20-test_dgst.t | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/test/recipes/20-test_dgst.t b/test/recipes/20-test_dgst.t
index 5af74aec2a..e72038d852 100644
--- a/test/recipes/20-test_dgst.t
+++ b/test/recipes/20-test_dgst.t
@@ -12,12 +12,12 @@ use warnings;
use File::Spec;
use File::Basename;
-use OpenSSL::Test qw/:DEFAULT with srctop_file/;
+use OpenSSL::Test qw/:DEFAULT with srctop_file bldtop_file/;
use OpenSSL::Test::Utils;
setup("test_dgst");
-plan tests => 9;
+plan tests => 10;
sub tsignverify {
my $testtext = shift;
@@ -103,6 +103,25 @@ SKIP: {
};
}
+SKIP: {
+ skip "dgst with engine is not supported by this OpenSSL build", 1
+ if disabled("engine") || disabled("dynamic-engine");
+
+ subtest "SHA1 generation by engine with `dgst` CLI" => sub {
+ plan tests => 1;
+
+ 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",
+ $testdata]), capture => 1);
+ chomp(@macdata);
+ my $expected = qr/SHA1\(\Q$testdata\E\)= 000102030405060708090a0b0c0d0e0f10111213/;
+ ok($macdata[0] =~ $expected, "SHA1: Check HASH value is as expected ($macdata[0]) vs ($expected)");
+ }
+}
+
subtest "HMAC generation with `dgst` CLI" => sub {
plan tests => 2;
More information about the openssl-commits
mailing list