From efdfc392aac6d56fe385223cd26687fa26ca9af3 Mon Sep 17 00:00:00 2001 From: Nicola Tuveri Date: Mon, 11 Nov 2019 12:13:10 +0200 Subject: [PATCH] More testing for CLI usage of Ed25519 and Ed448 keys Add testing for the `req` app and explicit conversion tests similar to what is done for ECDSA keys. The included test keys for Ed25519 are from the examples in RFC 8410 (Sec. 10) The key for Ed448 is derived from the first of the test vectors in RFC 8032 (Sec. 7.4) using OpenSSL to encode it into PEM format. (cherry picked from commit 81722fdf2e01cfa71c46abbcc19e65aa003e083f) This is originally a cherry-pick from https://github.com/openssl/openssl/pull/10410, with trivial changes from the original commit to account for the differences in 1.1.1. Fixes #10687 Reviewed-by: Dmitry Belyavskiy (Merged from https://github.com/openssl/openssl/pull/11939) --- test/recipes/15-test_ec.t | 56 ++++++++++++++++++++++++++++---------- test/recipes/25-test_req.t | 42 +++++++++++++++++++++++++++- test/tested25519.pem | 3 ++ test/tested25519pub.pem | 3 ++ test/tested448.pem | 4 +++ test/tested448pub.pem | 4 +++ 6 files changed, 97 insertions(+), 15 deletions(-) create mode 100644 test/tested25519.pem create mode 100644 test/tested25519pub.pem create mode 100644 test/tested448.pem create mode 100644 test/tested448pub.pem diff --git a/test/recipes/15-test_ec.t b/test/recipes/15-test_ec.t index a1c704a3f0..7bce442a44 100644 --- a/test/recipes/15-test_ec.t +++ b/test/recipes/15-test_ec.t @@ -16,23 +16,51 @@ use OpenSSL::Test::Utils; setup("test_ec"); -plan tests => 5; +plan tests => 11; require_ok(srctop_file('test','recipes','tconversion.pl')); ok(run(test(["ectest"])), "running ectest"); - SKIP: { - skip "Skipping ec conversion test", 3 - if disabled("ec"); - - subtest 'ec conversions -- private key' => sub { - tconversion("ec", srctop_file("test","testec-p256.pem")); - }; - subtest 'ec conversions -- private key PKCS#8' => sub { - tconversion("ec", srctop_file("test","testec-p256.pem"), "pkey"); - }; - subtest 'ec conversions -- public key' => sub { - tconversion("ec", srctop_file("test","testecpub-p256.pem"), "ec", "-pubin", "-pubout"); - }; +SKIP: { + skip "Skipping EC conversion test", 3 + if disabled("ec"); + + subtest 'EC conversions -- private key' => sub { + tconversion("ec", srctop_file("test","testec-p256.pem")); + }; + subtest 'EC conversions -- private key PKCS#8' => sub { + tconversion("ec", srctop_file("test","testec-p256.pem"), "pkey"); + }; + subtest 'EC conversions -- public key' => sub { + tconversion("ec", srctop_file("test","testecpub-p256.pem"), + "ec", "-pubin", "-pubout"); + }; +} + +SKIP: { + skip "Skipping EdDSA conversion test", 6 + if disabled("ec"); + + subtest 'Ed25519 conversions -- private key' => sub { + tconversion("pkey", srctop_file("test","tested25519.pem")); + }; + subtest 'Ed25519 conversions -- private key PKCS#8' => sub { + tconversion("pkey", srctop_file("test","tested25519.pem"), "pkey"); + }; + subtest 'Ed25519 conversions -- public key' => sub { + tconversion("pkey", srctop_file("test","tested25519pub.pem"), + "pkey", "-pubin", "-pubout"); + }; + + subtest 'Ed448 conversions -- private key' => sub { + tconversion("pkey", srctop_file("test","tested448.pem")); + }; + subtest 'Ed448 conversions -- private key PKCS#8' => sub { + tconversion("pkey", srctop_file("test","tested448.pem"), "pkey"); + }; + subtest 'Ed448 conversions -- public key' => sub { + tconversion("pkey", srctop_file("test","tested448pub.pem"), + "pkey", "-pubin", "-pubout"); + }; } diff --git a/test/recipes/25-test_req.t b/test/recipes/25-test_req.t index cb30061fca..52260d6e56 100644 --- a/test/recipes/25-test_req.t +++ b/test/recipes/25-test_req.t @@ -15,7 +15,7 @@ use OpenSSL::Test qw/:DEFAULT srctop_file/; setup("test_req"); -plan tests => 12; +plan tests => 14; require_ok(srctop_file('test','recipes','tconversion.pl')); @@ -106,6 +106,46 @@ subtest "generating certificate requests with ECDSA" => sub { } }; +subtest "generating certificate requests with Ed25519" => sub { + plan tests => 2; + + SKIP: { + skip "Ed25519 is not supported by this OpenSSL build", 2 + if disabled("ec"); + + ok(run(app(["openssl", "req", + "-config", srctop_file("test", "test.cnf"), + "-new", "-out", "testreq.pem", "-utf8", + "-key", srctop_file("test", "tested25519.pem")])), + "Generating request"); + + ok(run(app(["openssl", "req", + "-config", srctop_file("test", "test.cnf"), + "-verify", "-in", "testreq.pem", "-noout"])), + "Verifying signature on request"); + } +}; + +subtest "generating certificate requests with Ed448" => sub { + plan tests => 2; + + SKIP: { + skip "Ed448 is not supported by this OpenSSL build", 2 + if disabled("ec"); + + ok(run(app(["openssl", "req", + "-config", srctop_file("test", "test.cnf"), + "-new", "-out", "testreq.pem", "-utf8", + "-key", srctop_file("test", "tested448.pem")])), + "Generating request"); + + ok(run(app(["openssl", "req", + "-config", srctop_file("test", "test.cnf"), + "-verify", "-in", "testreq.pem", "-noout"])), + "Verifying signature on request"); + } +}; + subtest "generating certificate requests" => sub { plan tests => 2; diff --git a/test/tested25519.pem b/test/tested25519.pem new file mode 100644 index 0000000000..e447080ae2 --- /dev/null +++ b/test/tested25519.pem @@ -0,0 +1,3 @@ +-----BEGIN PRIVATE KEY----- +MC4CAQAwBQYDK2VwBCIEINTuctv5E1hK1bbY8fdp+K06/nwoy/HU++CXqI9EdVhC +-----END PRIVATE KEY----- diff --git a/test/tested25519pub.pem b/test/tested25519pub.pem new file mode 100644 index 0000000000..41b0218e94 --- /dev/null +++ b/test/tested25519pub.pem @@ -0,0 +1,3 @@ +-----BEGIN PUBLIC KEY----- +MCowBQYDK2VwAyEAGb9ECWmEzf6FQbrBZ9w7lshQhqowtrbLDFw4rXAxZuE= +-----END PUBLIC KEY----- diff --git a/test/tested448.pem b/test/tested448.pem new file mode 100644 index 0000000000..98af16420a --- /dev/null +++ b/test/tested448.pem @@ -0,0 +1,4 @@ +-----BEGIN PRIVATE KEY----- +MEcCAQAwBQYDK2VxBDsEOWyCpWLLgI0Q1jK+ichRPr9skp803fqMn2PJlg7240ij +UoyKP8wvBE45o/xblEkvjwMudUmiAJj5Ww== +-----END PRIVATE KEY----- diff --git a/test/tested448pub.pem b/test/tested448pub.pem new file mode 100644 index 0000000000..640da6f2be --- /dev/null +++ b/test/tested448pub.pem @@ -0,0 +1,4 @@ +-----BEGIN PUBLIC KEY----- +MEMwBQYDK2VxAzoAX9dEm1m0Yf0s54fsYWrUah2hNCSFpw4fig6nXYDpZ3jt8SR2 +m0bHBhvWeD3x5Q9s0foavq/oJWGA +-----END PUBLIC KEY----- -- 2.25.1