diff options
author | Tomas Mraz <tomas@openssl.org> | 2021-01-22 15:52:07 +0100 |
---|---|---|
committer | Tomas Mraz <tomas@openssl.org> | 2021-01-26 15:26:49 +0100 |
commit | 7b0f64b121860be91506906a2dc024e352b3d216 (patch) | |
tree | 116d6a97aa7dc1a961ebd7be9c4ec4cb441a3f30 /test | |
parent | 82a46200911f2bb1af00b6921c0db9738825aa76 (diff) |
Check that the ecparam and pkeyparam do not mangle the parameters
Just comparison of the original parameter file with the -out output.
Some test files have non-canonical encoding, so they are moved
to a different directory.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13139)
Diffstat (limited to 'test')
-rw-r--r-- | test/recipes/15-test_ecparam.t | 98 | ||||
-rw-r--r-- | test/recipes/15-test_ecparam_data/noncanon/c2pnb163v1-explicit.pem (renamed from test/recipes/15-test_ecparam_data/valid/c2pnb163v1-explicit.pem) | 0 | ||||
-rw-r--r-- | test/recipes/15-test_ecparam_data/noncanon/c2pnb208w1-explicit.pem (renamed from test/recipes/15-test_ecparam_data/valid/c2pnb208w1-explicit.pem) | 0 | ||||
-rw-r--r-- | test/recipes/15-test_ecparam_data/noncanon/secp160k1-explicit.pem (renamed from test/recipes/15-test_ecparam_data/valid/secp160k1-explicit.pem) | 0 | ||||
-rw-r--r-- | test/recipes/15-test_ecparam_data/noncanon/secp192k1-explicit.pem (renamed from test/recipes/15-test_ecparam_data/valid/secp192k1-explicit.pem) | 0 | ||||
-rw-r--r-- | test/recipes/15-test_ecparam_data/noncanon/secp224k1-explicit.pem (renamed from test/recipes/15-test_ecparam_data/valid/secp224k1-explicit.pem) | 0 | ||||
-rw-r--r-- | test/recipes/15-test_ecparam_data/noncanon/secp256k1-explicit.pem (renamed from test/recipes/15-test_ecparam_data/valid/secp256k1-explicit.pem) | 0 | ||||
-rw-r--r-- | test/recipes/15-test_ecparam_data/noncanon/secp521r1-explicit.pem (renamed from test/recipes/15-test_ecparam_data/valid/secp521r1-explicit.pem) | 0 | ||||
-rw-r--r-- | test/recipes/15-test_ecparam_data/noncanon/sect113r1-explicit.pem (renamed from test/recipes/15-test_ecparam_data/valid/sect113r1-explicit.pem) | 0 | ||||
-rw-r--r-- | test/recipes/15-test_ecparam_data/noncanon/sect113r2-explicit.pem (renamed from test/recipes/15-test_ecparam_data/valid/sect113r2-explicit.pem) | 0 | ||||
-rw-r--r-- | test/recipes/15-test_ecparam_data/noncanon/sect163k1-explicit.pem (renamed from test/recipes/15-test_ecparam_data/valid/sect163k1-explicit.pem) | 0 | ||||
-rw-r--r-- | test/recipes/15-test_ecparam_data/noncanon/sect163r2-explicit.pem (renamed from test/recipes/15-test_ecparam_data/valid/sect163r2-explicit.pem) | 0 | ||||
-rw-r--r-- | test/recipes/15-test_ecparam_data/noncanon/sect193r1-explicit.pem (renamed from test/recipes/15-test_ecparam_data/valid/sect193r1-explicit.pem) | 0 | ||||
-rw-r--r-- | test/recipes/15-test_ecparam_data/noncanon/sect193r2-explicit.pem (renamed from test/recipes/15-test_ecparam_data/valid/sect193r2-explicit.pem) | 0 | ||||
-rw-r--r-- | test/recipes/15-test_ecparam_data/noncanon/sect233k1-explicit.pem (renamed from test/recipes/15-test_ecparam_data/valid/sect233k1-explicit.pem) | 0 | ||||
-rw-r--r-- | test/recipes/15-test_ecparam_data/noncanon/sect233r1-explicit.pem (renamed from test/recipes/15-test_ecparam_data/valid/sect233r1-explicit.pem) | 0 | ||||
-rw-r--r-- | test/recipes/15-test_ecparam_data/noncanon/sect239k1-explicit.pem (renamed from test/recipes/15-test_ecparam_data/valid/sect239k1-explicit.pem) | 0 | ||||
-rw-r--r-- | test/recipes/15-test_ecparam_data/noncanon/sect283k1-explicit.pem (renamed from test/recipes/15-test_ecparam_data/valid/sect283k1-explicit.pem) | 0 | ||||
-rw-r--r-- | test/recipes/15-test_ecparam_data/noncanon/sect283r1-explicit.pem (renamed from test/recipes/15-test_ecparam_data/valid/sect283r1-explicit.pem) | 0 | ||||
-rw-r--r-- | test/recipes/15-test_ecparam_data/noncanon/sect409k1-explicit.pem (renamed from test/recipes/15-test_ecparam_data/valid/sect409k1-explicit.pem) | 0 | ||||
-rw-r--r-- | test/recipes/15-test_ecparam_data/noncanon/sect409r1-explicit.pem (renamed from test/recipes/15-test_ecparam_data/valid/sect409r1-explicit.pem) | 0 | ||||
-rw-r--r-- | test/recipes/15-test_ecparam_data/noncanon/sect571k1-explicit.pem (renamed from test/recipes/15-test_ecparam_data/valid/sect571k1-explicit.pem) | 0 | ||||
-rw-r--r-- | test/recipes/15-test_ecparam_data/noncanon/sect571r1-explicit.pem (renamed from test/recipes/15-test_ecparam_data/valid/sect571r1-explicit.pem) | 0 | ||||
-rw-r--r-- | test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls1-explicit.pem (renamed from test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls1-explicit.pem) | 0 | ||||
-rw-r--r-- | test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls10-explicit.pem (renamed from test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls10-explicit.pem) | 0 | ||||
-rw-r--r-- | test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls11-explicit.pem (renamed from test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls11-explicit.pem) | 0 | ||||
-rw-r--r-- | test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls3-explicit.pem (renamed from test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls3-explicit.pem) | 0 | ||||
-rw-r--r-- | test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls4-explicit.pem (renamed from test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls4-explicit.pem) | 0 | ||||
-rw-r--r-- | test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls5-explicit.pem (renamed from test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls5-explicit.pem) | 0 | ||||
-rw-r--r-- | test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls8-explicit.pem (renamed from test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls8-explicit.pem) | 0 | ||||
-rw-r--r-- | test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls9-explicit.pem (renamed from test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls9-explicit.pem) | 0 |
31 files changed, 76 insertions, 22 deletions
diff --git a/test/recipes/15-test_ecparam.t b/test/recipes/15-test_ecparam.t index 4294a00ef2..93b2aa4a21 100644 --- a/test/recipes/15-test_ecparam.t +++ b/test/recipes/15-test_ecparam.t @@ -11,46 +11,100 @@ use strict; use warnings; use File::Spec; +use File::Compare qw/compare_text/; use OpenSSL::Glob; use OpenSSL::Test qw/:DEFAULT data_file/; use OpenSSL::Test::Utils; setup("test_ecparam"); -plan skip_all => "EC isn't supported in this build" +plan skip_all => "EC or EC2M isn't supported in this build" if disabled("ec") || disabled("ec2m"); my @valid = glob(data_file("valid", "*.pem")); +my @noncanon = glob(data_file("noncanon", "*.pem")); my @invalid = glob(data_file("invalid", "*.pem")); -my $num_tests = scalar @valid + scalar @invalid; -plan tests => 3 * $num_tests; +plan tests => 11; - SKIP: { - skip "Skipping EC tests", 2 * $num_tests - if disabled('deprecated-3.0'); +sub checkload { + my $files = shift; # List of files + my $valid = shift; # Check should pass or fail? + my $app = shift; # Which application + my $opt = shift; # Additional option - foreach (@valid) { - ok(run(app([qw{openssl ecparam -noout -check -in}, $_]))); + foreach (@$files) { + if ($valid) { + ok(run(app(['openssl', $app, '-noout', $opt, '-in', $_]))); + } else { + ok(!run(app(['openssl', $app, '-noout', $opt, '-in', $_]))); + } } +} - foreach (@valid) { - ok(run(app([qw{openssl ecparam -noout -check_named -in}, $_]))); - } +sub checkcompare { + my $files = shift; # List of files + my $app = shift; # Which application - foreach (@invalid) { - ok(!run(app([qw{openssl ecparam -noout -check -in}, $_]))); - } + foreach (@$files) { + my $testout = "$app.tst"; - foreach (@invalid) { - ok(!run(app([qw{openssl ecparam -noout -check_named -in}, $_]))); + ok(run(app(['openssl', $app, '-out', $testout, '-in', $_]))); + ok(!compare_text($_, $testout), "Original file $_ is the same as new one"); } } -foreach (@valid) { - ok(run(app([qw{openssl pkeyparam -noout -check -in}, $_]))); -} +subtest "Check loading valid parameters by ecparam with -check" => sub { + plan tests => scalar(@valid); + checkload(\@valid, 1, "ecparam", "-check"); +}; -foreach (@invalid) { - ok(!run(app([qw{openssl pkeyparam -noout -check -in}, $_]))); -} +subtest "Check loading valid parameters by ecparam with -check_named" => sub { + plan tests => scalar(@valid); + checkload(\@valid, 1, "ecparam", "-check_named"); +}; + +subtest "Check loading valid parameters by pkeyparam with -check" => sub { + plan tests => scalar(@valid); + checkload(\@valid, 1, "pkeyparam", "-check"); +}; + +subtest "Check loading non-canonically encoded parameters by ecparam with -check" => sub { + plan tests => scalar(@noncanon); + checkload(\@noncanon, 1, "ecparam", "-check"); +}; + +subtest "Check loading non-canonically encoded parameters by ecparam with -check_named" => sub { + plan tests => scalar(@noncanon); + checkload(\@noncanon, 1, "ecparam", "-check_named"); +}; + +subtest "Check loading non-canonically encoded parameters by pkeyparam with -check" => sub { + plan tests => scalar(@noncanon); + checkload(\@noncanon, 1, "pkeyparam", "-check"); +}; + +subtest "Check loading invalid parameters by ecparam with -check" => sub { + plan tests => scalar(@invalid); + checkload(\@invalid, 0, "ecparam", "-check"); +}; + +subtest "Check loading invalid parameters by ecparam with -check_named" => sub { + plan tests => scalar(@invalid); + checkload(\@invalid, 0, "ecparam", "-check_named"); +}; + +subtest "Check loading invalid parameters by pkeyparam with -check" => sub { + plan tests => scalar(@invalid); + checkload(\@invalid, 0, "pkeyparam", "-check"); +}; + +subtest "Check ecparam does not change the parameter file on output" => sub { + plan tests => 2 * scalar(@valid); + checkcompare(\@valid, "ecparam"); +}; + +subtest "Check pkeyparam does not change the parameter file on output" => sub { + plan tests => 2 * scalar(@valid); + checkcompare(\@valid, "pkeyparam"); +}; diff --git a/test/recipes/15-test_ecparam_data/valid/c2pnb163v1-explicit.pem b/test/recipes/15-test_ecparam_data/noncanon/c2pnb163v1-explicit.pem index d7bc1c2cab..d7bc1c2cab 100644 --- a/test/recipes/15-test_ecparam_data/valid/c2pnb163v1-explicit.pem +++ b/test/recipes/15-test_ecparam_data/noncanon/c2pnb163v1-explicit.pem diff --git a/test/recipes/15-test_ecparam_data/valid/c2pnb208w1-explicit.pem b/test/recipes/15-test_ecparam_data/noncanon/c2pnb208w1-explicit.pem index 88772e6209..88772e6209 100644 --- a/test/recipes/15-test_ecparam_data/valid/c2pnb208w1-explicit.pem +++ b/test/recipes/15-test_ecparam_data/noncanon/c2pnb208w1-explicit.pem diff --git a/test/recipes/15-test_ecparam_data/valid/secp160k1-explicit.pem b/test/recipes/15-test_ecparam_data/noncanon/secp160k1-explicit.pem index de0464ce18..de0464ce18 100644 --- a/test/recipes/15-test_ecparam_data/valid/secp160k1-explicit.pem +++ b/test/recipes/15-test_ecparam_data/noncanon/secp160k1-explicit.pem diff --git a/test/recipes/15-test_ecparam_data/valid/secp192k1-explicit.pem b/test/recipes/15-test_ecparam_data/noncanon/secp192k1-explicit.pem index 0b58fcf3b0..0b58fcf3b0 100644 --- a/test/recipes/15-test_ecparam_data/valid/secp192k1-explicit.pem +++ b/test/recipes/15-test_ecparam_data/noncanon/secp192k1-explicit.pem diff --git a/test/recipes/15-test_ecparam_data/valid/secp224k1-explicit.pem b/test/recipes/15-test_ecparam_data/noncanon/secp224k1-explicit.pem index 76ac8ed02f..76ac8ed02f 100644 --- a/test/recipes/15-test_ecparam_data/valid/secp224k1-explicit.pem +++ b/test/recipes/15-test_ecparam_data/noncanon/secp224k1-explicit.pem diff --git a/test/recipes/15-test_ecparam_data/valid/secp256k1-explicit.pem b/test/recipes/15-test_ecparam_data/noncanon/secp256k1-explicit.pem index 72f7f06ad3..72f7f06ad3 100644 --- a/test/recipes/15-test_ecparam_data/valid/secp256k1-explicit.pem +++ b/test/recipes/15-test_ecparam_data/noncanon/secp256k1-explicit.pem diff --git a/test/recipes/15-test_ecparam_data/valid/secp521r1-explicit.pem b/test/recipes/15-test_ecparam_data/noncanon/secp521r1-explicit.pem index f92a1211b9..f92a1211b9 100644 --- a/test/recipes/15-test_ecparam_data/valid/secp521r1-explicit.pem +++ b/test/recipes/15-test_ecparam_data/noncanon/secp521r1-explicit.pem diff --git a/test/recipes/15-test_ecparam_data/valid/sect113r1-explicit.pem b/test/recipes/15-test_ecparam_data/noncanon/sect113r1-explicit.pem index 2cd45a8c4f..2cd45a8c4f 100644 --- a/test/recipes/15-test_ecparam_data/valid/sect113r1-explicit.pem +++ b/test/recipes/15-test_ecparam_data/noncanon/sect113r1-explicit.pem diff --git a/test/recipes/15-test_ecparam_data/valid/sect113r2-explicit.pem b/test/recipes/15-test_ecparam_data/noncanon/sect113r2-explicit.pem index 4fca872b48..4fca872b48 100644 --- a/test/recipes/15-test_ecparam_data/valid/sect113r2-explicit.pem +++ b/test/recipes/15-test_ecparam_data/noncanon/sect113r2-explicit.pem diff --git a/test/recipes/15-test_ecparam_data/valid/sect163k1-explicit.pem b/test/recipes/15-test_ecparam_data/noncanon/sect163k1-explicit.pem index 3438927e61..3438927e61 100644 --- a/test/recipes/15-test_ecparam_data/valid/sect163k1-explicit.pem +++ b/test/recipes/15-test_ecparam_data/noncanon/sect163k1-explicit.pem diff --git a/test/recipes/15-test_ecparam_data/valid/sect163r2-explicit.pem b/test/recipes/15-test_ecparam_data/noncanon/sect163r2-explicit.pem index 817155013b..817155013b 100644 --- a/test/recipes/15-test_ecparam_data/valid/sect163r2-explicit.pem +++ b/test/recipes/15-test_ecparam_data/noncanon/sect163r2-explicit.pem diff --git a/test/recipes/15-test_ecparam_data/valid/sect193r1-explicit.pem b/test/recipes/15-test_ecparam_data/noncanon/sect193r1-explicit.pem index 93d166dc34..93d166dc34 100644 --- a/test/recipes/15-test_ecparam_data/valid/sect193r1-explicit.pem +++ b/test/recipes/15-test_ecparam_data/noncanon/sect193r1-explicit.pem diff --git a/test/recipes/15-test_ecparam_data/valid/sect193r2-explicit.pem b/test/recipes/15-test_ecparam_data/noncanon/sect193r2-explicit.pem index 3e96cc77bf..3e96cc77bf 100644 --- a/test/recipes/15-test_ecparam_data/valid/sect193r2-explicit.pem +++ b/test/recipes/15-test_ecparam_data/noncanon/sect193r2-explicit.pem diff --git a/test/recipes/15-test_ecparam_data/valid/sect233k1-explicit.pem b/test/recipes/15-test_ecparam_data/noncanon/sect233k1-explicit.pem index d318fcb8c0..d318fcb8c0 100644 --- a/test/recipes/15-test_ecparam_data/valid/sect233k1-explicit.pem +++ b/test/recipes/15-test_ecparam_data/noncanon/sect233k1-explicit.pem diff --git a/test/recipes/15-test_ecparam_data/valid/sect233r1-explicit.pem b/test/recipes/15-test_ecparam_data/noncanon/sect233r1-explicit.pem index c6da580866..c6da580866 100644 --- a/test/recipes/15-test_ecparam_data/valid/sect233r1-explicit.pem +++ b/test/recipes/15-test_ecparam_data/noncanon/sect233r1-explicit.pem diff --git a/test/recipes/15-test_ecparam_data/valid/sect239k1-explicit.pem b/test/recipes/15-test_ecparam_data/noncanon/sect239k1-explicit.pem index 8e23a4c87e..8e23a4c87e 100644 --- a/test/recipes/15-test_ecparam_data/valid/sect239k1-explicit.pem +++ b/test/recipes/15-test_ecparam_data/noncanon/sect239k1-explicit.pem diff --git a/test/recipes/15-test_ecparam_data/valid/sect283k1-explicit.pem b/test/recipes/15-test_ecparam_data/noncanon/sect283k1-explicit.pem index 5ebcb8620d..5ebcb8620d 100644 --- a/test/recipes/15-test_ecparam_data/valid/sect283k1-explicit.pem +++ b/test/recipes/15-test_ecparam_data/noncanon/sect283k1-explicit.pem diff --git a/test/recipes/15-test_ecparam_data/valid/sect283r1-explicit.pem b/test/recipes/15-test_ecparam_data/noncanon/sect283r1-explicit.pem index f1fffd5c12..f1fffd5c12 100644 --- a/test/recipes/15-test_ecparam_data/valid/sect283r1-explicit.pem +++ b/test/recipes/15-test_ecparam_data/noncanon/sect283r1-explicit.pem diff --git a/test/recipes/15-test_ecparam_data/valid/sect409k1-explicit.pem b/test/recipes/15-test_ecparam_data/noncanon/sect409k1-explicit.pem index e781a6e87e..e781a6e87e 100644 --- a/test/recipes/15-test_ecparam_data/valid/sect409k1-explicit.pem +++ b/test/recipes/15-test_ecparam_data/noncanon/sect409k1-explicit.pem diff --git a/test/recipes/15-test_ecparam_data/valid/sect409r1-explicit.pem b/test/recipes/15-test_ecparam_data/noncanon/sect409r1-explicit.pem index 937ce1bd4c..937ce1bd4c 100644 --- a/test/recipes/15-test_ecparam_data/valid/sect409r1-explicit.pem +++ b/test/recipes/15-test_ecparam_data/noncanon/sect409r1-explicit.pem diff --git a/test/recipes/15-test_ecparam_data/valid/sect571k1-explicit.pem b/test/recipes/15-test_ecparam_data/noncanon/sect571k1-explicit.pem index 32119057ad..32119057ad 100644 --- a/test/recipes/15-test_ecparam_data/valid/sect571k1-explicit.pem +++ b/test/recipes/15-test_ecparam_data/noncanon/sect571k1-explicit.pem diff --git a/test/recipes/15-test_ecparam_data/valid/sect571r1-explicit.pem b/test/recipes/15-test_ecparam_data/noncanon/sect571r1-explicit.pem index b81ab3c78e..b81ab3c78e 100644 --- a/test/recipes/15-test_ecparam_data/valid/sect571r1-explicit.pem +++ b/test/recipes/15-test_ecparam_data/noncanon/sect571r1-explicit.pem diff --git a/test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls1-explicit.pem b/test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls1-explicit.pem index 5da128a99c..5da128a99c 100644 --- a/test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls1-explicit.pem +++ b/test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls1-explicit.pem diff --git a/test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls10-explicit.pem b/test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls10-explicit.pem index d318fcb8c0..d318fcb8c0 100644 --- a/test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls10-explicit.pem +++ b/test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls10-explicit.pem diff --git a/test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls11-explicit.pem b/test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls11-explicit.pem index c6da580866..c6da580866 100644 --- a/test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls11-explicit.pem +++ b/test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls11-explicit.pem diff --git a/test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls3-explicit.pem b/test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls3-explicit.pem index 3438927e61..3438927e61 100644 --- a/test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls3-explicit.pem +++ b/test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls3-explicit.pem diff --git a/test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls4-explicit.pem b/test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls4-explicit.pem index 2cd45a8c4f..2cd45a8c4f 100644 --- a/test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls4-explicit.pem +++ b/test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls4-explicit.pem diff --git a/test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls5-explicit.pem b/test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls5-explicit.pem index d7bc1c2cab..d7bc1c2cab 100644 --- a/test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls5-explicit.pem +++ b/test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls5-explicit.pem diff --git a/test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls8-explicit.pem b/test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls8-explicit.pem index d8c3ef8bf4..d8c3ef8bf4 100644 --- a/test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls8-explicit.pem +++ b/test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls8-explicit.pem diff --git a/test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls9-explicit.pem b/test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls9-explicit.pem index 383c5dce8f..383c5dce8f 100644 --- a/test/recipes/15-test_ecparam_data/valid/wap-wsg-idm-ecid-wtls9-explicit.pem +++ b/test/recipes/15-test_ecparam_data/noncanon/wap-wsg-idm-ecid-wtls9-explicit.pem |