summaryrefslogtreecommitdiffstats
path: root/test/recipes/20-test_pkeyutl.t
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2020-08-05 10:28:51 +0200
committerRichard Levitte <levitte@openssl.org>2020-09-03 17:48:32 +0200
commita10847c427744fb7e7d29953dee130a52251c027 (patch)
treea009c19372810a87154460cbbebe6e106dcf88c4 /test/recipes/20-test_pkeyutl.t
parentb5275648843ace1a441521823913ccbbebb8769c (diff)
"Downgrade" provider-native keys to legacy where needed
Some sub-systems and openssl sub-commands do not yet deal cleanly with purely provider-native EVP_PKEYs. We compensate that by "downgrading" keys in select places, or ensure that the 'file:' scheme ENGINE loader is activated. Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12587)
Diffstat (limited to 'test/recipes/20-test_pkeyutl.t')
-rw-r--r--test/recipes/20-test_pkeyutl.t11
1 files changed, 9 insertions, 2 deletions
diff --git a/test/recipes/20-test_pkeyutl.t b/test/recipes/20-test_pkeyutl.t
index 543038cab9..3c135630f7 100644
--- a/test/recipes/20-test_pkeyutl.t
+++ b/test/recipes/20-test_pkeyutl.t
@@ -24,14 +24,21 @@ SKIP: {
skip "Skipping tests that require EC, SM2 or SM3", 2
if disabled("ec") || disabled("sm2") || disabled("sm3");
+ # TODO(3.0) Remove this when we have a SM2 keymgmt and decoder
+ my @tmp_sm2_hack = qw(-engine loader_attic)
+ unless disabled('dynamic-engine') || disabled('deprecated-3.0');
+ skip "Skipping tests that require dynamic enginess (temporary meaasure)", 2
+ unless @tmp_sm2_hack;
+
# SM2
- ok_nofips(run(app(([ 'openssl', 'pkeyutl', '-sign',
+ ok_nofips(run(app(([ 'openssl', 'pkeyutl', @tmp_sm2_hack, '-sign',
'-in', srctop_file('test', 'certs', 'sm2.pem'),
'-inkey', srctop_file('test', 'certs', 'sm2.key'),
'-out', 'sm2.sig', '-rawin',
'-digest', 'sm3', '-pkeyopt', 'distid:someid']))),
"Sign a piece of data using SM2");
- ok_nofips(run(app(([ 'openssl', 'pkeyutl', '-verify', '-certin',
+ ok_nofips(run(app(([ 'openssl', 'pkeyutl', @tmp_sm2_hack,
+ '-verify', '-certin',
'-in', srctop_file('test', 'certs', 'sm2.pem'),
'-inkey', srctop_file('test', 'certs', 'sm2.pem'),
'-sigfile', 'sm2.sig', '-rawin',