[openssl] master update
nic.tuv at gmail.com
nic.tuv at gmail.com
Fri Jun 26 10:58:39 UTC 2020
The branch master has been updated
via c65b1d02528cef3e819a02a60a616dba9d28adca (commit)
via 0c2bddb76a6aa7cad1f3689586040af074ad7e2b (commit)
from cc63865f336e0144f8501aa0a862ba0247a50622 (commit)
- Log -----------------------------------------------------------------
commit c65b1d02528cef3e819a02a60a616dba9d28adca
Author: Richard Levitte <levitte at openssl.org>
Date: Tue Jun 9 12:29:27 2020 +0200
TEST: Add TODO segments in test/recipes/15-test_genec.t
There currently do not support 'ec_param_enc:explicit' with provider
side key generation. Reflect that by encoding the expected failure
with a Test::More TODO section for those particular tests.
Because the tests in this recipe are data driven, we implement this
mechanism with two functions, one for stuff that's supported and one
for stuff that isn't.
Reviewed-by: Nicola Tuveri <nic.tuv at gmail.com>
(Merged from https://github.com/openssl/openssl/pull/12080)
commit 0c2bddb76a6aa7cad1f3689586040af074ad7e2b
Author: Nicola Tuveri <nic.tuv at gmail.com>
Date: Sun Jun 7 18:00:33 2020 +0300
Test genpkey app for EC keygen with various args
This commit adds a new recipe to test EC key generation with the
`genpkey` CLI app.
For each built-in curve, it tests key generation with text output, in
PEM and in DER format, using `explicit` and `named_curve` for parameters
encoding.
The list of built-in curves is static at the moment, as this allows to
differentiate between prime curves and binary curves to avoid failing
when ec2m is disabled.
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12080)
-----------------------------------------------------------------------
Summary of changes:
test/recipes/15-test_genec.t | 209 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 209 insertions(+)
create mode 100644 test/recipes/15-test_genec.t
diff --git a/test/recipes/15-test_genec.t b/test/recipes/15-test_genec.t
new file mode 100644
index 0000000000..d4547e5849
--- /dev/null
+++ b/test/recipes/15-test_genec.t
@@ -0,0 +1,209 @@
+#! /usr/bin/env perl
+# Copyright 2017-2020 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 srctop_file/;
+use OpenSSL::Test::Utils;
+
+# 'supported' and 'unsupported' reflect the current state of things. In
+# Test::More terms, 'supported' works exactly like ok(run(whatever)), while
+# 'unsupported' wraps that in a TODO: { } block.
+#
+# The first argument is the test name (this becomes the last argument to
+# 'ok')
+# The remaining argument are passed unchecked to 'run'.
+
+# 1: the result of app() or similar, i.e. something you can pass to
+sub supported {
+ my $str = shift;
+
+ ok(run(@_), $str);
+}
+
+sub unsupported {
+ my $str = shift;
+ TODO: {
+ local $TODO = "Currently not supported";
+
+ ok(run(@_), $str);
+ }
+}
+
+
+setup("test_genec");
+
+plan skip_all => "This test is unsupported in a no-ec build"
+ if disabled("ec");
+
+my @prime_curves = qw(
+ secp112r1
+ secp112r2
+ secp128r1
+ secp128r2
+ secp160k1
+ secp160r1
+ secp160r2
+ secp192k1
+ secp224k1
+ secp224r1
+ secp256k1
+ secp384r1
+ secp521r1
+ prime192v1
+ prime192v2
+ prime192v3
+ prime239v1
+ prime239v2
+ prime239v3
+ prime256v1
+ wap-wsg-idm-ecid-wtls6
+ wap-wsg-idm-ecid-wtls7
+ wap-wsg-idm-ecid-wtls8
+ wap-wsg-idm-ecid-wtls9
+ wap-wsg-idm-ecid-wtls12
+ brainpoolP160r1
+ brainpoolP160t1
+ brainpoolP192r1
+ brainpoolP192t1
+ brainpoolP224r1
+ brainpoolP224t1
+ brainpoolP256r1
+ brainpoolP256t1
+ brainpoolP320r1
+ brainpoolP320t1
+ brainpoolP384r1
+ brainpoolP384t1
+ brainpoolP512r1
+ brainpoolP512t1
+);
+
+my @binary_curves = qw(
+ sect113r1
+ sect113r2
+ sect131r1
+ sect131r2
+ sect163k1
+ sect163r1
+ sect163r2
+ sect193r1
+ sect193r2
+ sect233k1
+ sect233r1
+ sect239k1
+ sect283k1
+ sect283r1
+ sect409k1
+ sect409r1
+ sect571k1
+ sect571r1
+ c2pnb163v1
+ c2pnb163v2
+ c2pnb163v3
+ c2pnb176v1
+ c2tnb191v1
+ c2tnb191v2
+ c2tnb191v3
+ c2pnb208w1
+ c2tnb239v1
+ c2tnb239v2
+ c2tnb239v3
+ c2pnb272w1
+ c2pnb304w1
+ c2tnb359v1
+ c2pnb368w1
+ c2tnb431r1
+ wap-wsg-idm-ecid-wtls1
+ wap-wsg-idm-ecid-wtls3
+ wap-wsg-idm-ecid-wtls4
+ wap-wsg-idm-ecid-wtls5
+ wap-wsg-idm-ecid-wtls10
+ wap-wsg-idm-ecid-wtls11
+ Oakley-EC2N-3
+ Oakley-EC2N-4
+);
+
+my @other_curves = ();
+push(@other_curves, 'SM2')
+ if !disabled("sm2");
+
+my @curve_aliases = qw(
+ P-192
+ P-224
+ P-256
+ P-384
+ P-521
+);
+push(@curve_aliases, qw(
+ B-163
+ B-233
+ B-283
+ B-409
+ B-571
+ K-163
+ K-233
+ K-283
+ K-409
+ K-571
+)) if !disabled("ec2m");
+
+my @curve_list = ();
+push(@curve_list, @prime_curves);
+push(@curve_list, @binary_curves)
+ if !disabled("ec2m");
+push(@curve_list, @other_curves);
+push(@curve_list, @curve_aliases);
+
+my %params_encodings =
+ (
+ 'named_curve' => \&supported,
+ 'explicit' => \&unsupported
+ );
+
+my @output_formats = ('PEM', 'DER');
+
+plan tests => scalar(@curve_list) * scalar(keys %params_encodings)
+ * (1 + scalar(@output_formats)) # Try listed @output_formats and text output
+ + 1 # Checking that with no curve it fails
+ + 1 # Checking that with unknown curve it fails
+ ;
+
+foreach my $curvename (@curve_list) {
+ foreach my $paramenc (sort keys %params_encodings) {
+ my $fn = $params_encodings{$paramenc};
+ $fn->("genpkey EC params ${curvename} with ec_param_enc:'${paramenc}' (text)",
+ app([ 'openssl', 'genpkey',
+ '-algorithm', 'EC',
+ '-pkeyopt', 'ec_paramgen_curve:'.$curvename,
+ '-pkeyopt', 'ec_param_enc:'.$paramenc,
+ '-text']));
+
+ foreach my $outform (@output_formats) {
+ my $outfile = "ecgen.${curvename}.${paramenc}." . lc $outform;
+ $fn->("genpkey EC params ${curvename} with ec_param_enc:'${paramenc}' (${outform})",
+ app([ 'openssl', 'genpkey', '-genparam',
+ '-algorithm', 'EC',
+ '-pkeyopt', 'ec_paramgen_curve:'.$curvename,
+ '-pkeyopt', 'ec_param_enc:'.$paramenc,
+ '-outform', $outform,
+ '-out', $outfile]));
+ }
+ }
+}
+
+ok(!run(app([ 'openssl', 'genpkey',
+ '-algorithm', 'EC'])),
+ "genpkey EC with no params should fail");
+
+ok(!run(app([ 'openssl', 'genpkey',
+ '-algorithm', 'EC',
+ '-pkeyopt', 'ec_paramgen_curve:bogus_foobar_curve'])),
+ "genpkey EC with unknown curve name should fail");
More information about the openssl-commits
mailing list