[openssl] OpenSSL_1_1_1-stable update
nic.tuv at gmail.com
nic.tuv at gmail.com
Mon May 25 23:26:57 UTC 2020
The branch OpenSSL_1_1_1-stable has been updated
via efdfc392aac6d56fe385223cd26687fa26ca9af3 (commit)
via e7bab429fb2f043165838496fb58aa257235dbe1 (commit)
from b7bc412eafb4c252e640719f048d3ca293b64b0f (commit)
- Log -----------------------------------------------------------------
commit efdfc392aac6d56fe385223cd26687fa26ca9af3
Author: Nicola Tuveri <nic.tuv at gmail.com>
Date: Mon Nov 11 12:13:10 2019 +0200
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 <beldmit at gmail.com>
(Merged from https://github.com/openssl/openssl/pull/11939)
commit e7bab429fb2f043165838496fb58aa257235dbe1
Author: Nicola Tuveri <nic.tuv at gmail.com>
Date: Mon Nov 11 15:52:52 2019 +0200
More testing for sign/verify through `dgst`
Add tests for signature generation and verification with `dgst` CLI for
common key types:
- RSA
- DSA
- ECDSA
(cherry picked from commit ef1e59ed833e8ed1d5f4de5b0c734da8561890e3)
This is a backport from https://github.com/openssl/openssl/pull/10410.
Support for testing EdDSA through `pkeyutl` was dropped as the required
`-rawin` option is not supported in 1.1.1.
Fixes #10687
Reviewed-by: Dmitry Belyavskiy <beldmit at gmail.com>
(Merged from https://github.com/openssl/openssl/pull/11939)
-----------------------------------------------------------------------
Summary of changes:
test/recipes/15-test_ec.t | 56 ++++++++++++++++++------
test/recipes/20-test_dgst.t | 104 ++++++++++++++++++++++++++++++++++++++++++++
test/recipes/25-test_req.t | 42 +++++++++++++++++-
test/tested25519.pem | 3 ++
test/tested25519pub.pem | 3 ++
test/tested448.pem | 4 ++
test/tested448pub.pem | 4 ++
7 files changed, 201 insertions(+), 15 deletions(-)
create mode 100644 test/recipes/20-test_dgst.t
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/20-test_dgst.t b/test/recipes/20-test_dgst.t
new file mode 100644
index 0000000000..1080770f53
--- /dev/null
+++ b/test/recipes/20-test_dgst.t
@@ -0,0 +1,104 @@
+#! /usr/bin/env perl
+# Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
+#
+# Licensed under the Apache License 2.0 (the "License"). You may not use
+# this file except in compliance with the License. You can obtain a copy
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
+
+
+use strict;
+use warnings;
+
+use File::Spec;
+use OpenSSL::Test qw/:DEFAULT with srctop_file/;
+use OpenSSL::Test::Utils;
+
+setup("test_dgst");
+
+plan tests => 5;
+
+sub tsignverify {
+ my $testtext = shift;
+ my $privkey = shift;
+ my $pubkey = shift;
+
+ my $data_to_sign = srctop_file('test', 'README');
+ my $other_data = srctop_file('test', 'README.external');
+
+ plan tests => 4;
+
+ ok(run(app(['openssl', 'dgst', '-sign', $privkey,
+ '-out', 'testdgst.sig',
+ $data_to_sign])),
+ $testtext.": Generating signature");
+
+ ok(run(app(['openssl', 'dgst', '-prverify', $privkey,
+ '-signature', 'testdgst.sig',
+ $data_to_sign])),
+ $testtext.": Verify signature with private key");
+
+ ok(run(app(['openssl', 'dgst', '-verify', $pubkey,
+ '-signature', 'testdgst.sig',
+ $data_to_sign])),
+ $testtext.": Verify signature with public key");
+
+ ok(!run(app(['openssl', 'dgst', '-verify', $pubkey,
+ '-signature', 'testdgst.sig',
+ $other_data])),
+ $testtext.": Expect failure verifying mismatching data");
+
+ unlink 'testdgst.sig';
+}
+
+SKIP: {
+ skip "RSA is not supported by this OpenSSL build", 1
+ if disabled("rsa");
+
+ subtest "RSA signature generation and verification with `dgst` CLI" => sub {
+ tsignverify("RSA",
+ srctop_file("test","testrsa.pem"),
+ srctop_file("test","testrsapub.pem"));
+ };
+}
+
+SKIP: {
+ skip "DSA is not supported by this OpenSSL build", 1
+ if disabled("dsa");
+
+ subtest "DSA signature generation and verification with `dgst` CLI" => sub {
+ tsignverify("DSA",
+ srctop_file("test","testdsa.pem"),
+ srctop_file("test","testdsapub.pem"));
+ };
+}
+
+SKIP: {
+ skip "ECDSA is not supported by this OpenSSL build", 1
+ if disabled("ec");
+
+ subtest "ECDSA signature generation and verification with `dgst` CLI" => sub {
+ tsignverify("ECDSA",
+ srctop_file("test","testec-p256.pem"),
+ srctop_file("test","testecpub-p256.pem"));
+ };
+}
+
+SKIP: {
+ skip "EdDSA is not supported by this OpenSSL build", 2
+ if disabled("ec");
+
+ skip "EdDSA is not supported with `dgst` CLI", 2;
+
+ subtest "Ed25519 signature generation and verification with `dgst` CLI" => sub {
+ tsignverify("Ed25519",
+ srctop_file("test","tested25519.pem"),
+ srctop_file("test","tested25519pub.pem"));
+ };
+
+ subtest "Ed448 signature generation and verification with `dgst` CLI" => sub {
+ tsignverify("Ed448",
+ srctop_file("test","tested448.pem"),
+ srctop_file("test","tested448pub.pem"));
+ };
+}
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-----
More information about the openssl-commits
mailing list