|
@@ -44,33 +44,27 @@ my @verifycmd = ("openssl", "verify");
|
|
|
my @genpkeycmd = ("openssl", "genpkey");
|
|
|
my $dummycnf = srctop_file("apps", "openssl.cnf");
|
|
|
|
|
|
+my $cnf=srctop_file("test","ca-and-certs.cnf");
|
|
|
my $CAkey = "keyCA.ss";
|
|
|
my $CAcert="certCA.ss";
|
|
|
my $CAserial="certCA.srl";
|
|
|
my $CAreq="reqCA.ss";
|
|
|
-my $CAconf=srctop_file("test","CAss.cnf");
|
|
|
my $CAreq2="req2CA.ss"; # temp
|
|
|
-
|
|
|
-my $Uconf=srctop_file("test","Uss.cnf");
|
|
|
my $Ukey="keyU.ss";
|
|
|
my $Ureq="reqU.ss";
|
|
|
my $Ucert="certU.ss";
|
|
|
-
|
|
|
my $Dkey="keyD.ss";
|
|
|
my $Dreq="reqD.ss";
|
|
|
my $Dcert="certD.ss";
|
|
|
-
|
|
|
my $Ekey="keyE.ss";
|
|
|
my $Ereq="reqE.ss";
|
|
|
my $Ecert="certE.ss";
|
|
|
|
|
|
-my $P1conf=srctop_file("test","P1ss.cnf");
|
|
|
+my $proxycnf=srctop_file("test","proxy.cnf");
|
|
|
my $P1key="keyP1.ss";
|
|
|
my $P1req="reqP1.ss";
|
|
|
my $P1cert="certP1.ss";
|
|
|
my $P1intermediate="tmp_intP1.ss";
|
|
|
-
|
|
|
-my $P2conf=srctop_file("test","P2ss.cnf");
|
|
|
my $P2key="keyP2.ss";
|
|
|
my $P2req="reqP2.ss";
|
|
|
my $P2cert="certP2.ss";
|
|
@@ -133,7 +127,7 @@ sub testss {
|
|
|
|
|
|
SKIP: {
|
|
|
skip 'failure', 16 unless
|
|
|
- ok(run(app([@reqcmd, "-config", $CAconf,
|
|
|
+ ok(run(app([@reqcmd, "-config", $cnf,
|
|
|
"-out", $CAreq, "-keyout", $CAkey,
|
|
|
@req_new])),
|
|
|
'make cert request');
|
|
@@ -141,7 +135,7 @@ sub testss {
|
|
|
skip 'failure', 15 unless
|
|
|
ok(run(app([@x509cmd, "-CAcreateserial", "-in", $CAreq, "-days", "30",
|
|
|
"-req", "-out", $CAcert, "-signkey", $CAkey,
|
|
|
- "-extfile", $CAconf, "-extensions", "v3_ca"],
|
|
|
+ "-extfile", $cnf, "-extensions", "v3_ca"],
|
|
|
stdout => "err.ss")),
|
|
|
'convert request into self-signed cert');
|
|
|
|
|
@@ -167,7 +161,7 @@ sub testss {
|
|
|
'verify signature');
|
|
|
|
|
|
skip 'failure', 10 unless
|
|
|
- ok(run(app([@reqcmd, "-config", $Uconf,
|
|
|
+ ok(run(app([@reqcmd, "-config", $cnf, "-section", "userreq",
|
|
|
"-out", $Ureq, "-keyout", $Ukey, @req_new],
|
|
|
stdout => "err.ss")),
|
|
|
'make a user cert request');
|
|
@@ -176,7 +170,7 @@ sub testss {
|
|
|
ok(run(app([@x509cmd, "-CAcreateserial", "-in", $Ureq, "-days", "30",
|
|
|
"-req", "-out", $Ucert,
|
|
|
"-CA", $CAcert, "-CAkey", $CAkey, "-CAserial", $CAserial,
|
|
|
- "-extfile", $Uconf, "-extensions", "v3_ee"],
|
|
|
+ "-extfile", $cnf, "-extensions", "v3_ee"],
|
|
|
stdout => "err.ss"))
|
|
|
&& run(app([@verifycmd, "-CAfile", $CAcert, $Ucert])),
|
|
|
'sign user cert request');
|
|
@@ -202,7 +196,8 @@ sub testss {
|
|
|
stdout => "err.ss")),
|
|
|
"make a DSA key");
|
|
|
skip 'failure', 3 unless
|
|
|
- ok(run(app([@reqcmd, "-new", "-config", $Uconf,
|
|
|
+ ok(run(app([@reqcmd, "-new", "-config", $cnf,
|
|
|
+ "-section", "userreq",
|
|
|
"-out", $Dreq, "-key", $Dkey],
|
|
|
stdout => "err.ss")),
|
|
|
"make a DSA user cert request");
|
|
@@ -214,7 +209,7 @@ sub testss {
|
|
|
"-out", $Dcert,
|
|
|
"-CA", $CAcert, "-CAkey", $CAkey,
|
|
|
"-CAserial", $CAserial,
|
|
|
- "-extfile", $Uconf,
|
|
|
+ "-extfile", $cnf,
|
|
|
"-extensions", "v3_ee_dsa"],
|
|
|
stdout => "err.ss")),
|
|
|
"sign DSA user cert request");
|
|
@@ -247,7 +242,8 @@ sub testss {
|
|
|
"-out", "ecp.ss"])),
|
|
|
"make EC parameters");
|
|
|
skip 'failure', 3 unless
|
|
|
- ok(run(app([@reqcmd, "-config", $Uconf,
|
|
|
+ ok(run(app([@reqcmd, "-config", $cnf,
|
|
|
+ "-section", "userreq",
|
|
|
"-out", $Ereq, "-keyout", $Ekey,
|
|
|
"-newkey", "ec:ecp.ss"],
|
|
|
stdout => "err.ss")),
|
|
@@ -260,7 +256,7 @@ sub testss {
|
|
|
"-out", $Ecert,
|
|
|
"-CA", $CAcert, "-CAkey", $CAkey,
|
|
|
"-CAserial", $CAserial,
|
|
|
- "-extfile", $Uconf,
|
|
|
+ "-extfile", $cnf,
|
|
|
"-extensions", "v3_ee_ec"],
|
|
|
stdout => "err.ss")),
|
|
|
"sign ECDSA/ECDH user cert request");
|
|
@@ -277,7 +273,7 @@ sub testss {
|
|
|
};
|
|
|
|
|
|
skip 'failure', 5 unless
|
|
|
- ok(run(app([@reqcmd, "-config", $P1conf,
|
|
|
+ ok(run(app([@reqcmd, "-config", $proxycnf,
|
|
|
"-out", $P1req, "-keyout", $P1key, @req_new],
|
|
|
stdout => "err.ss")),
|
|
|
'make a proxy cert request');
|
|
@@ -287,7 +283,7 @@ sub testss {
|
|
|
ok(run(app([@x509cmd, "-CAcreateserial", "-in", $P1req, "-days", "30",
|
|
|
"-req", "-out", $P1cert,
|
|
|
"-CA", $Ucert, "-CAkey", $Ukey,
|
|
|
- "-extfile", $P1conf, "-extensions", "v3_proxy"],
|
|
|
+ "-extfile", $proxycnf, "-extensions", "proxy"],
|
|
|
stdout => "err.ss")),
|
|
|
'sign proxy with user cert');
|
|
|
|
|
@@ -300,7 +296,7 @@ sub testss {
|
|
|
'Certificate details');
|
|
|
|
|
|
skip 'failure', 2 unless
|
|
|
- ok(run(app([@reqcmd, "-config", $P2conf,
|
|
|
+ ok(run(app([@reqcmd, "-config", $proxycnf, "-section", "proxy2_req",
|
|
|
"-out", $P2req, "-keyout", $P2key,
|
|
|
@req_new],
|
|
|
stdout => "err.ss")),
|
|
@@ -311,7 +307,7 @@ sub testss {
|
|
|
ok(run(app([@x509cmd, "-CAcreateserial", "-in", $P2req, "-days", "30",
|
|
|
"-req", "-out", $P2cert,
|
|
|
"-CA", $P1cert, "-CAkey", $P1key,
|
|
|
- "-extfile", $P2conf, "-extensions", "v3_proxy"],
|
|
|
+ "-extfile", $proxycnf, "-extensions", "proxy_2"],
|
|
|
stdout => "err.ss")),
|
|
|
'sign second proxy cert request with the first proxy cert');
|
|
|
|