提交 f9964863 编写于 作者: R Rich Salz

Add tests for the "req" command, -addext flag

Also fixed a memory leak found by the test.
Reviewed-by: NAndy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6681)
上级 fb853fa2
...@@ -947,6 +947,7 @@ int req_main(int argc, char **argv) ...@@ -947,6 +947,7 @@ int req_main(int argc, char **argv)
ERR_print_errors(bio_err); ERR_print_errors(bio_err);
} }
NCONF_free(req_conf); NCONF_free(req_conf);
NCONF_free(addext_conf);
BIO_free(addext_bio); BIO_free(addext_bio);
BIO_free(in); BIO_free(in);
BIO_free_all(out); BIO_free_all(out);
......
...@@ -15,7 +15,7 @@ use OpenSSL::Test qw/:DEFAULT srctop_file/; ...@@ -15,7 +15,7 @@ use OpenSSL::Test qw/:DEFAULT srctop_file/;
setup("test_req"); setup("test_req");
plan tests => 8; plan tests => 9;
require_ok(srctop_file('test','recipes','tconversion.pl')); require_ok(srctop_file('test','recipes','tconversion.pl'));
...@@ -23,26 +23,30 @@ open RND, ">>", ".rnd"; ...@@ -23,26 +23,30 @@ open RND, ">>", ".rnd";
print RND "string to make the random number generator think it has randomness"; print RND "string to make the random number generator think it has randomness";
close RND; close RND;
# Check for duplicate -addext parameters # What type of key to generate?
my @req_new;
if (disabled("rsa")) {
@req_new = ("-newkey", "dsa:".srctop_file("apps", "dsa512.pem"));
} else {
@req_new = ("-new");
note("There should be a 2 sequences of .'s and some +'s.");
note("There should not be more that at most 80 per line");
}
# Check for duplicate -addext parameters, and one "working" case.
my @addext_args = ( "openssl", "req", "-new", "-out", "testreq.pem",
"-config", srctop_file("test", "test.cnf"), @req_new );
my $val = "subjectAltName=DNS:example.com"; my $val = "subjectAltName=DNS:example.com";
my $val2 = " " . $val; my $val2 = " " . $val;
my $val3 = $val; my $val3 = $val;
$val3 =~ s/=/ =/; $val3 =~ s/=/ =/;
ok(!run(app(["openssl", "req", "-new", "-addext", $val, "-addext", $val]))); ok( run(app([@addext_args, "-addext", $val])));
ok(!run(app(["openssl", "req", "-new", "-addext", $val, "-addext", $val2]))); ok(!run(app([@addext_args, "-addext", $val, "-addext", $val])));
ok(!run(app(["openssl", "req", "-new", "-addext", $val, "-addext", $val3]))); ok(!run(app([@addext_args, "-addext", $val, "-addext", $val2])));
ok(!run(app(["openssl", "req", "-new", "-addext", $val2, "-addext", $val3]))); ok(!run(app([@addext_args, "-addext", $val, "-addext", $val3])));
ok(!run(app([@addext_args, "-addext", $val2, "-addext", $val3])));
subtest "generating certificate requests" => sub { subtest "generating certificate requests" => sub {
my @req_new;
if (disabled("rsa")) {
@req_new = ("-newkey", "dsa:".srctop_file("apps", "dsa512.pem"));
} else {
@req_new = ("-new");
note("There should be a 2 sequences of .'s and some +'s.");
note("There should not be more that at most 80 per line");
}
plan tests => 2; plan tests => 2;
ok(run(app(["openssl", "req", "-config", srctop_file("test", "test.cnf"), ok(run(app(["openssl", "req", "-config", srctop_file("test", "test.cnf"),
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册