Commit f9964863 authored by Rich Salz's avatar Rich Salz
Browse files

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



Also fixed a memory leak found by the test.

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6681)
parent fb853fa2

apps/req.c

+1 −0
Original line number Diff line number Diff line
@@ -947,6 +947,7 @@ int req_main(int argc, char **argv) 
        ERR_print_errors(bio_err);

    }

    NCONF_free(req_conf);

    NCONF_free(addext_conf);

    BIO_free(addext_bio);

    BIO_free(in);

    BIO_free_all(out);

test/recipes/25-test_req.t

+19 −15
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ use OpenSSL::Test qw/:DEFAULT srctop_file/; 


setup("test_req");



plan tests => 8;

plan tests => 9;



require_ok(srctop_file('test','recipes','tconversion.pl'));
@@ -23,17 +23,7 @@ open RND, ">>", ".rnd"; 
print RND "string to make the random number generator think it has randomness";

close RND;



# Check for duplicate -addext parameters

my $val = "subjectAltName=DNS:example.com";

my $val2 = " " . $val;

my $val3 = $val;

$val3 =~ s/=/    =/;

ok(!run(app(["openssl", "req", "-new", "-addext", $val, "-addext", $val])));

ok(!run(app(["openssl", "req", "-new", "-addext", $val, "-addext", $val2])));

ok(!run(app(["openssl", "req", "-new", "-addext", $val, "-addext", $val3])));

ok(!run(app(["openssl", "req", "-new", "-addext", $val2, "-addext", $val3])));



subtest "generating certificate requests" => sub {

# What type of key to generate?

my @req_new;

if (disabled("rsa")) {

    @req_new = ("-newkey", "dsa:".srctop_file("apps", "dsa512.pem"));
@@ -43,6 +33,20 @@ subtest "generating certificate requests" => sub { 
    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 $val2 = " " . $val;

my $val3 = $val;

$val3 =~ s/=/    =/;

ok( run(app([@addext_args, "-addext", $val])));

ok(!run(app([@addext_args, "-addext", $val, "-addext", $val])));

ok(!run(app([@addext_args, "-addext", $val, "-addext", $val2])));

ok(!run(app([@addext_args, "-addext", $val, "-addext", $val3])));

ok(!run(app([@addext_args, "-addext", $val2, "-addext", $val3])));



subtest "generating certificate requests" => sub {

    plan tests => 2;



    ok(run(app(["openssl", "req", "-config", srctop_file("test", "test.cnf"),